List:Commits« Previous MessageNext Message »
From:kgeorge Date:April 2 2008 9:33am
Subject:bk commit into 6.0 tree (gkodinov:1.2621)
View as plain text  
Below is the list of changes that have just been committed into a local
6.0 repository of gkodinov.  When gkodinov 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-02 12:33:21+03:00, gkodinov@stripped +11 -0
  merge 5.1-bugteam->6.0-bugteam

  mysql-test/r/locktrans_innodb.result@stripped, 2008-04-02 12:33:18+03:00, gkodinov@stripped +12 -12
    merge 5.1-bugteam->6.0-bugteam : error codes

  mysql-test/r/locktrans_myisam.result@stripped, 2008-04-02 12:33:18+03:00, gkodinov@stripped +19 -19
    merge 5.1-bugteam->6.0-bugteam : error codes

  mysql-test/r/order_by.result@stripped, 2008-04-02 12:33:18+03:00, gkodinov@stripped +3 -3
    merge 5.1-bugteam->6.0-bugteam : new explain for 5.1 tests

  mysql-test/r/subselect_mat.result@stripped, 2008-04-02 12:33:18+03:00, gkodinov@stripped +2 -2
    merge 5.1-bugteam->6.0-bugteam : new explain for 5.1 tests

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@stripped, 2008-04-02 12:33:18+03:00, gkodinov@stripped +2 -2
    merge 5.1-bugteam->6.0-bugteam : error codes

  mysql-test/suite/rpl/r/rpl_heartbeat.result@stripped, 2008-04-02 12:33:18+03:00, gkodinov@stripped +4 -4
    merge 5.1-bugteam->6.0-bugteam : error codes

  mysql-test/suite/rpl/r/rpl_locktrans_innodb.result@stripped, 2008-04-02 12:33:18+03:00, gkodinov@stripped +12 -12
    merge 5.1-bugteam->6.0-bugteam : error codes

  mysql-test/suite/rpl/r/rpl_locktrans_myisam.result@stripped, 2008-04-02 12:33:18+03:00, gkodinov@stripped +19 -19
    merge 5.1-bugteam->6.0-bugteam : error codes

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result@stripped, 2008-04-02 12:33:18+03:00, gkodinov@stripped +4 -4
    merge 5.1-bugteam->6.0-bugteam : different offsets

  mysys/my_handler_errors.h@stripped, 2008-04-02 12:33:18+03:00, gkodinov@stripped +64 -2
    merge 5.1-bugteam->6.0-bugteam : some comments added for easier merge

  sql/sql_select.cc@stripped, 2008-04-02 12:33:18+03:00, gkodinov@stripped +1 -1
    merge 5.1-bugteam->6.0-bugteam : function name changed in 5.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 14:21:46 +02:00
+++ b/mysql-test/r/locktrans_innodb.result	2008-04-02 12:33:18 +03: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 14:21:52 +02:00
+++ b/mysql-test/r/locktrans_myisam.result	2008-04-02 12:33:18 +03: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-01 16:44:50 +03:00
+++ b/mysql-test/r/order_by.result	2008-04-02 12:33:18 +03: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 17:45:49 +02:00
+++ b/mysql-test/r/subselect_mat.result	2008-04-02 12:33:18 +03: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_extraCol_myisam.result b/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
--- a/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result	2008-04-01 18:13:53 +03:00
+++ b/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result	2008-04-02 12:33:18 +03:00
@@ -434,7 +434,7 @@ Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
 Last_Errno	1364
-Last_Error	Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 263
+Last_Error	Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 331
 Skip_Counter	0
 Exec_Master_Log_Pos	#
 Relay_Log_Space	#
@@ -452,7 +452,7 @@ Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	1364
-Last_SQL_Error	Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 263
+Last_SQL_Error	Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 331
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
 *** Create t10 on slave  ***
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-26 01:52:54 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2008-04-02 12:33:18 +03: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 14:30:54 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result	2008-04-02 12:33:18 +03: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 14:30:54 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result	2008-04-02 12:33:18 +03: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_row_basic_11bugs.result b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result
--- a/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result	2008-04-01 18:13:53 +03:00
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result	2008-04-02 12:33:18 +03:00
@@ -58,10 +58,10 @@ SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	4	Format_desc	1	107	Server ver: SERVER_VERSION, Binlog ver: 4
 master-bin.000001	107	Query	1	193	use `test`; CREATE TABLE t1 (a INT)
-master-bin.000001	192	Query	1	260	use `test`; BEGIN
-master-bin.000001	193	Table_map	1	234	table_id: # (test.t1)
-master-bin.000001	234	Write_rows	1	273	table_id: # flags: STMT_END_F
-master-bin.000001	340	Query	1	409	use `test`; COMMIT
+master-bin.000001	193	Query	1	261	use `test`; BEGIN
+master-bin.000001	261	Table_map	1	302	table_id: # (test.t1)
+master-bin.000001	302	Write_rows	1	341	table_id: # flags: STMT_END_F
+master-bin.000001	341	Query	1	410	use `test`; COMMIT
 DROP TABLE t1;
 ================ Test for BUG#17620 ================
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
diff -Nrup a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h
--- a/mysys/my_handler_errors.h	2008-03-28 18:45:02 +02:00
+++ b/mysys/my_handler_errors.h	2008-04-02 12:33:18 +03:00
@@ -5,63 +5,125 @@
 
 static const char *handler_error_messages[]=
 {
+  /* HA_ERR_KEY_NOT_FOUND */
   "Didn't find key on read or update",
+  /* HA_ERR_FOUND_DUPP_KEY */
   "Duplicate key on write or update",
+  /* HA_ERR_INTERNAL_ERROR */
   "Internal (unspecified) error in handler",
+  /* HA_ERR_RECORD_CHANGED */
   "Someone has changed the row since it was read (while the table was locked to prevent it)",
+  /* HA_ERR_WRONG_INDEX */
   "Wrong index given to function",
+  /* empty */
   "Undefined handler error 125",
+  /* HA_ERR_CRASHED */
   "Index file is crashed",
+  /* HA_ERR_WRONG_IN_RECORD */
   "Record file is crashed",
+  /* HA_ERR_OUT_OF_MEM */
   "Out of memory in engine",
+  /* empty */
   "Undefined handler error 129",
+  /* HA_ERR_NOT_A_TABLE */
   "Incorrect file format",
+  /* HA_ERR_WRONG_COMMAND */
   "Command not supported by database",
+  /* HA_ERR_OLD_FILE */
   "Old database file",
+  /* HA_ERR_NO_ACTIVE_RECORD */
   "No record read before update",
+  /* HA_ERR_RECORD_DELETED */
   "Record was already deleted (or record file crashed)",
+  /* HA_ERR_RECORD_FILE_FULL */
   "No more room in record file",
+  /* HA_ERR_INDEX_FILE_FULL */
   "No more room in index file",
+  /* HA_ERR_END_OF_FILE */
   "No more records (read after end of file)",
+  /* HA_ERR_UNSUPPORTED */
   "Unsupported extension used for table",
+  /* HA_ERR_TO_BIG_ROW */
   "Too big row",
+  /* HA_WRONG_CREATE_OPTION */
   "Wrong create options",
+  /* HA_ERR_FOUND_DUPP_UNIQUE */
   "Duplicate unique key or constraint on write or update",
+  /* HA_ERR_UNKNOWN_CHARSET */
   "Unknown character set used in table",
+  /* HA_ERR_WRONG_MRG_TABLE_DEF */
   "Conflicting table definitions in sub-tables of MERGE table",
+  /* HA_ERR_CRASHED_ON_REPAIR */
   "Table is crashed and last repair failed",
+  /* HA_ERR_CRASHED_ON_USAGE */
   "Table was marked as crashed and should be repaired",
+  /* HA_ERR_LOCK_WAIT_TIMEOUT */
   "Lock timed out; Retry transaction",
+  /* HA_ERR_LOCK_TABLE_FULL */
   "Lock table is full;  Restart program with a larger locktable",
+  /* HA_ERR_READ_ONLY_TRANSACTION */
   "Updates are not allowed under a read only transactions",
+  /* HA_ERR_LOCK_DEADLOCK */
   "Lock deadlock; Retry transaction",
+  /* HA_ERR_CANNOT_ADD_FOREIGN */
   "Foreign key constraint is incorrectly formed",
+  /* HA_ERR_NO_REFERENCED_ROW */
   "Cannot add a child row",
+  /* HA_ERR_ROW_IS_REFERENCED */
   "Cannot delete a parent row",
+  /* HA_ERR_NO_SAVEPOINT */
   "No savepoint with that name",
+  /* HA_ERR_NON_UNIQUE_BLOCK_SIZE */
   "Non unique key block size",
+  /* HA_ERR_NO_SUCH_TABLE */
   "The table does not exist in engine",
+  /* HA_ERR_TABLE_EXIST */
   "The table already existed in storage engine",
+  /* HA_ERR_NO_CONNECTION */
   "Could not connect to storage engine",
+  /* HA_ERR_NULL_IN_SPATIAL */
   "Unexpected null pointer found when using spatial index",
+  /* HA_ERR_TABLE_DEF_CHANGED */
   "The table changed in storage engine",
+  /* HA_ERR_NO_PARTITION_FOUND */
   "There's no partition in table for the given value",
+  /* HA_ERR_RBR_LOGGING_FAILED */
   "Row-based binlogging of row failed",
+  /* HA_ERR_DROP_INDEX_FK */
   "Index needed in foreign key constraint",
+  /* HA_ERR_FOREIGN_DUPLICATE_KEY */
   "Upholding foreign key constraints would lead to a duplicate key error in "
-  "some other table",
+  /* HA_ERR_TABLE_NEEDS_UPGRADE */
   "Table needs to be upgraded before it can be used",
+  /* HA_ERR_TABLE_READONLY */
   "Table is read only",
+  /* HA_ERR_AUTOINC_READ_FAILED */
   "Failed to get next auto increment value",
+  /* HA_ERR_AUTOINC_ERANGE */
   "Failed to set row auto increment value",
+  /* HA_ERR_GENERIC */
   "Unknown (generic) error from engine",
+  /* HA_ERR_RECORD_IS_THE_SAME */
   "Record is the same",
+  /* HA_ERR_LOGGING_IMPOSSIBLE */
   "It is not possible to log this statement",
+  /* HA_ERR_TABLESPACE_EXIST */
+  "Tablespace exists",
+  /* HA_ERR_CORRUPT_EVENT */
   "The event was corrupt, leading to illegal data being read",
+  /* HA_ERR_NEW_FILE */
   "The table is of a new format not supported by this version",
+  /* HA_ERR_ROWS_EVENT_APPLY */
   "The event could not be processed no other hanlder error happened",
+  /* HA_ERR_INITIALIZATION */
   "Got a fatal error during initialzaction of handler",
+  /* HA_ERR_FILE_TOO_SHORT */
   "File to short; Expected more data in file",
-  "Read page with wrong checksum"
+  /* HA_ERR_WRONG_CRC */
+  "Read page with wrong checksum",
+  /* HA_ERR_LOCK_OR_ACTIVE_TRANSACTION */
+  "Lock or active transaction", /* TODO: get a better message */
+  /* HA_ERR_NO_SUCH_TABLESPACE */
+  "No such table space" /* TODO: get a better message */
 };
 
diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2008-04-01 16:44:54 +03:00
+++ b/sql/sql_select.cc	2008-04-02 12:33:18 +03:00
@@ -12305,7 +12305,7 @@ TABLE *create_duplicate_weedout_tmp_tabl
   table->s= share;
   init_tmp_table_share(thd, share, "", 0, tmpname, tmpname);
   share->blob_field= blob_field;
-  share->blob_ptr_size= mi_portable_sizeof_char_ptr;
+  share->blob_ptr_size= portable_sizeof_char_ptr;
   share->db_low_byte_first=1;                // True for HEAP and MyISAM
   share->table_charset= NULL;
   share->primary_key= MAX_KEY;               // Indicate no primary key
Thread
bk commit into 6.0 tree (gkodinov:1.2621)kgeorge2 Apr