mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
This commit is contained in:
commit
f0d5afd6bb
1 changed files with 3 additions and 1 deletions
|
@ -50,6 +50,7 @@
|
|||
#include "mysql.h"
|
||||
#include "mysql_version.h"
|
||||
#include "mysqld_error.h"
|
||||
#include "sql/ha_ndbcluster_tables.h"
|
||||
|
||||
/* Exit codes */
|
||||
|
||||
|
@ -134,7 +135,6 @@ static CHARSET_INFO *charset_info= &my_charset_latin1;
|
|||
const char *default_dbug_option="d:t:o,/tmp/mysqldump.trace";
|
||||
/* do we met VIEWs during tables scaning */
|
||||
my_bool was_views= 0;
|
||||
|
||||
const char *compatible_mode_names[]=
|
||||
{
|
||||
"MYSQL323", "MYSQL40", "POSTGRESQL", "ORACLE", "MSSQL", "DB2",
|
||||
|
@ -2937,6 +2937,8 @@ static int dump_all_tables_in_db(char *database)
|
|||
afterdot= strmov(hash_key, database);
|
||||
*afterdot++= '.';
|
||||
|
||||
if (!strcmp(database, NDB_REP_DB)) /* Skip cluster internal database */
|
||||
return 0;
|
||||
if (init_dumping(database))
|
||||
return 1;
|
||||
if (opt_xml)
|
||||
|
|
Loading…
Reference in a new issue