From ffe32e41358ba2e10add246a359d0053980b75de Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 5 Feb 2003 22:13:06 +0200 Subject: [PATCH 1/2] a fix in libmysql.c libmysql/libmysql.c: This crashed my mysql client. I hope that fix is correct. --- libmysql/libmysql.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index d9dde0689d0..c3432e66055 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -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; From 9503614aab9c2e151bb69675e172edf7c499fa0e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 6 Feb 2003 16:03:13 +0200 Subject: [PATCH 2/2] a fix for mysql client client/mysql.cc: A fix for mysql client which did filtered out queries of the type: /*!40001 select 1 */ --- client/mysql.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/mysql.cc b/client/mysql.cc index cef31b46b2c..009661e821f 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -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;