diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-05 00:12:45 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-05 00:12:45 +0300 |
| commit | ad5e39bf12b7aeefbc313e464a1349541a7b15c5 (patch) | |
| tree | 824e127f68404d3fbe881d6619e34ad389d21202 /sql/sql_show.cc | |
| parent | 020baadcfebbd0f2248d9a3fa15f29d6e9d954b4 (diff) | |
| parent | c6c60f6ee819a238ab62e3f9608502c9a8f25b36 (diff) | |
| download | mariadb-git-ad5e39bf12b7aeefbc313e464a1349541a7b15c5.tar.gz | |
merge with public tree
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/mysql.h:
Auto merged
include/mysql_version.h.in:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/ctype_collate.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysys/default.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 277bc5d8337..1c4954e0276 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1006,12 +1006,7 @@ static void append_identifier(THD *thd, String *packet, const char *name) { char qtype; - if ((thd->variables.sql_mode & MODE_ANSI_QUOTES) || - (thd->variables.sql_mode & MODE_POSTGRESQL) || - (thd->variables.sql_mode & MODE_ORACLE) || - (thd->variables.sql_mode & MODE_MSSQL) || - (thd->variables.sql_mode & MODE_DB2) || - (thd->variables.sql_mode & MODE_SAPDB)) + if (thd->variables.sql_mode & MODE_ANSI_QUOTES) qtype= '\"'; else qtype= '`'; @@ -1033,16 +1028,16 @@ append_identifier(THD *thd, String *packet, const char *name) static int store_create_info(THD *thd, TABLE *table, String *packet) { - my_bool foreign_db_mode= ((thd->variables.sql_mode & MODE_POSTGRESQL) || - (thd->variables.sql_mode & MODE_ORACLE) || - (thd->variables.sql_mode & MODE_MSSQL) || - (thd->variables.sql_mode & MODE_DB2) || - (thd->variables.sql_mode & MODE_SAPDB)); - my_bool limited_mysql_mode= ((thd->variables.sql_mode & - MODE_NO_FIELD_OPTIONS) || - (thd->variables.sql_mode & MODE_MYSQL323) || - (thd->variables.sql_mode & MODE_MYSQL40)); - + my_bool foreign_db_mode= (thd->variables.sql_mode & (MODE_POSTGRESQL | + MODE_ORACLE | + MODE_MSSQL | + MODE_DB2 | + MODE_SAPDB | + MODE_ANSI)) != 0; + my_bool limited_mysql_mode= (thd->variables.sql_mode & + (MODE_NO_FIELD_OPTIONS | MODE_MYSQL323 | + MODE_MYSQL40)) != 0; + DBUG_ENTER("store_create_info"); DBUG_PRINT("enter",("table: %s",table->real_name)); |