diff options
| author | unknown <monty@mysql.com> | 2005-03-21 23:41:28 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-03-21 23:41:28 +0200 |
| commit | 802c41e04d0b4bb193abfff1b7084d3a6c971df6 (patch) | |
| tree | 0dc25c2b0b090f45da0eec51acfbcb6d42180cd6 /client | |
| parent | 2ba3544f0e053d95e82b9a899fd9b86cbb19b9ce (diff) | |
| download | mariadb-git-802c41e04d0b4bb193abfff1b7084d3a6c971df6.tar.gz | |
Cleanups during review of code
Fixed newly introduced bug in rollup
client/mysqldump.c:
Safer buffer allocation
Removed wrong assert
mysql-test/r/olap.result:
more tests
mysql-test/t/olap.test:
more tests
sql/handler.cc:
Simple cleanup
Fixed wrong check for next digit (wrong debug output)
sql/item.cc:
Replace shrink_to_length() with mark_as_const() as the former allowed one to do changes to the string
sql/item_sum.cc:
Change reference to pointer
Trivial optimzation of testing 'allways_null'
sql/mysqld.cc:
Proper indentation of comment
sql/sql_select.cc:
Fixed newly introduced bug in rollup
sql/sql_string.h:
Remove not needed 'shrink_to_length()'
Added 'mark_as_const()' to be used when one want to ensure that a string is not changed
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)); |