mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
Merge with 4.0
BitKeeper/etc/gone: auto-union BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18: Auto merged BitKeeper/etc/config: Auto merged acconfig.h: Auto merged acinclude.m4: Auto merged Docs/manual.texi: Auto merged client/mysqlcheck.c: Auto merged client/mysqlshow.c: Auto merged include/myisam.h: Auto merged include/violite.h: Auto merged isam/pack_isam.c: Auto merged libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/Makefile.am: Auto merged myisam/ft_nlq_search.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_write.c: Auto merged myisam/sort.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/func_test.result: Auto merged mysql-test/r/isam.result: Auto merged mysql-test/r/rpl_replicate_do.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/func_test.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/rpl_rotate_logs.test: Auto merged mysql-test/t/variables.test: Auto merged mysys/hash.c: Auto merged mysys/tree.c: Auto merged scripts/Makefile.am: Auto merged sql/Makefile.am: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hash_filo.h: Auto merged sql/hostname.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_timefunc.cc: Auto merged sql/lex.h: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log_event.h: Auto merged sql/mini_client.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_sum.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.h: Auto merged sql/slave.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_udf.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/table.h: Auto merged sql/unireg.cc: Auto merged sql-bench/server-cfg.sh: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged sql/ha_myisam.cc: Merge with 4.0 Removed some commented code sql/sql_db.cc: Merge with 4.0 Optimized the logging of the drop db call a bit sql/sql_update.cc: Added comment
This commit is contained in:
unknown
commit
33fc0d53b5
300 changed files with 7654 additions and 2415 deletions
|
|
@ -305,7 +305,10 @@ static void short_usage(void)
|
|||
static void write_header(FILE *sql_file, char *db_name)
|
||||
{
|
||||
if (opt_xml)
|
||||
{
|
||||
fprintf(sql_file,"<?xml version=\"1.0\"?>\n");
|
||||
fprintf(sql_file,"<mysqldump>\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf(sql_file, "-- MySQL dump %s\n--\n", DUMP_VERSION);
|
||||
|
|
@ -319,6 +322,12 @@ static void write_header(FILE *sql_file, char *db_name)
|
|||
return;
|
||||
} /* write_header */
|
||||
|
||||
static void write_footer(FILE *sql_file)
|
||||
{
|
||||
if (opt_xml)
|
||||
fprintf(sql_file,"</mysqldump>");
|
||||
fputs("\n", sql_file);
|
||||
} /* write_footer */
|
||||
|
||||
static my_bool
|
||||
get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
||||
|
|
@ -1004,7 +1013,7 @@ static void dumpTable(uint numFields, char *table)
|
|||
rownr=0;
|
||||
init_length=(uint) strlen(insert_pat)+4;
|
||||
if (opt_xml)
|
||||
fprintf(md_result_file, "\t<%s>\n", table);
|
||||
fprintf(md_result_file, "\t<table name=\"%s\">\n", table);
|
||||
|
||||
if (opt_autocommit)
|
||||
fprintf(md_result_file, "set autocommit=0;\n");
|
||||
|
|
@ -1094,9 +1103,9 @@ static void dumpTable(uint numFields, char *table)
|
|||
/* change any strings ("inf","nan",..) into NULL */
|
||||
char *ptr = row[i];
|
||||
if (opt_xml)
|
||||
fprintf(md_result_file, "\t\t<%s>%s</%s>\n",
|
||||
fprintf(md_result_file, "\t\t<field name=\"%s\">%s</field>\n",
|
||||
field->name,
|
||||
!my_isalpha(system_charset_info,*ptr) ?ptr: "NULL",field->name);
|
||||
!my_isalpha(system_charset_info, *ptr) ? ptr: "NULL");
|
||||
else
|
||||
fputs((!my_isalpha(system_charset_info,*ptr)) ?
|
||||
ptr : "NULL", md_result_file);
|
||||
|
|
@ -1105,8 +1114,8 @@ static void dumpTable(uint numFields, char *table)
|
|||
else
|
||||
{
|
||||
if (opt_xml)
|
||||
fprintf(md_result_file, "\t\t<%s>%s</%s>\n",
|
||||
field->name, "NULL", field->name);
|
||||
fprintf(md_result_file, "\t\t<field name=\"%s\">%s</field>\n",
|
||||
field->name, "NULL");
|
||||
else
|
||||
fputs("NULL", md_result_file);
|
||||
}
|
||||
|
|
@ -1147,7 +1156,7 @@ static void dumpTable(uint numFields, char *table)
|
|||
|
||||
/* XML - close table tag and supress regular output */
|
||||
if (opt_xml)
|
||||
fprintf(md_result_file, "\t</%s>\n", table);
|
||||
fprintf(md_result_file, "\t</table>\n");
|
||||
else if (extended_insert && row_break)
|
||||
fputs(";\n", md_result_file); /* If not empty table */
|
||||
fflush(md_result_file);
|
||||
|
|
@ -1179,7 +1188,7 @@ static void print_quoted_xml(FILE *output, char *fname, char *str, uint len)
|
|||
{
|
||||
const char *end;
|
||||
|
||||
fprintf(output, "\t\t<%s>", fname);
|
||||
fprintf(output, "\t\t<field name=\"%s\">", fname);
|
||||
for (end = str + len; str != end; str++)
|
||||
{
|
||||
if (*str == '<')
|
||||
|
|
@ -1193,7 +1202,7 @@ static void print_quoted_xml(FILE *output, char *fname, char *str, uint len)
|
|||
else
|
||||
fputc(*str, output);
|
||||
}
|
||||
fprintf(output, "</%s>\n", fname);
|
||||
fprintf(output, "</field>\n");
|
||||
}
|
||||
|
||||
static char *getTableName(int reset)
|
||||
|
|
@ -1248,13 +1257,8 @@ static int dump_databases(char **db_names)
|
|||
int result=0;
|
||||
for ( ; *db_names ; db_names++)
|
||||
{
|
||||
/* XML edit - add database element */
|
||||
if (opt_xml)
|
||||
fprintf(md_result_file, "<%s>\n", *db_names);
|
||||
if (dump_all_tables_in_db(*db_names))
|
||||
result=1;
|
||||
if (opt_xml)
|
||||
fprintf(md_result_file, "</%s>\n", *db_names);
|
||||
}
|
||||
return result;
|
||||
} /* dump_databases */
|
||||
|
|
@ -1267,7 +1271,7 @@ static int init_dumping(char *database)
|
|||
DBerror(sock, "when selecting the database");
|
||||
return 1; /* If --force */
|
||||
}
|
||||
if (!path)
|
||||
if (!path && !opt_xml)
|
||||
{
|
||||
if (opt_databases || opt_alldbs)
|
||||
{
|
||||
|
|
@ -1313,6 +1317,8 @@ static int dump_all_tables_in_db(char *database)
|
|||
|
||||
if (init_dumping(database))
|
||||
return 1;
|
||||
if (opt_xml)
|
||||
fprintf(md_result_file, "<database name=\"%s\">\n", database);
|
||||
if (lock_tables)
|
||||
{
|
||||
DYNAMIC_STRING query;
|
||||
|
|
@ -1339,6 +1345,8 @@ static int dump_all_tables_in_db(char *database)
|
|||
if (!dFlag && numrows > 0)
|
||||
dumpTable(numrows,table);
|
||||
}
|
||||
if (opt_xml)
|
||||
fprintf(md_result_file, "</database>\n");
|
||||
if (lock_tables)
|
||||
mysql_query(sock,"UNLOCK_TABLES");
|
||||
return 0;
|
||||
|
|
@ -1375,12 +1383,16 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
|
|||
DBerror(sock, "when doing refresh");
|
||||
/* We shall countinue here, if --force was given */
|
||||
}
|
||||
if (opt_xml)
|
||||
fprintf(md_result_file, "<database name=\"%s\">\n", db);
|
||||
for (; tables > 0 ; tables-- , table_names++)
|
||||
{
|
||||
numrows = getTableStructure(*table_names, db);
|
||||
if (!dFlag && numrows > 0)
|
||||
dumpTable(numrows, *table_names);
|
||||
}
|
||||
if (opt_xml)
|
||||
fprintf(md_result_file, "</database>\n");
|
||||
if (lock_tables)
|
||||
mysql_query(sock,"UNLOCK_TABLES");
|
||||
return 0;
|
||||
|
|
@ -1514,7 +1526,7 @@ int main(int argc, char **argv)
|
|||
}
|
||||
}
|
||||
dbDisconnect(current_host);
|
||||
fputs("\n", md_result_file);
|
||||
write_footer(md_result_file);
|
||||
if (md_result_file != stdout)
|
||||
my_fclose(md_result_file, MYF(0));
|
||||
my_free(opt_password, MYF(MY_ALLOW_ZERO_PTR));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue