diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-10 17:16:27 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-10 17:16:27 +0300 |
| commit | 3ead95118098340f7fe36e34e1690839d183db1e (patch) | |
| tree | 90dcbcf7f6793609af78220fd45bf7337f00ff62 /client | |
| parent | 7053e26e1869962ef473043686996f40ac0fb88c (diff) | |
| parent | 1d43f71c7b4c39a6fd196c104b5ebafb65376199 (diff) | |
| download | mariadb-git-3ead95118098340f7fe36e34e1690839d183db1e.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 15 | ||||
| -rw-r--r-- | client/mysqlslap.c | 4 |
2 files changed, 10 insertions, 9 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) { diff --git a/client/mysqlslap.c b/client/mysqlslap.c index a78bf35d51b..7b3dcced37d 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -853,7 +853,7 @@ build_table_string(void) if (auto_generate_sql_guid_primary) { - dynstr_append(&table_string, "id varchar(32) primary key"); + dynstr_append(&table_string, "id varchar(36) primary key"); if (num_int_cols || num_char_cols || auto_generate_sql_guid_primary) dynstr_append(&table_string, ","); @@ -868,7 +868,7 @@ build_table_string(void) if (count) /* Except for the first pass we add a comma */ dynstr_append(&table_string, ","); - if (snprintf(buf, HUGE_STRING_LENGTH, "id%d varchar(32) unique key", count) + if (snprintf(buf, HUGE_STRING_LENGTH, "id%d varchar(36) unique key", count) > HUGE_STRING_LENGTH) { fprintf(stderr, "Memory Allocation error in create table\n"); |