Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2103 06/01/31 16:01:27 andrey@lmy004. +4 -0
partial fix for bug#16407 (sql_mode not regarded)
add sql_mode to mysql.event
WL#1034 (Internal CRON)
scripts/mysql_fix_privilege_tables.sql
1.36 06/01/31 16:01:14 andrey@lmy004. +64 -0
partial fix for bug#16407 (sql_mode not regarded)
add sql_mode to mysql.event
scripts/mysql_create_system_tables.sh
1.36 06/01/31 16:01:14 andrey@lmy004. +32 -0
partial fix for bug#16407 (sql_mode not regarded)
add sql_mode to mysql.event
mysql-test/r/system_mysql_db.result
1.37 06/01/31 16:01:14 andrey@lmy004. +1 -0
partial fix for bug#16407 (sql_mode not regarded)
add sql_mode to mysql.event
mysql-test/lib/init_db.sql
1.23 06/01/31 16:01:13 andrey@lmy004. +32 -0
partial fix for bug#16407 (sql_mode not regarded)
add sql_mode to mysql.event
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: andrey
# Host: lmy004.
# Root: /work/mysql-5.1-bug16407
--- 1.22/mysql-test/lib/init_db.sql 2006-01-30 13:31:15 +01:00
+++ 1.23/mysql-test/lib/init_db.sql 2006-01-31 16:01:13 +01:00
@@ -595,6 +595,38 @@
ends DATETIME default NULL,
status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED',
on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP',
+ sql_mode set(
+ 'REAL_AS_FLOAT',
+ 'PIPES_AS_CONCAT',
+ 'ANSI_QUOTES',
+ 'IGNORE_SPACE',
+ 'NOT_USED',
+ 'ONLY_FULL_GROUP_BY',
+ 'NO_UNSIGNED_SUBTRACTION',
+ 'NO_DIR_IN_CREATE',
+ 'POSTGRESQL',
+ 'ORACLE',
+ 'MSSQL',
+ 'DB2',
+ 'MAXDB',
+ 'NO_KEY_OPTIONS',
+ 'NO_TABLE_OPTIONS',
+ 'NO_FIELD_OPTIONS',
+ 'MYSQL323',
+ 'MYSQL40',
+ 'ANSI',
+ 'NO_AUTO_VALUE_ON_ZERO',
+ 'NO_BACKSLASH_ESCAPES',
+ 'STRICT_TRANS_TABLES',
+ 'STRICT_ALL_TABLES',
+ 'NO_ZERO_IN_DATE',
+ 'NO_ZERO_DATE',
+ 'INVALID_DATES',
+ 'ERROR_FOR_DIVISION_BY_ZERO',
+ 'TRADITIONAL',
+ 'NO_AUTO_CREATE_USER',
+ 'HIGH_NOT_PRECEDENCE'
+ ) DEFAULT '' NOT NULL,
comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
PRIMARY KEY (definer, db, name)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
--- 1.35/scripts/mysql_fix_privilege_tables.sql 2006-01-30 13:31:16 +01:00
+++ 1.36/scripts/mysql_fix_privilege_tables.sql 2006-01-31 16:01:14 +01:00
@@ -589,6 +589,38 @@
ends DATETIME default NULL,
status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED',
on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP',
+ sql_mode set(
+ 'REAL_AS_FLOAT',
+ 'PIPES_AS_CONCAT',
+ 'ANSI_QUOTES',
+ 'IGNORE_SPACE',
+ 'NOT_USED',
+ 'ONLY_FULL_GROUP_BY',
+ 'NO_UNSIGNED_SUBTRACTION',
+ 'NO_DIR_IN_CREATE',
+ 'POSTGRESQL',
+ 'ORACLE',
+ 'MSSQL',
+ 'DB2',
+ 'MAXDB',
+ 'NO_KEY_OPTIONS',
+ 'NO_TABLE_OPTIONS',
+ 'NO_FIELD_OPTIONS',
+ 'MYSQL323',
+ 'MYSQL40',
+ 'ANSI',
+ 'NO_AUTO_VALUE_ON_ZERO',
+ 'NO_BACKSLASH_ESCAPES',
+ 'STRICT_TRANS_TABLES',
+ 'STRICT_ALL_TABLES',
+ 'NO_ZERO_IN_DATE',
+ 'NO_ZERO_DATE',
+ 'INVALID_DATES',
+ 'ERROR_FOR_DIVISION_BY_ZERO',
+ 'TRADITIONAL',
+ 'NO_AUTO_CREATE_USER',
+ 'HIGH_NOT_PRECEDENCE'
+ ) DEFAULT '' NOT NULL,
comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',
PRIMARY KEY (db,name)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
@@ -602,4 +634,36 @@
ALTER TABLE db add Event_priv enum('N','Y') character set utf8 DEFAULT 'N' NOT NULL;
ALTER TABLE event DROP PRIMARY KEY;
ALTER TABLE event ADD PRIMARY KEY(definer, db, name);
+ALTER TABLE proc MODIFY sql_mode
+ set('REAL_AS_FLOAT',
+ 'PIPES_AS_CONCAT',
+ 'ANSI_QUOTES',
+ 'IGNORE_SPACE',
+ 'NOT_USED',
+ 'ONLY_FULL_GROUP_BY',
+ 'NO_UNSIGNED_SUBTRACTION',
+ 'NO_DIR_IN_CREATE',
+ 'POSTGRESQL',
+ 'ORACLE',
+ 'MSSQL',
+ 'DB2',
+ 'MAXDB',
+ 'NO_KEY_OPTIONS',
+ 'NO_TABLE_OPTIONS',
+ 'NO_FIELD_OPTIONS',
+ 'MYSQL323',
+ 'MYSQL40',
+ 'ANSI',
+ 'NO_AUTO_VALUE_ON_ZERO',
+ 'NO_BACKSLASH_ESCAPES',
+ 'STRICT_TRANS_TABLES',
+ 'STRICT_ALL_TABLES',
+ 'NO_ZERO_IN_DATE',
+ 'NO_ZERO_DATE',
+ 'INVALID_DATES',
+ 'ERROR_FOR_DIVISION_BY_ZERO',
+ 'TRADITIONAL',
+ 'NO_AUTO_CREATE_USER',
+ 'HIGH_NOT_PRECEDENCE'
+ ) DEFAULT '' NOT NULL;
--- 1.36/mysql-test/r/system_mysql_db.result 2006-01-30 17:11:41 +01:00
+++ 1.37/mysql-test/r/system_mysql_db.result 2006-01-31 16:01:14 +01:00
@@ -203,6 +203,7 @@
`ends` datetime default NULL,
`status` enum('ENABLED','DISABLED') NOT NULL default 'ENABLED',
`on_completion` enum('DROP','PRESERVE') NOT NULL default 'DROP',
+ `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') NOT NULL default '',
`comment` char(64) character set utf8 collate utf8_bin NOT NULL default '',
PRIMARY KEY (`definer`,`db`,`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'
--- 1.35/scripts/mysql_create_system_tables.sh 2006-01-30 13:31:16 +01:00
+++ 1.36/scripts/mysql_create_system_tables.sh 2006-01-31 16:01:14 +01:00
@@ -791,6 +791,38 @@
c_ev="$c_ev ends DATETIME default NULL,"
c_ev="$c_ev status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED',"
c_ev="$c_ev on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP',"
+ c_ev="$c_ev sql_mode set("
+ c_ev="$c_ev 'REAL_AS_FLOAT',"
+ c_ev="$c_ev 'PIPES_AS_CONCAT',"
+ c_ev="$c_ev 'ANSI_QUOTES',"
+ c_ev="$c_ev 'IGNORE_SPACE',"
+ c_ev="$c_ev 'NOT_USED',"
+ c_ev="$c_ev 'ONLY_FULL_GROUP_BY',"
+ c_ev="$c_ev 'NO_UNSIGNED_SUBTRACTION',"
+ c_ev="$c_ev 'NO_DIR_IN_CREATE',"
+ c_ev="$c_ev 'POSTGRESQL',"
+ c_ev="$c_ev 'ORACLE',"
+ c_ev="$c_ev 'MSSQL',"
+ c_ev="$c_ev 'DB2',"
+ c_ev="$c_ev 'MAXDB',"
+ c_ev="$c_ev 'NO_KEY_OPTIONS',"
+ c_ev="$c_ev 'NO_TABLE_OPTIONS',"
+ c_ev="$c_ev 'NO_FIELD_OPTIONS',"
+ c_ev="$c_ev 'MYSQL323',"
+ c_ev="$c_ev 'MYSQL40',"
+ c_ev="$c_ev 'ANSI',"
+ c_ev="$c_ev 'NO_AUTO_VALUE_ON_ZERO',"
+ c_ev="$c_ev 'NO_BACKSLASH_ESCAPES',"
+ c_ev="$c_ev 'STRICT_TRANS_TABLES',"
+ c_ev="$c_ev 'STRICT_ALL_TABLES',"
+ c_ev="$c_ev 'NO_ZERO_IN_DATE',"
+ c_ev="$c_ev 'NO_ZERO_DATE',"
+ c_ev="$c_ev 'INVALID_DATES',"
+ c_ev="$c_ev 'ERROR_FOR_DIVISION_BY_ZERO',"
+ c_ev="$c_ev 'TRADITIONAL',"
+ c_ev="$c_ev 'NO_AUTO_CREATE_USER',"
+ c_ev="$c_ev 'HIGH_NOT_PRECEDENCE'"
+ c_ev="$c_ev ) DEFAULT '' NOT NULL,"
c_ev="$c_ev comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',"
c_ev="$c_ev PRIMARY KEY (definer, db, name)"
c_ev="$c_ev ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';"
| Thread |
|---|
| • bk commit into 5.1 tree (andrey:1.2103) BUG#16407 | ahristov | 31 Jan |
