database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-15 00:02:46 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2003-02-13 15:16:00 +02:00
parent 32da4054ee 33303f2837
commit c75fa953e3
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql.cc
View File

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

5
libmysql/libmysql.c
View File

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