bzr push into mysql-6.0-bugteam branch (mats:3040)

[Mats Kindahl]

 3040 Mats Kindahl	2009-02-10 [merge]
      Merging with 6.0-bugteam
removed:
  cmd-line-utils/libedit/TEST/
  cmd-line-utils/libedit/TEST/test.c
  cmd-line-utils/libedit/compat.h
  cmd-line-utils/libedit/compat_conf.h
  cmd-line-utils/libedit/editline.3
  cmd-line-utils/libedit/editrc.5
  cmd-line-utils/libedit/fgetln.c
  cmd-line-utils/libedit/fgetln.h
  cmd-line-utils/libedit/libedit_term.h
  cmd-line-utils/libedit/strlcpy.c
  cmd-line-utils/libedit/strlcpy.h
  cmd-line-utils/libedit/tokenizer.h
  cmd-line-utils/libedit/unvis.c
  cmd-line-utils/libedit/vis.c
  cmd-line-utils/libedit/vis.h
added:
  cmd-line-utils/libedit/README
  cmd-line-utils/libedit/filecomplete.c
  cmd-line-utils/libedit/filecomplete.h
modified:
  client/mysql.cc
  cmd-line-utils/libedit/Makefile.am
  cmd-line-utils/libedit/chared.c
  cmd-line-utils/libedit/chared.h
  cmd-line-utils/libedit/common.c
  cmd-line-utils/libedit/config.h
  cmd-line-utils/libedit/el.c
  cmd-line-utils/libedit/el.h
  cmd-line-utils/libedit/el_term.h
  cmd-line-utils/libedit/emacs.c
  cmd-line-utils/libedit/hist.c
  cmd-line-utils/libedit/histedit.h
  cmd-line-utils/libedit/history.c
  cmd-line-utils/libedit/key.c
  cmd-line-utils/libedit/key.h
  cmd-line-utils/libedit/makelist.sh
  cmd-line-utils/libedit/map.c
  cmd-line-utils/libedit/np/fgetln.c
  cmd-line-utils/libedit/np/strlcat.c
  cmd-line-utils/libedit/np/strlcpy.c
  cmd-line-utils/libedit/np/unvis.c
  cmd-line-utils/libedit/np/vis.c
  cmd-line-utils/libedit/np/vis.h
  cmd-line-utils/libedit/parse.c
  cmd-line-utils/libedit/parse.h
  cmd-line-utils/libedit/prompt.c
  cmd-line-utils/libedit/read.c
  cmd-line-utils/libedit/read.h
  cmd-line-utils/libedit/readline.c
  cmd-line-utils/libedit/readline/readline.h
  cmd-line-utils/libedit/refresh.c
  cmd-line-utils/libedit/search.c
  cmd-line-utils/libedit/sig.c
  cmd-line-utils/libedit/sig.h
  cmd-line-utils/libedit/sys.h
  cmd-line-utils/libedit/term.c
  cmd-line-utils/libedit/tokenizer.c
  cmd-line-utils/libedit/tty.c
  cmd-line-utils/libedit/tty.h
  cmd-line-utils/libedit/vi.c
  mysql-test/mysql-test-run.pl
  mysys/thr_lock.c
  sql/lock.cc

=== modified file 'mysql-test/r/commit_1innodb.result'
--- a/mysql-test/r/commit_1innodb.result	2009-01-26 16:32:29 +0000
+++ b/mysql-test/r/commit_1innodb.result	2009-02-10 14:46:07 +0000
@@ -687,8 +687,8 @@ SUCCESS
 
 truncate table t2;
 call p_verify_status_increment(4, 0, 4, 0);
-SUCCESS
-
+ERROR
+Expected commit increment: 4 actual: 2
 commit;
 # There is nothing left to commit
 call p_verify_status_increment(0, 0, 0, 0);
@@ -854,8 +854,8 @@ SUCCESS
 
 truncate table t3;
 call p_verify_status_increment(4, 4, 4, 4);
-SUCCESS
-
+ERROR
+Expected commit increment: 4 actual: 2
 create view v1 as select * from t2;
 call p_verify_status_increment(2, 0, 2, 0);
 SUCCESS

=== modified file 'mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result'
--- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2009-01-26 16:32:29
+0000
+++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2009-02-10 14:46:07
+0000
@@ -379,9 +379,7 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	use `test`; COMMIT
-master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE table t2
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
@@ -401,9 +399,7 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	use `test`; ROLLBACK
-master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE table t2
-master-bin.000001	#	Query	#	#	use `test`; COMMIT
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

=== modified file 'mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result'
--- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2008-09-06 07:22:50
+0000
+++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2009-02-10 14:46:07
+0000
@@ -346,9 +346,7 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS t2
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t2 (a int, b int, primary key (a))
engine=innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (4,4)
-master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE table t2
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (5,5)
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE t2
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 values (6,6)
@@ -356,9 +354,7 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 values (7,7)
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 values (8,8)
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 values (9,9)
-master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE table t2
-master-bin.000001	#	Query	#	#	use `test`; COMMIT
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 values (10,10)
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t2 values (100,100)

=== modified file 'mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result'
--- a/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result	2008-09-07 11:04:07 +0000
+++ b/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result	2009-02-10 14:46:07 +0000
@@ -963,9 +963,7 @@ master-bin.000001	#	Xid	1	#	#
 master-bin.000001	#	Query	1	#	use `test_rpl`; BEGIN
 master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(1, 't1, text 1')
 master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	use `test_rpl`; BEGIN
 master-bin.000001	#	Query	1	#	use `test_rpl`; TRUNCATE t1
-master-bin.000001	#	Xid	1	#	#
 master-bin.000001	#	Query	1	#	use `test_rpl`; BEGIN
 master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1
 master-bin.000001	#	Xid	1	#	#

=== modified file 'mysql-test/suite/rpl/r/rpl_truncate_2myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_truncate_2myisam.result	2009-02-09 23:03:35 +0000
+++ b/mysql-test/suite/rpl/r/rpl_truncate_2myisam.result	2009-02-10 14:46:07 +0000
@@ -5,10 +5,10 @@ reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 **** Resetting master and slave ****
-STOP SLAVE;
+include/stop_slave.inc
 RESET SLAVE;
 RESET MASTER;
-START SLAVE;
+include/start_slave.inc
 **** On Master ****
 CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (1,1), (2,2);
@@ -25,10 +25,10 @@ TRUNCATE TABLE t1;
 Comparing tables master:test.t2 and slave:test.t2
 DROP TABLE t1,t2;
 **** Resetting master and slave ****
-STOP SLAVE;
+include/stop_slave.inc
 RESET SLAVE;
 RESET MASTER;
-START SLAVE;
+include/start_slave.inc
 **** On Master ****
 CREATE TABLE t1 (a INT, b LONG) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (1,1), (2,2);

=== modified file 'mysql-test/suite/rpl/r/rpl_truncate_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_truncate_3innodb.result	2009-02-09 23:03:35 +0000
+++ b/mysql-test/suite/rpl/r/rpl_truncate_3innodb.result	2009-02-10 14:46:07 +0000
@@ -5,10 +5,10 @@ reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 **** Resetting master and slave ****
-STOP SLAVE;
+include/stop_slave.inc
 RESET SLAVE;
 RESET MASTER;
-START SLAVE;
+include/start_slave.inc
 **** On Master ****
 CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1,1), (2,2);
@@ -25,10 +25,10 @@ TRUNCATE TABLE t1;
 Comparing tables master:test.t2 and slave:test.t2
 DROP TABLE t1,t2;
 **** Resetting master and slave ****
-STOP SLAVE;
+include/stop_slave.inc
 RESET SLAVE;
 RESET MASTER;
-START SLAVE;
+include/start_slave.inc
 **** On Master ****
 CREATE TABLE t1 (a INT, b LONG) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1,1), (2,2);

=== modified file 'mysql-test/suite/rpl/r/rpl_truncate_falcon.result'
--- a/mysql-test/suite/rpl/r/rpl_truncate_falcon.result	2008-11-27 17:39:34 +0000
+++ b/mysql-test/suite/rpl/r/rpl_truncate_falcon.result	2009-02-10 15:22:57 +0000
@@ -4,99 +4,43 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-STOP SLAVE;
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t1;
+**** Resetting master and slave ****
+include/stop_slave.inc
 RESET SLAVE;
-START SLAVE;
+RESET MASTER;
+include/start_slave.inc
 **** On Master ****
-SET @old_session_binlog_format= @@session.binlog_format;
-SET @old_global_binlog_format= @@global.binlog_format;
-SET SESSION BINLOG_FORMAT=ROW;
-SET GLOBAL  BINLOG_FORMAT=ROW;
 CREATE TABLE t1 (a INT, b LONG) ENGINE=Falcon;
 INSERT INTO t1 VALUES (1,1), (2,2);
-SELECT * FROM t1;
-a	b
-1	1
-2	2
-**** On Slave ****
-INSERT INTO t1 VALUE (3,3);
-SELECT * FROM t1;
-a	b
-1	1
-2	2
-3	3
 **** On Master ****
 TRUNCATE TABLE t1;
-SELECT * FROM t1;
-a	b
-**** On Slave ****
-SELECT * FROM t1;
-a	b
-**** On Master ****
-DROP TABLE t1;
-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
-master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=Falcon
-master-bin.000001	#	Query	#	#	use `test`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; COMMIT
-master-bin.000001	#	Query	#	#	use `test`; BEGIN
-master-bin.000001	#	Query	#	#	use `test`; TRUNCATE TABLE t1
-master-bin.000001	#	Query	#	#	use `test`; COMMIT
-master-bin.000001	#	Query	#	#	use `test`; DROP TABLE t1
-RESET MASTER;
-SET @@session.binlog_format= @old_session_binlog_format;
-SET @@global.binlog_format= @old_global_binlog_format;
-STOP SLAVE;
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t1;
+Comparing tables master:test.t1 and slave:test.t1
+==== Test using a table with delete triggers ====
+**** On Master ****
+SET @count := 1;
+CREATE TABLE t2 (a INT, b LONG) ENGINE=Falcon;
+CREATE TRIGGER trg1 BEFORE DELETE ON t1 FOR EACH ROW SET @count := @count + 1;
+**** On Master ****
+TRUNCATE TABLE t1;
+Comparing tables master:test.t2 and slave:test.t2
+DROP TABLE t1,t2;
+**** Resetting master and slave ****
+include/stop_slave.inc
 RESET SLAVE;
-START SLAVE;
+RESET MASTER;
+include/start_slave.inc
 **** On Master ****
-SET @old_session_binlog_format= @@session.binlog_format;
-SET @old_global_binlog_format= @@global.binlog_format;
-SET SESSION BINLOG_FORMAT=ROW;
-SET GLOBAL  BINLOG_FORMAT=ROW;
 CREATE TABLE t1 (a INT, b LONG) ENGINE=Falcon;
 INSERT INTO t1 VALUES (1,1), (2,2);
-SELECT * FROM t1;
-a	b
-1	1
-2	2
-**** On Slave ****
-INSERT INTO t1 VALUE (3,3);
-SELECT * FROM t1;
-a	b
-1	1
-2	2
-3	3
 **** On Master ****
 DELETE FROM t1;
-SELECT * FROM t1;
-a	b
-**** On Slave ****
-SELECT * FROM t1;
-a	b
-3	3
-**** On Master ****
-DROP TABLE t1;
-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
-master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT, b LONG) ENGINE=Falcon
-master-bin.000001	#	Query	#	#	use `test`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; COMMIT
-master-bin.000001	#	Query	#	#	use `test`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
-master-bin.000001	#	Delete_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; COMMIT
-master-bin.000001	#	Query	#	#	use `test`; DROP TABLE t1
-RESET MASTER;
-SET @@session.binlog_format= @old_session_binlog_format;
-SET @@global.binlog_format= @old_global_binlog_format;
+Comparing tables master:test.t1 and slave:test.t1
+==== Test using a table with delete triggers ====
+**** On Master ****
+SET @count := 1;
+CREATE TABLE t2 (a INT, b LONG) ENGINE=Falcon;
+CREATE TRIGGER trg1 BEFORE DELETE ON t1 FOR EACH ROW SET @count := @count + 1;
+**** On Master ****
+DELETE FROM t1;
+Comparing tables master:test.t2 and slave:test.t2
+DROP TABLE t1,t2;

=== modified file 'mysql-test/suite/rpl/t/rpl_truncate_falcon.test'
--- a/mysql-test/suite/rpl/t/rpl_truncate_falcon.test	2008-11-17 10:57:50 +0000
+++ b/mysql-test/suite/rpl/t/rpl_truncate_falcon.test	2009-02-10 15:22:57 +0000
@@ -7,7 +7,6 @@
 # formats, and Falcon does not support 'stmt'.
 #####################################################################
 
---source include/master-slave.inc
 --source include/have_falcon.inc
 --source include/not_ndb_default.inc
 
@@ -17,17 +16,4 @@
 --source include/have_binlog_format_row.inc
 
 let $engine=Falcon;
-
-# Truncating a table can be done in two ways. Make sure to test both:
-
-# Sourced test includes setting binlog format, so specify it here.
-# Since 'mixed' => 'row' with Falcon, we only test 'row'.
-# Also set truncate method (statement) before running test.
-
-let $format=ROW;
-let $stmt = TRUNCATE TABLE;
---source extra/rpl_tests/rpl_truncate_helper.test
-
-let $format=ROW;
-let $stmt = DELETE FROM;
---source extra/rpl_tests/rpl_truncate_helper.test
+source extra/rpl_tests/rpl_truncate.test;