merge

client/mysql.cc

@@ -1036,7 +1036,7 @@ static bool add_line(String &buffer,char *line,char *in_string,
 			      inchar == '-' && pos[1] == '-' &&
 			      my_isspace(system_charset_info,pos[2]))))
       break;					// comment to end of line
-    else if (!*in_string && inchar == '/' && *(pos+1) == '*')
+    else if (!*in_string && inchar == '/' && *(pos+1) == '*' && *(pos+2) != '!')
     {
       pos++;
       *ml_comment= 1;

libmysql/libmysql.c

@@ -1200,9 +1200,12 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
         field->flags|= NUM_FLAG;
       if (default_value && row->data[6])
       {
-        field->def=strdup_root(alloc,(char*) row->data[8]);
+        field->def=strdup_root(alloc,(char*) row->data[6]);
 	field->def_length= lengths[6];
       }
+      else
+        field->def=0;
+      field->max_length= 0;
     }
   }
 #ifndef DELETE_SUPPORT_OF_4_0_PROTOCOL