Commit eff871bd authored by unknown's avatar unknown

Small optimization to bug fix, from Monty.


client/mysqldump.c:
  Optimize away a call to strend() by using return value of my_snprintf()
parent 04f9561a
...@@ -1104,6 +1104,7 @@ static uint getTableStructure(char *table, char* db) ...@@ -1104,6 +1104,7 @@ static uint getTableStructure(char *table, char* db)
char table_buff2[NAME_LEN*2+3]; char table_buff2[NAME_LEN*2+3];
char query_buff[512]; char query_buff[512];
FILE *sql_file = md_result_file; FILE *sql_file = md_result_file;
int len;
DBUG_ENTER("getTableStructure"); DBUG_ENTER("getTableStructure");
if (!insert_pat_inited) if (!insert_pat_inited)
...@@ -1118,11 +1119,11 @@ static uint getTableStructure(char *table, char* db) ...@@ -1118,11 +1119,11 @@ static uint getTableStructure(char *table, char* db)
if (verbose) if (verbose)
fprintf(stderr, "-- Retrieving table structure for table %s...\n", table); fprintf(stderr, "-- Retrieving table structure for table %s...\n", table);
my_snprintf(query_buff, sizeof(query_buff), len= my_snprintf(query_buff, sizeof(query_buff),
"SET OPTION SQL_QUOTE_SHOW_CREATE=%d", "SET OPTION SQL_QUOTE_SHOW_CREATE=%d",
(opt_quoted || opt_keywords)); (opt_quoted || opt_keywords));
if (!create_options) if (!create_options)
strmov(strend(query_buff), "/*!40102 ,SQL_MODE=concat(@@sql_mode, _utf8 ',NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS') */"); strmov(query_buff+len, "/*!40102 ,SQL_MODE=concat(@@sql_mode, _utf8 ',NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS') */");
result_table= quote_name(table, table_buff, 1); result_table= quote_name(table, table_buff, 1);
opt_quoted_table= quote_name(table, table_buff2, 0); opt_quoted_table= quote_name(table, table_buff2, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment