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/mysqld.cc | |
| 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/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 }; |