1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal:/home/bk/mysql-5.0/

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
This commit is contained in:
unknown 2004-07-10 10:19:21 +02:00
commit c78da28a4f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/parse_file.cc
View File

@ -692,9 +692,11 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root,
parameter->name.str, line); parameter->name.str, line);
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
*eol= '\0'; {
*((ulonglong*)(base + parameter->offset))= atoll(ptr); int not_used;
*eol= '\n'; *((ulonglong*)(base + parameter->offset))=
my_strtoll10(ptr, 0, &not_used);
}
ptr= eol+1; ptr= eol+1;
break; break;
case FILE_OPTIONS_TIMESTAMP: case FILE_OPTIONS_TIMESTAMP:

4
tests/client_test.c
View File

@ -9670,12 +9670,12 @@ static void test_union_param()
/* bind parameters */ /* bind parameters */
bind[0].buffer_type= FIELD_TYPE_STRING; bind[0].buffer_type= FIELD_TYPE_STRING;
bind[0].buffer= &my_val; bind[0].buffer= my_val;
bind[0].buffer_length= 4; bind[0].buffer_length= 4;
bind[0].length= &my_length; bind[0].length= &my_length;
bind[0].is_null= (char*)&my_null; bind[0].is_null= (char*)&my_null;
bind[1].buffer_type= FIELD_TYPE_STRING; bind[1].buffer_type= FIELD_TYPE_STRING;
bind[1].buffer= &my_val; bind[1].buffer= my_val;
bind[1].buffer_length= 4; bind[1].buffer_length= 4;
bind[1].length= &my_length; bind[1].length= &my_length;
bind[1].is_null= (char*)&my_null; bind[1].is_null= (char*)&my_null;