Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max

mysql-test/r/sql_mode.result

@@ -71,10 +71,10 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY  (`a`),
   UNIQUE KEY `email` (`email`)
 ) TYPE=HEAP ROW_FORMAT=DYNAMIC
-set sql_mode="postgresql,oracle,mssql,db2,sapdb";
+set sql_mode="postgresql,oracle,mssql,db2,maxdb";
 select @@sql_mode;
 @@sql_mode
-PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,POSTGRESQL,ORACLE,MSSQL,DB2,SAPDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS
+PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE "t1" (

mysql-test/t/sql_mode.test

@@ -24,7 +24,7 @@ show create table t1;
 set @@sql_mode="no_field_options,mysql323,mysql40";
 show variables like 'sql_mode';
 show create table t1;
-set sql_mode="postgresql,oracle,mssql,db2,sapdb";
+set sql_mode="postgresql,oracle,mssql,db2,maxdb";
 select @@sql_mode;
 show create table t1;
 drop table t1;

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

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
 };

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 |

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 |

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;