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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

sql/parse_file.cc

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

tests/client_test.c

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