| List: | Commits | « Previous MessageNext Message » | |
| From: | Ignacio Galarza | Date: | April 8 2008 5:50pm |
| Subject: | bk commit into 6.0 tree (iggy:1.2625) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 6.0 repository of iggy. When iggy 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@stripped, 2008-04-08 11:50:17-04:00, iggy@amd64.(none) +13 -0 Manual Merge include/my_base.h@stripped, 2008-04-08 11:50:14-04:00, iggy@amd64.(none) +6 -8 Manual Merge include/myisam.h@stripped, 2008-04-08 11:50:14-04:00, iggy@amd64.(none) +2 -1 Manual Merge mysql-test/r/locktrans_innodb.result@stripped, 2008-04-08 11:50:14-04:00, iggy@amd64.(none) +12 -12 Manual Merge mysql-test/r/locktrans_myisam.result@stripped, 2008-04-08 11:50:14-04:00, iggy@amd64.(none) +19 -19 Manual Merge mysql-test/r/order_by.result@stripped, 2008-04-08 11:50:14-04:00, iggy@amd64.(none) +3 -3 Manual Merge mysql-test/r/subselect_mat.result@stripped, 2008-04-08 11:50:14-04:00, iggy@amd64.(none) +2 -2 Manual Merge mysql-test/suite/rpl/r/rpl_heartbeat.result@stripped, 2008-04-08 11:50:14-04:00, iggy@amd64.(none) +4 -4 Manual Merge mysql-test/suite/rpl/r/rpl_locktrans_innodb.result@stripped, 2008-04-08 11:50:14-04:00, iggy@amd64.(none) +12 -12 Manual Merge mysql-test/suite/rpl/r/rpl_locktrans_myisam.result@stripped, 2008-04-08 11:50:14-04:00, iggy@amd64.(none) +19 -19 Manual Merge mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result@stripped, 2008-04-08 11:50:14-04:00, iggy@amd64.(none) +2 -2 Manual Merge mysql-test/suite/rpl/r/rpl_slave_skip.result@stripped, 2008-04-08 11:50:14-04:00, iggy@amd64.(none) +2 -2 Manual Merge mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result@stripped, 2008-04-08 11:50:14-04:00, iggy@amd64.(none) +95 -0 Manual Merge storage/myisam/mi_check.c@stripped, 2008-04-08 11:50:14-04:00, iggy@amd64.(none) +1 -1 Manual Merge diff -Nrup a/include/my_base.h b/include/my_base.h --- a/include/my_base.h 2008-04-07 20:09:12 -04:00 +++ b/include/my_base.h 2008-04-08 11:50:14 -04:00 @@ -448,14 +448,12 @@ enum ha_base_keytype { #define HA_ERR_LOCK_OR_ACTIVE_TRANSACTION 173 #define HA_ERR_ROWS_EVENT_APPLY 174 /* The event could not be processed */ #define HA_ERR_NO_SUCH_TABLESPACE 175 - -#define HA_ERR_NEW_FILE 176 /* New file format */ -#define HA_ERR_ROWS_EVENT_APPLY 177 /* The event could not be processed - no other hanlder error happened */ -#define HA_ERR_INITIALIZATION 178 /* Error during initialization */ -#define HA_ERR_FILE_TOO_SHORT 179 /* File too short */ -#define HA_ERR_WRONG_CRC 180 /* Wrong CRC on page */ -#define HA_ERR_LAST 180 /* Copy of last error nr */ +#define HA_ERR_NEW_FILE 176 /* New file format */ +#define HA_ERR_INITIALIZATION 177 /* Error during initialization */ +#define HA_ERR_FILE_TOO_SHORT 178 /* File too short */ +#define HA_ERR_WRONG_CRC 179 /* Wrong CRC on page */ +#define HA_ERR_LAST 179 /* Copy of last error nr */ +/* Add error numbers before HA_ERR_LAST and change it accordingly. */ /* Number of different errors */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) diff -Nrup a/include/myisam.h b/include/myisam.h --- a/include/myisam.h 2008-04-07 20:09:12 -04:00 +++ b/include/myisam.h 2008-04-08 11:50:14 -04:00 @@ -43,7 +43,6 @@ extern "C" { #define MI_MAX_KEY MAX_INDEXES /* Max allowed keys */ #endif -#define MI_MAX_POSSIBLE_KEY_BUFF HA_MAX_POSSIBLE_KEY_BUFF /* The following defines can be increased if necessary. But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. @@ -64,6 +63,8 @@ extern "C" { #define MI_KEY_BLOCK_LENGTH 1024 /* default key block length */ #define MI_MIN_KEY_BLOCK_LENGTH 1024 /* Min key block length */ #define MI_MAX_KEY_BLOCK_LENGTH 16384 + +#define mi_portable_sizeof_char_ptr 8 /* In the following macros '_keyno_' is 0 .. keys-1. diff -Nrup a/mysql-test/r/locktrans_innodb.result b/mysql-test/r/locktrans_innodb.result --- a/mysql-test/r/locktrans_innodb.result 2008-02-07 07:21:46 -05:00 +++ b/mysql-test/r/locktrans_innodb.result 2008-04-08 11:50:14 -04:00 @@ -94,12 +94,12 @@ ERROR 42000: You have an error in your S # Implicit lock method conversion due to mix in statement. LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't2' +Warning 1613 Converted to non-transactional lock on 't2' UNLOCK TABLES; # Lock t1 share (converted to read), t2 write. LOCK TABLE t1 IN SHARE MODE, t2 WRITE; Warnings: -Warning 1611 Converted to non-transactional lock on 't1' +Warning 1613 Converted to non-transactional lock on 't1' # Show t1 is read locked, t2 write locked. INSERT INTO t1 SELECT * FROM t2; ERROR HY000: Table 't1' was locked with a READ lock and can't be updated @@ -110,8 +110,8 @@ INSERT INTO t2 SELECT * FROM t1; # Lock t1 exclusive (converted to write), t2 share (converted to read). LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't1' -Warning 1611 Converted to non-transactional lock on 't2' +Warning 1613 Converted to non-transactional lock on 't1' +Warning 1613 Converted to non-transactional lock on 't2' # Show t1 is write locked, t2 read locked. INSERT INTO t1 SELECT * FROM t2; INSERT INTO t2 SELECT * FROM t1; @@ -135,8 +135,8 @@ ERROR HY000: Cannot convert to non-trans ## Error is reported on first table only. Show both errors: SHOW WARNINGS; Level Code Message -Error 1612 Cannot convert to non-transactional lock in strict mode on 't1' -Error 1612 Cannot convert to non-transactional lock in strict mode on 't2' +Error 1614 Cannot convert to non-transactional lock in strict mode on 't1' +Error 1614 Cannot convert to non-transactional lock in strict mode on 't2' UNLOCK TABLES; SET @@SQL_MODE= @wl3561_save_sql_mode; # @@ -156,7 +156,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM; # Request a transactional lock, which is converted to non-transactional. LOCK TABLE t4 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't4' +Warning 1613 Converted to non-transactional lock on 't4' # Try a conflict with the existing non-transactional lock. INSERT INTO t4 VALUES(444); ERROR HY000: Table 't4' was locked with a READ lock and can't be updated @@ -173,8 +173,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W # Request a share lock on the view, which is converted to read locks. LOCK TABLE v1 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't3' -Warning 1611 Converted to non-transactional lock on 't4' +Warning 1613 Converted to non-transactional lock on 't3' +Warning 1613 Converted to non-transactional lock on 't4' # Show that read locks on the base tables prohibit writing ... INSERT INTO t3 SELECT * FROM t4; ERROR HY000: Table 't3' was locked with a READ lock and can't be updated @@ -190,7 +190,7 @@ COUNT(*) ## Report conversion on view due to existing non-transactional locks. LOCK TABLE v1 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 'v1' +Warning 1613 Converted to non-transactional lock on 'v1' INSERT INTO t3 VALUES(333); INSERT INTO t4 VALUES(444); INSERT INTO t1 VALUES(111); @@ -199,8 +199,8 @@ UNLOCK TABLES; ## Now report conversion on base table again. LOCK TABLE v1 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't3' -Warning 1611 Converted to non-transactional lock on 't4' +Warning 1613 Converted to non-transactional lock on 't3' +Warning 1613 Converted to non-transactional lock on 't4' INSERT INTO t3 VALUES(333); INSERT INTO t4 VALUES(444); INSERT INTO t1 VALUES(111); diff -Nrup a/mysql-test/r/locktrans_myisam.result b/mysql-test/r/locktrans_myisam.result --- a/mysql-test/r/locktrans_myisam.result 2008-02-07 07:21:52 -05:00 +++ b/mysql-test/r/locktrans_myisam.result 2008-04-08 11:50:14 -04:00 @@ -21,8 +21,8 @@ UNLOCK TABLES; # Valid syntax for transactional locks. LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't1' -Warning 1611 Converted to non-transactional lock on 't2' +Warning 1613 Converted to non-transactional lock on 't1' +Warning 1613 Converted to non-transactional lock on 't2' UNLOCK TABLES; # # Valid syntax for aliases with and without 'AS'. @@ -30,19 +30,19 @@ LOCK TABLE t1 AS a1 READ, t2 a2 WRITE; UNLOCK TABLES; LOCK TABLE t1 AS a1 IN SHARE MODE, t2 a2 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 'a1' -Warning 1611 Converted to non-transactional lock on 'a2' +Warning 1613 Converted to non-transactional lock on 'a1' +Warning 1613 Converted to non-transactional lock on 'a2' UNLOCK TABLES; # # Transactional locks taken on a view. CREATE VIEW v1 AS SELECT * FROM t1, t2 WHERE t1.c1 = t2.c2; LOCK TABLE v1 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't1' -Warning 1611 Converted to non-transactional lock on 't2' +Warning 1613 Converted to non-transactional lock on 't1' +Warning 1613 Converted to non-transactional lock on 't2' LOCK TABLE v1 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 'v1' +Warning 1613 Converted to non-transactional lock on 'v1' DROP VIEW v1; # # Locking INFORMATION_SCHEMA fails on missing privileges. @@ -94,12 +94,12 @@ ERROR 42000: You have an error in your S # Implicit lock method conversion due to mix in statement. LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't2' +Warning 1613 Converted to non-transactional lock on 't2' UNLOCK TABLES; # Lock t1 share (converted to read), t2 write. LOCK TABLE t1 IN SHARE MODE, t2 WRITE; Warnings: -Warning 1611 Converted to non-transactional lock on 't1' +Warning 1613 Converted to non-transactional lock on 't1' # Show t1 is read locked, t2 write locked. INSERT INTO t1 SELECT * FROM t2; ERROR HY000: Table 't1' was locked with a READ lock and can't be updated @@ -110,8 +110,8 @@ INSERT INTO t2 SELECT * FROM t1; # Lock t1 exclusive (converted to write), t2 share (converted to read). LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't1' -Warning 1611 Converted to non-transactional lock on 't2' +Warning 1613 Converted to non-transactional lock on 't1' +Warning 1613 Converted to non-transactional lock on 't2' # Show t1 is write locked, t2 read locked. INSERT INTO t1 SELECT * FROM t2; INSERT INTO t2 SELECT * FROM t1; @@ -135,8 +135,8 @@ ERROR HY000: Cannot convert to non-trans ## Error is reported on first table only. Show both errors: SHOW WARNINGS; Level Code Message -Error 1612 Cannot convert to non-transactional lock in strict mode on 't1' -Error 1612 Cannot convert to non-transactional lock in strict mode on 't2' +Error 1614 Cannot convert to non-transactional lock in strict mode on 't1' +Error 1614 Cannot convert to non-transactional lock in strict mode on 't2' UNLOCK TABLES; SET @@SQL_MODE= @wl3561_save_sql_mode; # @@ -156,7 +156,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM; # Request a transactional lock, which is converted to non-transactional. LOCK TABLE t4 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't4' +Warning 1613 Converted to non-transactional lock on 't4' # Try a conflict with the existing non-transactional lock. INSERT INTO t4 VALUES(444); ERROR HY000: Table 't4' was locked with a READ lock and can't be updated @@ -173,8 +173,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W # Request a share lock on the view, which is converted to read locks. LOCK TABLE v1 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't3' -Warning 1611 Converted to non-transactional lock on 't4' +Warning 1613 Converted to non-transactional lock on 't3' +Warning 1613 Converted to non-transactional lock on 't4' # Show that read locks on the base tables prohibit writing ... INSERT INTO t3 SELECT * FROM t4; ERROR HY000: Table 't3' was locked with a READ lock and can't be updated @@ -190,7 +190,7 @@ COUNT(*) ## Report conversion on view due to existing non-transactional locks. LOCK TABLE v1 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 'v1' +Warning 1613 Converted to non-transactional lock on 'v1' INSERT INTO t3 VALUES(333); INSERT INTO t4 VALUES(444); INSERT INTO t1 VALUES(111); @@ -199,8 +199,8 @@ UNLOCK TABLES; ## Now report conversion on base table again. LOCK TABLE v1 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't3' -Warning 1611 Converted to non-transactional lock on 't4' +Warning 1613 Converted to non-transactional lock on 't3' +Warning 1613 Converted to non-transactional lock on 't4' INSERT INTO t3 VALUES(333); INSERT INTO t4 VALUES(444); INSERT INTO t1 VALUES(111); diff -Nrup a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result --- a/mysql-test/r/order_by.result 2008-04-07 19:41:32 -04:00 +++ b/mysql-test/r/order_by.result 2008-04-08 11:50:14 -04:00 @@ -1438,8 +1438,8 @@ SELECT d FROM t1, t2 WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE' ORDER BY t2.c LIMIT 1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ref a,b b 4 const 4 Using where; Using temporary; Using filesort -1 SIMPLE t2 ref a,b,c a 40 test.t1.a,const 11 Using where +1 SIMPLE t1 ref a,b b 4 const 4 Using index condition; Using temporary; Using filesort +1 SIMPLE t2 ref a,b,c a 40 test.t1.a,const 11 Using index condition SELECT d FROM t1, t2 WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE' ORDER BY t2.c LIMIT 1; @@ -1450,7 +1450,7 @@ SELECT d FROM t3 AS t1, t2 AS t2 WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE' ORDER BY t2.c LIMIT 1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 range a,b,c c 5 NULL 420 Using where +1 SIMPLE t2 range a,b,c c 5 NULL 420 Using where; Using MRR 1 SIMPLE t1 ref a a 39 test.t2.a,const 10 Using where; Using index SELECT d FROM t3 AS t1, t2 AS t2 WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE' diff -Nrup a/mysql-test/r/subselect_mat.result b/mysql-test/r/subselect_mat.result --- a/mysql-test/r/subselect_mat.result 2008-02-14 10:45:49 -05:00 +++ b/mysql-test/r/subselect_mat.result 2008-04-08 11:50:14 -04:00 @@ -209,7 +209,7 @@ id select_type table type possible_keys 1 PRIMARY t1 ALL NULL NULL NULL NULL 3 100.00 Using where 2 SUBQUERY t2 ALL NULL NULL NULL NULL 5 100.00 Warnings: -Note 1003 select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`a2` AS `a2` from `test`.`t1` where <in_optimizer>((`test`.`t1`.`a1`,`test`.`t1`.`a2`),(`test`.`t1`.`a1`,`test`.`t1`.`a2`) in ( <materialize> (select `test`.`t2`.`b1` AS `b1`,`test`.`t2`.`b2` AS `b2` from `test`.`t2` ), <primary_index_lookup>(`test`.`t1`.`a1` in <temporary table> on distinct_key))) +Note 1003 select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`a2` AS `a2` from `test`.`t1` where <in_optimizer>((`test`.`t1`.`a1`,`test`.`t1`.`a2`),(`test`.`t1`.`a1`,`test`.`t1`.`a2`) in ( <materialize> (select `test`.`t2`.`b1` AS `b1`,`test`.`t2`.`b2` AS `b2` from `test`.`t2` order by `test`.`t2`.`b1`,`test`.`t2`.`b2` ), <primary_index_lookup>(`test`.`t1`.`a1` in <temporary table> on distinct_key))) select * from t1 where (a1, a2) in (select b1, b2 from t2 order by b1, b2); a1 a2 1 - 01 2 - 01 @@ -220,7 +220,7 @@ id select_type table type possible_keys 1 PRIMARY t1i index NULL it1i3 18 NULL 3 100.00 Using where; Using index 2 SUBQUERY t2i index NULL it2i3 18 NULL 5 100.00 Using index Warnings: -Note 1003 select `test`.`t1i`.`a1` AS `a1`,`test`.`t1i`.`a2` AS `a2` from `test`.`t1i` where <in_optimizer>((`test`.`t1i`.`a1`,`test`.`t1i`.`a2`),(`test`.`t1i`.`a1`,`test`.`t1i`.`a2`) in ( <materialize> (select `test`.`t2i`.`b1` AS `b1`,`test`.`t2i`.`b2` AS `b2` from `test`.`t2i` ), <primary_index_lookup>(`test`.`t1i`.`a1` in <temporary table> on distinct_key))) +Note 1003 select `test`.`t1i`.`a1` AS `a1`,`test`.`t1i`.`a2` AS `a2` from `test`.`t1i` where <in_optimizer>((`test`.`t1i`.`a1`,`test`.`t1i`.`a2`),(`test`.`t1i`.`a1`,`test`.`t1i`.`a2`) in ( <materialize> (select `test`.`t2i`.`b1` AS `b1`,`test`.`t2i`.`b2` AS `b2` from `test`.`t2i` order by `test`.`t2i`.`b1`,`test`.`t2i`.`b2` ), <primary_index_lookup>(`test`.`t1i`.`a1` in <temporary table> on distinct_key))) select * from t1i where (a1, a2) in (select b1, b2 from t2i order by b1, b2); a1 a2 1 - 01 2 - 01 diff -Nrup a/mysql-test/suite/rpl/r/rpl_heartbeat.result b/mysql-test/suite/rpl/r/rpl_heartbeat.result --- a/mysql-test/suite/rpl/r/rpl_heartbeat.result 2008-02-25 18:52:54 -05:00 +++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result 2008-04-08 11:50:14 -04:00 @@ -11,13 +11,13 @@ Variable_name Slave_heartbeat_period Value 5.000 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.0009999; Warnings: -Warning 1667 The requested value for the heartbeat period is less than 1 msec. The period is reset to zero which means no heartbeats will be sending +Warning 1669 The requested value for the heartbeat period is less than 1 msec. The period is reset to zero which means no heartbeats will be sending show status like 'Slave_heartbeat_period';; Variable_name Slave_heartbeat_period Value 0.000 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 4294967; Warnings: -Warning 1667 The requested value for the heartbeat period exceeds the value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout. +Warning 1669 The requested value for the heartbeat period exceeds the value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout. show status like 'Slave_heartbeat_period';; Variable_name Slave_heartbeat_period Value 4294967.000 @@ -29,7 +29,7 @@ reset slave; set @@global.slave_net_timeout= 5; change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 5.001; Warnings: -Warning 1667 The requested value for the heartbeat period exceeds the value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout. +Warning 1669 The requested value for the heartbeat period exceeds the value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout. show status like 'Slave_heartbeat_period';; Variable_name Slave_heartbeat_period Value 5.001 @@ -41,7 +41,7 @@ Variable_name Slave_heartbeat_period Value 4.000 set @@global.slave_net_timeout= 3 /* must be a warning */; Warnings: -Warning 1667 The currect value for master_heartbeat_period exceeds the new value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout. +Warning 1669 The currect value for master_heartbeat_period exceeds the new value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout. reset slave; drop table if exists t1; set @@global.slave_net_timeout= 10; diff -Nrup a/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result b/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result --- a/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result 2008-02-19 07:30:54 -05:00 +++ b/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result 2008-04-08 11:50:14 -04:00 @@ -100,12 +100,12 @@ ERROR 42000: You have an error in your S # Implicit lock method conversion due to mix in statement. LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't2' +Warning 1613 Converted to non-transactional lock on 't2' UNLOCK TABLES; # Lock t1 share (converted to read), t2 write. LOCK TABLE t1 IN SHARE MODE, t2 WRITE; Warnings: -Warning 1611 Converted to non-transactional lock on 't1' +Warning 1613 Converted to non-transactional lock on 't1' # Show t1 is read locked, t2 write locked. INSERT INTO t1 SELECT * FROM t2; ERROR HY000: Table 't1' was locked with a READ lock and can't be updated @@ -116,8 +116,8 @@ INSERT INTO t2 SELECT * FROM t1; # Lock t1 exclusive (converted to write), t2 share (converted to read). LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't1' -Warning 1611 Converted to non-transactional lock on 't2' +Warning 1613 Converted to non-transactional lock on 't1' +Warning 1613 Converted to non-transactional lock on 't2' # Show t1 is write locked, t2 read locked. INSERT INTO t1 SELECT * FROM t2; INSERT INTO t2 SELECT * FROM t1; @@ -141,8 +141,8 @@ ERROR HY000: Cannot convert to non-trans ## Error is reported on first table only. Show both errors: SHOW WARNINGS; Level Code Message -Error 1612 Cannot convert to non-transactional lock in strict mode on 't1' -Error 1612 Cannot convert to non-transactional lock in strict mode on 't2' +Error 1614 Cannot convert to non-transactional lock in strict mode on 't1' +Error 1614 Cannot convert to non-transactional lock in strict mode on 't2' UNLOCK TABLES; SET @@SQL_MODE= @wl3561_save_sql_mode; # @@ -162,7 +162,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM; # Request a transactional lock, which is converted to non-transactional. LOCK TABLE t4 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't4' +Warning 1613 Converted to non-transactional lock on 't4' # Try a conflict with the existing non-transactional lock. INSERT INTO t4 VALUES(444); ERROR HY000: Table 't4' was locked with a READ lock and can't be updated @@ -179,8 +179,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W # Request a share lock on the view, which is converted to read locks. LOCK TABLE v1 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't3' -Warning 1611 Converted to non-transactional lock on 't4' +Warning 1613 Converted to non-transactional lock on 't3' +Warning 1613 Converted to non-transactional lock on 't4' # Show that read locks on the base tables prohibit writing ... INSERT INTO t3 SELECT * FROM t4; ERROR HY000: Table 't3' was locked with a READ lock and can't be updated @@ -196,7 +196,7 @@ COUNT(*) ## Report conversion on view due to existing non-transactional locks. LOCK TABLE v1 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 'v1' +Warning 1613 Converted to non-transactional lock on 'v1' INSERT INTO t3 VALUES(333); INSERT INTO t4 VALUES(444); INSERT INTO t1 VALUES(111); @@ -205,8 +205,8 @@ UNLOCK TABLES; ## Now report conversion on base table again. LOCK TABLE v1 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't3' -Warning 1611 Converted to non-transactional lock on 't4' +Warning 1613 Converted to non-transactional lock on 't3' +Warning 1613 Converted to non-transactional lock on 't4' INSERT INTO t3 VALUES(333); INSERT INTO t4 VALUES(444); INSERT INTO t1 VALUES(111); diff -Nrup a/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result b/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result --- a/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result 2008-02-19 07:30:54 -05:00 +++ b/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result 2008-04-08 11:50:14 -04:00 @@ -27,8 +27,8 @@ UNLOCK TABLES; # Valid syntax for transactional locks. LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't1' -Warning 1611 Converted to non-transactional lock on 't2' +Warning 1613 Converted to non-transactional lock on 't1' +Warning 1613 Converted to non-transactional lock on 't2' UNLOCK TABLES; # # Valid syntax for aliases with and without 'AS'. @@ -36,19 +36,19 @@ LOCK TABLE t1 AS a1 READ, t2 a2 WRITE; UNLOCK TABLES; LOCK TABLE t1 AS a1 IN SHARE MODE, t2 a2 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 'a1' -Warning 1611 Converted to non-transactional lock on 'a2' +Warning 1613 Converted to non-transactional lock on 'a1' +Warning 1613 Converted to non-transactional lock on 'a2' UNLOCK TABLES; # # Transactional locks taken on a view. CREATE VIEW v1 AS SELECT * FROM t1, t2 WHERE t1.c1 = t2.c2; LOCK TABLE v1 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't1' -Warning 1611 Converted to non-transactional lock on 't2' +Warning 1613 Converted to non-transactional lock on 't1' +Warning 1613 Converted to non-transactional lock on 't2' LOCK TABLE v1 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 'v1' +Warning 1613 Converted to non-transactional lock on 'v1' DROP VIEW v1; # # Locking INFORMATION_SCHEMA fails on missing privileges. @@ -100,12 +100,12 @@ ERROR 42000: You have an error in your S # Implicit lock method conversion due to mix in statement. LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't2' +Warning 1613 Converted to non-transactional lock on 't2' UNLOCK TABLES; # Lock t1 share (converted to read), t2 write. LOCK TABLE t1 IN SHARE MODE, t2 WRITE; Warnings: -Warning 1611 Converted to non-transactional lock on 't1' +Warning 1613 Converted to non-transactional lock on 't1' # Show t1 is read locked, t2 write locked. INSERT INTO t1 SELECT * FROM t2; ERROR HY000: Table 't1' was locked with a READ lock and can't be updated @@ -116,8 +116,8 @@ INSERT INTO t2 SELECT * FROM t1; # Lock t1 exclusive (converted to write), t2 share (converted to read). LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't1' -Warning 1611 Converted to non-transactional lock on 't2' +Warning 1613 Converted to non-transactional lock on 't1' +Warning 1613 Converted to non-transactional lock on 't2' # Show t1 is write locked, t2 read locked. INSERT INTO t1 SELECT * FROM t2; INSERT INTO t2 SELECT * FROM t1; @@ -141,8 +141,8 @@ ERROR HY000: Cannot convert to non-trans ## Error is reported on first table only. Show both errors: SHOW WARNINGS; Level Code Message -Error 1612 Cannot convert to non-transactional lock in strict mode on 't1' -Error 1612 Cannot convert to non-transactional lock in strict mode on 't2' +Error 1614 Cannot convert to non-transactional lock in strict mode on 't1' +Error 1614 Cannot convert to non-transactional lock in strict mode on 't2' UNLOCK TABLES; SET @@SQL_MODE= @wl3561_save_sql_mode; # @@ -162,7 +162,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM; # Request a transactional lock, which is converted to non-transactional. LOCK TABLE t4 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't4' +Warning 1613 Converted to non-transactional lock on 't4' # Try a conflict with the existing non-transactional lock. INSERT INTO t4 VALUES(444); ERROR HY000: Table 't4' was locked with a READ lock and can't be updated @@ -179,8 +179,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W # Request a share lock on the view, which is converted to read locks. LOCK TABLE v1 IN SHARE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't3' -Warning 1611 Converted to non-transactional lock on 't4' +Warning 1613 Converted to non-transactional lock on 't3' +Warning 1613 Converted to non-transactional lock on 't4' # Show that read locks on the base tables prohibit writing ... INSERT INTO t3 SELECT * FROM t4; ERROR HY000: Table 't3' was locked with a READ lock and can't be updated @@ -196,7 +196,7 @@ COUNT(*) ## Report conversion on view due to existing non-transactional locks. LOCK TABLE v1 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 'v1' +Warning 1613 Converted to non-transactional lock on 'v1' INSERT INTO t3 VALUES(333); INSERT INTO t4 VALUES(444); INSERT INTO t1 VALUES(111); @@ -205,8 +205,8 @@ UNLOCK TABLES; ## Now report conversion on base table again. LOCK TABLE v1 IN EXCLUSIVE MODE; Warnings: -Warning 1611 Converted to non-transactional lock on 't3' -Warning 1611 Converted to non-transactional lock on 't4' +Warning 1613 Converted to non-transactional lock on 't3' +Warning 1613 Converted to non-transactional lock on 't4' INSERT INTO t3 VALUES(333); INSERT INTO t4 VALUES(444); INSERT INTO t1 VALUES(111); diff -Nrup a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result --- a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result 2008-04-07 20:09:12 -04:00 +++ b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result 2008-04-08 11:50:14 -04:00 @@ -30,7 +30,7 @@ Master_User root Master_Port MASTER_PORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 458 +Read_Master_Log_Pos 595 Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 @@ -45,7 +45,7 @@ Replicate_Wild_Ignore_Table Last_Errno 0 Last_Error Skip_Counter 0 -Exec_Master_Log_Pos 458 +Exec_Master_Log_Pos 595 Relay_Log_Space # Until_Condition None Until_Log_File diff -Nrup a/mysql-test/suite/rpl/r/rpl_slave_skip.result b/mysql-test/suite/rpl/r/rpl_slave_skip.result --- a/mysql-test/suite/rpl/r/rpl_slave_skip.result 2008-04-07 20:09:12 -04:00 +++ b/mysql-test/suite/rpl/r/rpl_slave_skip.result 2008-04-08 11:50:14 -04:00 @@ -50,7 +50,7 @@ Master_User root Master_Port MASTER_PORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 723 +Read_Master_Log_Pos 1134 Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 @@ -65,7 +65,7 @@ Replicate_Wild_Ignore_Table Last_Errno 0 Last_Error Skip_Counter 0 -Exec_Master_Log_Pos 489 +Exec_Master_Log_Pos 763 Relay_Log_Space # Until_Condition Master Until_Log_File master-bin.000001 diff -Nrup a/mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result b/mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result --- a/mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result 2008-03-29 18:54:06 -04:00 +++ b/mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result 2008-04-08 11:50:14 -04:00 @@ -44,6 +44,40 @@ END// CALL p1(); show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS t1, t2 +master-bin.000001 # Query # # use `test`; DROP TRIGGER IF EXISTS tr1 +master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (id INT AUTO_INCREMENT PRIMARY KEY) +master-bin.000001 # Query # # use `test`; CREATE TABLE t2 (id INT AUTO_INCREMENT PRIMARY KEY) +master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE p1() +BEGIN +DECLARE ins_count INT DEFAULT 10; +WHILE ins_count > 0 DO +INSERT INTO t1 VALUES (NULL); +SET ins_count = ins_count - 1; +END WHILE; +DELETE FROM t1 WHERE id = 1; +DELETE FROM t1 WHERE id = 2; +DELETE FROM t2 WHERE id = 1; +DELETE FROM t2 WHERE id = 2; +END +master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE p2() +BEGIN +INSERT INTO t1 VALUES (NULL); +DELETE FROM t1 WHERE id = f1(3); +DELETE FROM t1 WHERE id = f1(4); +DELETE FROM t2 WHERE id = 3; +DELETE FROM t2 WHERE id = 4; +END +master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` TRIGGER tr1 BEFORE DELETE +ON t1 FOR EACH ROW +BEGIN +INSERT INTO t2 VALUES (NULL); +END +master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` FUNCTION f1 (i int) RETURNS int +BEGIN +INSERT INTO t2 VALUES (NULL); +RETURN i; +END master-bin.000001 # Intvar # # INSERT_ID=1 master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (NULL) master-bin.000001 # Intvar # # INSERT_ID=2 @@ -100,6 +134,67 @@ DROP TRIGGER tr1; CALL p2(); show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS t1, t2 +master-bin.000001 # Query # # use `test`; DROP TRIGGER IF EXISTS tr1 +master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (id INT AUTO_INCREMENT PRIMARY KEY) +master-bin.000001 # Query # # use `test`; CREATE TABLE t2 (id INT AUTO_INCREMENT PRIMARY KEY) +master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE p1() +BEGIN +DECLARE ins_count INT DEFAULT 10; +WHILE ins_count > 0 DO +INSERT INTO t1 VALUES (NULL); +SET ins_count = ins_count - 1; +END WHILE; +DELETE FROM t1 WHERE id = 1; +DELETE FROM t1 WHERE id = 2; +DELETE FROM t2 WHERE id = 1; +DELETE FROM t2 WHERE id = 2; +END +master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE p2() +BEGIN +INSERT INTO t1 VALUES (NULL); +DELETE FROM t1 WHERE id = f1(3); +DELETE FROM t1 WHERE id = f1(4); +DELETE FROM t2 WHERE id = 3; +DELETE FROM t2 WHERE id = 4; +END +master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` TRIGGER tr1 BEFORE DELETE +ON t1 FOR EACH ROW +BEGIN +INSERT INTO t2 VALUES (NULL); +END +master-bin.000001 # Query # # use `test`; CREATE DEFINER=`root`@`localhost` FUNCTION f1 (i int) RETURNS int +BEGIN +INSERT INTO t2 VALUES (NULL); +RETURN i; +END +master-bin.000001 # Intvar # # INSERT_ID=1 +master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (NULL) +master-bin.000001 # Intvar # # INSERT_ID=2 +master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (NULL) +master-bin.000001 # Intvar # # INSERT_ID=3 +master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (NULL) +master-bin.000001 # Intvar # # INSERT_ID=4 +master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (NULL) +master-bin.000001 # Intvar # # INSERT_ID=5 +master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (NULL) +master-bin.000001 # Intvar # # INSERT_ID=6 +master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (NULL) +master-bin.000001 # Intvar # # INSERT_ID=7 +master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (NULL) +master-bin.000001 # Intvar # # INSERT_ID=8 +master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (NULL) +master-bin.000001 # Intvar # # INSERT_ID=9 +master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (NULL) +master-bin.000001 # Intvar # # INSERT_ID=10 +master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (NULL) +master-bin.000001 # Intvar # # INSERT_ID=1 +master-bin.000001 # Query # # use `test`; DELETE FROM t1 WHERE id = 1 +master-bin.000001 # Intvar # # INSERT_ID=2 +master-bin.000001 # Query # # use `test`; DELETE FROM t1 WHERE id = 2 +master-bin.000001 # Query # # use `test`; DELETE FROM t2 WHERE id = 1 +master-bin.000001 # Query # # use `test`; DELETE FROM t2 WHERE id = 2 +master-bin.000001 # Query # # use `test`; DROP TRIGGER tr1 master-bin.000001 # Intvar # # INSERT_ID=11 master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (NULL) master-bin.000001 # Intvar # # INSERT_ID=3 diff -Nrup a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c --- a/storage/myisam/mi_check.c 2008-04-07 19:41:39 -04:00 +++ b/storage/myisam/mi_check.c 2008-04-08 11:50:14 -04:00 @@ -737,7 +737,7 @@ static int chk_index(MI_CHECK *param, MI { int flag; uint used_length,comp_flag,nod_flag,key_length=0; - uchar key[HA_MAX_POSSIBLE_KEY_BUFF],*temp_buff,*keypos,*old_keypos,*endpos; + uchar key[MI_MAX_POSSIBLE_KEY_BUFF],*temp_buff,*keypos,*old_keypos,*endpos; my_off_t next_page,record; char llbuff[22]; uint diff_pos[2];
| Thread | ||
|---|---|---|
| • bk commit into 6.0 tree (iggy:1.2625) | Ignacio Galarza | 8 Apr |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.737 sec. using MySQL 5.1.14-beta-log