database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

Browse Source 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


libmysql/libmysql.c:
  Auto merged
This commit is contained in:
unknown
2003-02-07 14:57:15 +02:00
parent dfb1888984 9503614aab
commit 8b85498f3f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql.cc
View File

@ -1029,7 +1029,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;

2
libmysql/libmysql.c
View File

@ -1173,7 +1173,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
if (INTERNAL_NUM_FIELD(field))
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]);
else
field->def=0;
field->max_length= 0;