diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-10-15 14:51:56 +0500 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-10-15 14:51:56 +0500 |
| commit | 8759d0300999953b59777e5f040123dd60d485c0 (patch) | |
| tree | 057c1b5624b46363200dda2e2adcf12fb8658463 /sql | |
| parent | d72c4a535c21382d90a6fcc19335cc4224b953e3 (diff) | |
| parent | 597bf2384d6ed30ab311ce088554d4194dc219c4 (diff) | |
| download | mariadb-git-8759d0300999953b59777e5f040123dd60d485c0.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/set_var.cc | 2 | ||||
| -rw-r--r-- | sql/sql_show.cc | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index a1919bf1a0e..510221bfdb5 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -214,7 +214,7 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset; #define MODE_ORACLE 512 #define MODE_MSSQL 1024 #define MODE_DB2 2048 -#define MODE_SAPDB 4096 +#define MODE_MAXDB 4096 #define MODE_NO_KEY_OPTIONS 8192 #define MODE_NO_TABLE_OPTIONS 16384 #define MODE_NO_FIELD_OPTIONS 32768 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 62f2471d34f..e21dbc24395 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -217,7 +217,7 @@ const char *sql_mode_names[] = "REAL_AS_FLOAT", "PIPES_AS_CONCAT", "ANSI_QUOTES", "IGNORE_SPACE", "?", "ONLY_FULL_GROUP_BY", "NO_UNSIGNED_SUBTRACTION", "NO_DIR_IN_CREATE", - "POSTGRESQL", "ORACLE", "MSSQL", "DB2", "SAPDB", "NO_KEY_OPTIONS", + "POSTGRESQL", "ORACLE", "MSSQL", "DB2", "MAXDB", "NO_KEY_OPTIONS", "NO_TABLE_OPTIONS", "NO_FIELD_OPTIONS", "MYSQL323", "MYSQL40", "ANSI", "NO_AUTO_VALUE_ON_ZERO", NullS }; diff --git a/sql/set_var.cc b/sql/set_var.cc index eb456b0745f..b81e4fd0215 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2205,7 +2205,7 @@ ulong fix_sql_mode(ulong sql_mode) MODE_IGNORE_SPACE | MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS | MODE_NO_FIELD_OPTIONS); - if (sql_mode & MODE_SAPDB) + if (sql_mode & MODE_MAXDB) sql_mode|= (MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES | MODE_IGNORE_SPACE | MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS | diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 8550973ff88..fce25da2cd0 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1073,7 +1073,7 @@ store_create_info(THD *thd, TABLE *table, String *packet) MODE_ORACLE | MODE_MSSQL | MODE_DB2 | - MODE_SAPDB | + MODE_MAXDB | MODE_ANSI)) != 0; my_bool limited_mysql_mode= (thd->variables.sql_mode & (MODE_NO_FIELD_OPTIONS | MODE_MYSQL323 | diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 51df4e358b4..7286be82706 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1254,7 +1254,7 @@ type: | TIME_SYM { $$=FIELD_TYPE_TIME; } | TIMESTAMP { - if (YYTHD->variables.sql_mode & MODE_SAPDB) + if (YYTHD->variables.sql_mode & MODE_MAXDB) $$=FIELD_TYPE_DATETIME; else $$=FIELD_TYPE_TIMESTAMP; |