diff options
| -rw-r--r-- | client/mysql.cc | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 41da0113670..afae4b28960 100644 --- a/client/mysql.cc +++ b/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; diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index fe435616532..29f23b4ecc5 100644 --- a/libmysql/libmysql.c +++ b/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 |