summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorunknown <jani@rhols221.adsl.netsonic.fi>2003-01-16 05:35:59 +0200
committerunknown <jani@rhols221.adsl.netsonic.fi>2003-01-16 05:35:59 +0200
commit3604aa00a3be378a0412b4171be1d6f591e57c23 (patch)
treee935ba87f132f0cb66b08730ef3a2f73a0c4e6c9 /sql/sql_show.cc
parentd08e02ebe12d46abc55648247fc98b6cbbaa36c6 (diff)
downloadmariadb-git-3604aa00a3be378a0412b4171be1d6f591e57c23.tar.gz
Added --compatible mode to mysqldump.
client/mysqldump.c: Added --compatible mode to mysqldump. This mode can take the following values: mysql323,mysql40,postgresql,oracle,mssql,db2,sapdb,no_key_options, no_table_options,no_field_options. The table definition (SHOW CREATE TABLE name) will be compatible with the given mode. mysql-test/r/sql_mode.result: Fixed a bug in sql_show.cc, which affected the result. sql/sql_show.cc: Fixed a bug.
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 451a0956cf8..3ec45c8eca9 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1198,7 +1198,9 @@ store_create_info(THD *thd, TABLE *table, String *packet)
char buff[128];
char* p;
- if (table->table_charset)
+ if (table->table_charset &&
+ !(thd->variables.sql_mode & MODE_MYSQL323) &&
+ !(thd->variables.sql_mode & MODE_MYSQL40))
{
packet->append(" CHARSET=");
packet->append(table->table_charset->csname);