diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-08-02 11:44:02 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-08-02 11:44:02 +0300 |
| commit | c5a8583b3146613429d88c1c044de88a4c4c94b0 (patch) | |
| tree | fe8c0476ae87e918655483aa1b417189c938780c /client/mysqldump.c | |
| parent | c863159c320008676aff978a7cdde5732678f975 (diff) | |
| parent | e023f9a4d5a620b54d7f7132567150d80b630692 (diff) | |
| download | mariadb-git-c5a8583b3146613429d88c1c044de88a4c4c94b0.tar.gz | |
Merge tag 'mariadb-10.0.36' into 10.0-galera
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 66a2b5f795c..7e09f5202fd 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -4893,6 +4893,14 @@ static int dump_selected_tables(char *db, char **table_names, int tables) if (opt_xml) print_xml_tag(md_result_file, "", "\n", "database", "name=", db, NullS); + + /* obtain dump of routines (procs/functions) */ + if (opt_routines && mysql_get_server_version(mysql) >= 50009) + { + DBUG_PRINT("info", ("Dumping routines for database %s", db)); + dump_routines_for_db(db); + } + if (opt_single_transaction && mysql_get_server_version(mysql) >= 50500) { verbose_msg("-- Setting savepoint...\n"); @@ -4902,7 +4910,6 @@ static int dump_selected_tables(char *db, char **table_names, int tables) DBUG_RETURN(1); } } - /* Dump each selected table */ for (pos= dump_tables; pos < end; pos++) { @@ -4964,12 +4971,6 @@ static int dump_selected_tables(char *db, char **table_names, int tables) DBUG_PRINT("info", ("Dumping events for database %s", db)); dump_events_for_db(db); } - /* obtain dump of routines (procs/functions) */ - if (opt_routines && mysql_get_server_version(mysql) >= 50009) - { - DBUG_PRINT("info", ("Dumping routines for database %s", db)); - dump_routines_for_db(db); - } free_root(&glob_root, MYF(0)); if (opt_xml) { |