diff options
| author | unknown <hf@deer.(none)> | 2004-01-19 21:06:27 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-01-19 21:06:27 +0400 |
| commit | 73a5742881fd2c38e9695887bcb607aa75ee0ac1 (patch) | |
| tree | 68d020ad65ffc40d49179abe19fb94245bfbf5d6 /client/mysqldump.c | |
| parent | 75a9472678b3ed2f4d23e70a4a402e1c828c12b4 (diff) | |
| parent | 5c57c6ce2edde35837e9ef8e26e66dff5be6b2a8 (diff) | |
| download | mariadb-git-73a5742881fd2c38e9695887bcb607aa75ee0ac1.tar.gz | |
Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-4.1.1676
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 018cd43ce87..921ffbaab5b 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -37,7 +37,7 @@ ** 10 Jun 2003: SET NAMES and --no-set-names by Alexander Barkov */ -#define DUMP_VERSION "10.4" +#define DUMP_VERSION "10.5" #include <my_global.h> #include <my_sys.h> @@ -107,7 +107,8 @@ static CHARSET_INFO *charset_info= &my_charset_latin1; const char *compatible_mode_names[]= { "MYSQL323", "MYSQL40", "POSTGRESQL", "ORACLE", "MSSQL", "DB2", - "SAPDB", "NO_KEY_OPTIONS", "NO_TABLE_OPTIONS", "NO_FIELD_OPTIONS", + "MAXDB", "NO_KEY_OPTIONS", "NO_TABLE_OPTIONS", "NO_FIELD_OPTIONS", + "ANSI", NullS }; TYPELIB compatible_mode_typelib= {array_elements(compatible_mode_names) - 1, @@ -136,7 +137,7 @@ static struct my_option my_long_options[] = "Directory where character sets are.", (gptr*) &charsets_dir, (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"compatible", OPT_COMPATIBLE, - "Change the dump to be compatible with a given mode. By default tables are dumped without any restrictions. Legal modes are: mysql323, mysql40, postgresql, oracle, mssql, db2, sapdb, no_key_options, no_table_options, no_field_options. One can use several modes separated by commas. Note: Requires MySQL server version 4.1.0 or higher. This option does a no operation on earlier server versions.", + "Change the dump to be compatible with a given mode. By default tables are dumped without any restrictions. Legal modes are: ansi, mysql323, mysql40, postgresql, oracle, mssql, db2, maxdb, no_key_options, no_table_options, no_field_options. One can use several modes separated by commas. Note: Requires MySQL server version 4.1.0 or higher. This option does a no operation on earlier server versions.", (gptr*) &opt_compatible_mode_str, (gptr*) &opt_compatible_mode_str, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"complete-insert", 'c', "Use complete insert statements.", (gptr*) &cFlag, @@ -239,7 +240,7 @@ static struct my_option my_long_options[] = {"quick", 'q', "Don't buffer query, dump directly to stdout.", (gptr*) &quick, (gptr*) &quick, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, {"quote-names",'Q', "Quote table and column names with backticks (`).", - (gptr*) &opt_quoted, (gptr*) &opt_quoted, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, + (gptr*) &opt_quoted, (gptr*) &opt_quoted, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, {"result-file", 'r', "Direct output to a given file. This option should be used in MSDOS, because it prevents new line '\\n' from being converted to '\\r\\n' (carriage return + line feed).", @@ -830,7 +831,7 @@ static uint getTableStructure(char *table, char* db) char *end; uint i; - sprintf(buff, "/*!41000 SET @@sql_mode=\""); + sprintf(buff, "/*!40100 SET @@sql_mode=\""); end= strend(buff); for (i= 0; opt_compatible_mode; opt_compatible_mode>>= 1, i++) { |