diff options
| author | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-07-19 14:12:30 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-07-19 14:12:30 +0200 |
| commit | 92bbb54092902fb1f178605d99fa88960feebbd6 (patch) | |
| tree | 8ad2058f2e65bbe5dc104420227c5b83378f2389 /client/mysqldump.c | |
| parent | dc50ce997083b4f3d3e4ab237c6a1f5e11cfd90f (diff) | |
| parent | 674636e7255cf8df2fd3eb650df6a956f188be74 (diff) | |
| download | mariadb-git-92bbb54092902fb1f178605d99fa88960feebbd6.tar.gz | |
Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-merge
support-files/mysql.spec.sh:
Auto merged
client/mysqldump.c:
manual merge
mysql-test/r/mysqldump.result:
manual merge
mysql-test/t/mysqldump.test:
manual merge
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 4318e4b9528..e3c13bb0451 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -2640,7 +2640,7 @@ static int init_dumping(char *database) /* length of table name * 2 (if name contains quotes), 2 quotes and 0 */ - char quoted_database_buf[64*2+3]; + char quoted_database_buf[NAME_LEN*2+3]; char *qdatabase= quote_name(database,quoted_database_buf,opt_quoted); if (opt_comments) { @@ -2789,7 +2789,18 @@ static my_bool dump_all_views_in_db(char *database) DB_error(sock, "when selecting the database"); return 1; } - + if (opt_databases || opt_alldbs) + { + char quoted_database_buf[NAME_LEN*2+3]; + char *qdatabase= quote_name(database,quoted_database_buf,opt_quoted); + if (opt_comments) + { + fprintf(md_result_file,"\n--\n-- Current Database: %s\n--\n", qdatabase); + check_io(md_result_file); + } + fprintf(md_result_file,"\nUSE %s;\n", qdatabase); + check_io(md_result_file); + } if (opt_xml) print_xml_tag1(md_result_file, "", "database name=", database, "\n"); if (lock_tables) @@ -3242,7 +3253,7 @@ static char *primary_key_fields(const char *table_name) MYSQL_RES *res = NULL; MYSQL_ROW row; /* SHOW KEYS FROM + table name * 2 (escaped) + 2 quotes + \0 */ - char show_keys_buff[15 + 64 * 2 + 3]; + char show_keys_buff[15 + NAME_LEN * 2 + 3]; uint result_length = 0; char *result = 0; |