diff options
| author | unknown <monty@mysql.com> | 2005-03-21 23:46:11 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-03-21 23:46:11 +0200 |
| commit | 61f1e9a3e4257df5849723c7c0a68f537db25f75 (patch) | |
| tree | 577397cc3f61f408845744ee2b839dd184070121 /client | |
| parent | 87110734d334b89f95323980f080b265e38810bf (diff) | |
| parent | 802c41e04d0b4bb193abfff1b7084d3a6c971df6 (diff) | |
| download | mariadb-git-61f1e9a3e4257df5849723c7c0a68f537db25f75.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 46337c99732..867aa86c1fc 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1093,7 +1093,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name, number of fields in table, 0 if error */ -static uint getTableStructure(char *table, char* db) +static uint getTableStructure(char *table, char *db) { MYSQL_RES *tableRes; MYSQL_ROW row; @@ -1396,10 +1396,9 @@ static uint getTableStructure(char *table, char* db) /* Get MySQL specific create options */ if (create_options) { - char show_name_buff[FN_REFLEN]; + char show_name_buff[NAME_LEN*2+2+24]; /* Check memory for quote_for_like() */ - DBUG_ASSERT(2*sizeof(table) < sizeof(show_name_buff)); my_snprintf(buff, sizeof(buff), "show table status like %s", quote_for_like(table, show_name_buff)); |