diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 10 | ||||
| -rw-r--r-- | client/mysqltest.c | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 4f908b531b1..f1e6a825257 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1456,6 +1456,9 @@ static uint dump_routines_for_db(char *db) if (lock_tables) mysql_query(mysql, "LOCK TABLES mysql.proc READ"); + if (opt_compact) + fprintf(sql_file, "\n/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;\n"); + fprintf(sql_file, "DELIMITER ;;\n"); /* 0, retrieve and dump functions, 1, procedures */ @@ -2106,8 +2109,11 @@ static void dump_triggers_for_table(char *table, DBUG_VOID_RETURN; } if (mysql_num_rows(result)) - fprintf(sql_file, "\n/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;\n\ -DELIMITER ;;\n"); + { + if (opt_compact) + fprintf(sql_file, "\n/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;\n"); + fprintf(sql_file, "\nDELIMITER ;;\n"); + } while ((row= mysql_fetch_row(result))) { fprintf(sql_file, diff --git a/client/mysqltest.c b/client/mysqltest.c index 6f6412e1f02..8b4f1ac11cc 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -6040,6 +6040,11 @@ int main(int argc, char **argv) init_dynamic_string(&ds_warning_messages, "", 0, 2048); parse_args(argc, argv); + var_set_int("$PS_PROTOCOL", ps_protocol); + var_set_int("$SP_PROTOCOL", sp_protocol); + var_set_int("$VIEW_PROTOCOL", view_protocol); + var_set_int("$CURSOR_PROTOCOL", cursor_protocol); + DBUG_PRINT("info",("result_file: '%s'", result_file_name ? result_file_name : "")); if (mysql_server_init(embedded_server_arg_count, |