diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-25 10:20:45 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-25 10:20:45 +0100 |
| commit | de10e214115ecc89087386ecad8bddee2a1e1608 (patch) | |
| tree | 7920f7d3b1d8ff90329b00177a8cc4242368d87b /client | |
| parent | 746152959a8787f3c7cf6b1c710fc1ee6c54419f (diff) | |
| parent | 9142c50b0751c1ee964b9b56ef2378fc2bef202c (diff) | |
| download | mariadb-git-de10e214115ecc89087386ecad8bddee2a1e1608.tar.gz | |
5.2 merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 4 | ||||
| -rw-r--r-- | client/mysqltest.cc | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index b4db4400341..460ff162319 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -2554,7 +2554,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, @@ -5133,7 +5133,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 diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 2cf3faae0b6..32f9b56ac77 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -3927,7 +3927,10 @@ void do_change_user(struct st_command *command) cur_con->name, ds_user.str, ds_passwd.str, ds_db.str)); if (mysql_change_user(mysql, ds_user.str, ds_passwd.str, ds_db.str)) - die("change user failed: %s", mysql_error(mysql)); + handle_error(command, mysql_errno(mysql), mysql_error(mysql), + mysql_sqlstate(mysql), &ds_res); + else + handle_no_error(command); dynstr_free(&ds_user); dynstr_free(&ds_passwd); |