diff options
| author | Nisha Gopalakrishnan <nisha.gopalakrishnan@oracle.com> | 2013-07-18 11:44:00 +0530 |
|---|---|---|
| committer | Nisha Gopalakrishnan <nisha.gopalakrishnan@oracle.com> | 2013-07-18 11:44:00 +0530 |
| commit | 70cb66b96fd6bc6605c1b9d8ecff4ca78103973e (patch) | |
| tree | 7ea953fef7191bb25f3d968d170ae05d03e1daa0 /client/mysqldump.c | |
| parent | fafc74e38ff6e0909f1ab6dd01c0b3b60ef2d575 (diff) | |
| parent | 5d74d07b44902b9d860ab98e801fbcb72e32c518 (diff) | |
| download | mariadb-git-70cb66b96fd6bc6605c1b9d8ecff4ca78103973e.tar.gz | |
BUG#15844882: MYSQLDUMP FROM 5.5 FAILS WITH AN ERROR WHEN TRYING
TO DUMP DATA FROM MYSQL-5.6
Merge from mysql-5.1 to mysql-5.5.
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index bca6a43ff13..c19b0b1822a 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -2481,7 +2481,7 @@ static uint get_table_structure(char *table, char *db, char *table_type, verbose_msg("-- Retrieving table structure for table %s...\n", table); len= my_snprintf(query_buff, sizeof(query_buff), - "SET OPTION SQL_QUOTE_SHOW_CREATE=%d", + "SET SQL_QUOTE_SHOW_CREATE=%d", (opt_quoted || opt_keywords)); if (!create_options) strmov(query_buff+len, @@ -5224,7 +5224,7 @@ static my_bool get_view_structure(char *table, char* db) verbose_msg("-- Retrieving view structure for table %s...\n", table); #ifdef NOT_REALLY_USED_YET - sprintf(insert_pat,"SET OPTION SQL_QUOTE_SHOW_CREATE=%d", + sprintf(insert_pat, "SET SQL_QUOTE_SHOW_CREATE=%d", (opt_quoted || opt_keywords)); #endif |