Commit 08d9ee8c authored by pcrews@pcrews-mac-local.local's avatar pcrews@pcrews-mac-local.local
Browse files

Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/clean/mysql-5.1-bugteam 

into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/test_fix/mysql-5.1-bugteam_35744
parents cbd31fd1 1e886dad

mysql-test/extra/rpl_tests/rpl_insert_id.test

+62 −51
Original line number Diff line number Diff line
@@ -18,6 +18,13 @@ use test; 
drop table if exists t1, t2, t3;

--enable_warnings



# If concurrent inserts are on, it is not guaranteed that the rows

# inserted by INSERT are immediately accessible by SELECT in another

# thread. This would cause problems near the line 'connection master1'

# below. So we turn off concurrent inserts.

SET @old_concurrent_insert= @@global.concurrent_insert;

SET @@global.concurrent_insert= 0;



--echo #

--echo # See if queries that use both auto_increment and LAST_INSERT_ID()

--echo # are replicated well
@@ -29,8 +36,8 @@ drop table if exists t1, t2, t3; 
#should work for both SBR and RBR



connection master;

create table t1(a int auto_increment, key(a));

create table t2(b int auto_increment, c int, key(b));

eval create table t1(a int auto_increment, key(a)) engine=$engine_type;

eval create table t2(b int auto_increment, c int, key(b)) engine=$engine_type;

insert into t1 values (1),(2),(3);

insert into t1 values (null);

insert into t2 values (null,last_insert_id());
@@ -68,8 +75,8 @@ connection master; 


drop table t2;

drop table t1;

create table t1(a int auto_increment, key(a));

create table t2(b int auto_increment, c int, key(b));

eval create table t1(a int auto_increment, key(a)) engine=$engine_type;

eval create table t2(b int auto_increment, c int, key(b)) engine=$engine_type;

insert into t1 values (10);

insert into t1 values (null),(null),(null);

insert into t2 values (5,0);
@@ -94,7 +101,7 @@ sync_with_master; 


connection master;

SET TIMESTAMP=1000000000;

CREATE TABLE t1 ( a INT UNIQUE );

eval CREATE TABLE t1 ( a INT UNIQUE ) engine=$engine_type;

SET FOREIGN_KEY_CHECKS=0;

# Duplicate Key Errors

--error 1022, ER_DUP_ENTRY
@@ -109,8 +116,8 @@ sync_slave_with_master; 
--echo #



connection master;

create table t1(a int auto_increment, key(a));

create table t2(a int);

eval create table t1(a int auto_increment, key(a)) engine=$engine_type;

eval create table t2(a int) engine=$engine_type;

insert into t1 (a) values (null);

insert into t2 (a) select a from t1 where a is null;

insert into t2 (a) select a from t1 where a is null;
@@ -139,11 +146,11 @@ drop function if exists bug15728_insert; 
drop table if exists t1, t2;

--enable_warnings



create table t1 (

eval create table t1 (

  id int not null auto_increment,

  last_id int,

  primary key (id)

);

) engine=$engine_type;

create function bug15728() returns int(11)

  return last_insert_id();
@@ -152,11 +159,11 @@ insert into t1 (last_id) values (last_insert_id()); 
insert into t1 (last_id) values (bug15728());



# Check that nested call replicates too.

create table t2 (

eval create table t2 (

  id int not null auto_increment,

  last_id int,

  primary key (id)

);

) engine=$engine_type;

delimiter |;

create function bug15728_insert() returns int(11) modifies sql data

begin
@@ -215,8 +222,8 @@ drop procedure foo; 
# test of BUG#20188 REPLACE or ON DUPLICATE KEY UPDATE in

# auto_increment breaks binlog



create table t1 (n int primary key auto_increment not null,

b int, unique(b));

eval create table t1 (n int primary key auto_increment not null,

                      b int, unique(b)) engine=$engine_type;



# First, test that we do not call restore_auto_increment() too early

# in write_record():
@@ -257,8 +264,8 @@ select * from t1 order by n; 
# and now test for the bug:

connection master;

drop table t1;

create table t1 (n int primary key auto_increment not null,

b int, unique(b));

eval create table t1 (n int primary key auto_increment not null,

                      b int, unique(b)) engine=$engine_type;

insert into t1 values(null,100);

select * from t1 order by n;

sync_slave_with_master;
@@ -282,29 +289,29 @@ sync_slave_with_master; 


connection master;

# testcase with INSERT VALUES

CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b INT,

UNIQUE(b));

eval CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b INT,

                      UNIQUE(b)) ENGINE=$engine_type;

INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10;

SELECT * FROM t1;

SELECT * FROM t1 ORDER BY a;

sync_slave_with_master;

SELECT * FROM t1;

SELECT * FROM t1 ORDER BY a;

connection master;

drop table t1;



# tescase with INSERT SELECT

CREATE TABLE t1 (

eval CREATE TABLE t1 (

  id bigint(20) unsigned NOT NULL auto_increment,

  field_1 int(10) unsigned NOT NULL,

  field_2 varchar(255) NOT NULL,

  field_3 varchar(255) NOT NULL,

  PRIMARY KEY (id),

  UNIQUE KEY field_1 (field_1, field_2)

);

CREATE TABLE t2 (

) ENGINE=$engine_type;

eval CREATE TABLE t2 (

  field_a int(10) unsigned NOT NULL,

  field_b varchar(255) NOT NULL,

  field_c varchar(255) NOT NULL

);

) ENGINE=$engine_type;

INSERT INTO t2 (field_a, field_b, field_c) VALUES (1, 'a', '1a');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (2, 'b', '2b');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (3, 'c', '3c');
@@ -324,9 +331,9 @@ SELECT t2.field_a, t2.field_b, t2.field_c 
FROM t2

ON DUPLICATE KEY UPDATE

t1.field_3 = t2.field_c;

SELECT * FROM t1;

SELECT * FROM t1 ORDER BY id;

sync_slave_with_master;

SELECT * FROM t1;

SELECT * FROM t1 ORDER BY id;

connection master;

drop table t1, t2;
@@ -348,17 +355,17 @@ DROP TABLE IF EXISTS t1, t2; 
# Reset result of LAST_INSERT_ID().

SELECT LAST_INSERT_ID(0);



CREATE TABLE t1 (

eval CREATE TABLE t1 (

  id INT NOT NULL DEFAULT 0,

  last_id INT,

  PRIMARY KEY (id)

);

) ENGINE=$engine_type;



CREATE TABLE t2 (

eval CREATE TABLE t2 (

  id INT NOT NULL AUTO_INCREMENT,

  last_id INT,

  PRIMARY KEY (id)

);

) ENGINE=$engine_type;



delimiter |;

CREATE PROCEDURE p1()
@@ -369,12 +376,12 @@ END| 
delimiter ;|



CALL p1();

SELECT * FROM t1;

SELECT * FROM t2;

SELECT * FROM t1 ORDER BY id;

SELECT * FROM t2 ORDER BY id;



sync_slave_with_master;

SELECT * FROM t1;

SELECT * FROM t2;

SELECT * FROM t1 ORDER BY id;

SELECT * FROM t2 ORDER BY id;



connection master;
@@ -394,11 +401,11 @@ DROP FUNCTION IF EXISTS f3; 
DROP TABLE IF EXISTS t1, t2;

--enable_warnings



CREATE TABLE t1 (

eval CREATE TABLE t1 (

    i INT NOT NULL AUTO_INCREMENT PRIMARY KEY,

    j INT DEFAULT 0

);

CREATE TABLE t2 (i INT);

) ENGINE=$engine_type;

eval CREATE TABLE t2 (i INT) ENGINE=$engine_type;



delimiter |;

CREATE PROCEDURE p1()
@@ -443,14 +450,16 @@ UPDATE t1 SET j= -1 WHERE i IS NULL; 
# Test statement-based replication of function calls.

INSERT INTO t1 (i) VALUES (NULL);



# Here, we rely on having set @@concurrent_insert= 0 (see comment at

# the top of this file).

connection master1;

INSERT INTO t1 (i) VALUES (NULL);



connection master;

SELECT f3();



SELECT * FROM t1;

SELECT * FROM t2;

SELECT * FROM t1 ORDER BY i;

SELECT * FROM t2 ORDER BY i;



sync_slave_with_master;

SELECT * FROM t1;
@@ -472,11 +481,11 @@ sync_slave_with_master; 


# Tests in this file are tightly bound together.  Recreate t2.

connection master;

create table t2 (

eval create table t2 (

  id int not null auto_increment,

  last_id int,

  primary key (id)

);

) engine=$engine_type;





# Test for BUG#20341 "stored function inserting into one
@@ -484,7 +493,8 @@ create table t2 ( 


connection master;

truncate table t2;

create table t1 (id tinyint primary key); # no auto_increment

# no auto_increment

eval create table t1 (id tinyint primary key) engine=$engine_type;



delimiter |;

create function insid() returns int
@@ -504,20 +514,20 @@ insert into t2 (id) values(5),(6),(7); 
delete from t2 where id>=5;

set sql_log_bin=1;

insert into t1 select insid();

select * from t1;

select * from t2;

select * from t1 order by id;

select * from t2 order by id;



sync_slave_with_master;

select * from t1;

select * from t2;

select * from t1 order by id;

select * from t2 order by id;



connection master;

drop table t1;

drop function insid;



truncate table t2;

create table t1 (n int primary key auto_increment not null,

b int, unique(b));

eval create table t1 (n int primary key auto_increment not null,

                      b int, unique(b)) engine=$engine_type;

delimiter |;

create procedure foo()

begin
@@ -528,14 +538,15 @@ begin 
end|

delimiter ;|

call foo();

select * from t1;

select * from t2;

select * from t1 order by n;

select * from t2 order by id;



sync_slave_with_master;

select * from t1;

select * from t2;

select * from t1 order by n;

select * from t2 order by id;



connection master;

drop table t1, t2;

drop procedure foo;

SET @@global.concurrent_insert= @old_concurrent_insert;

sync_slave_with_master;

mysql-test/suite/jp/include/trim_sjis.inc

0 → 100644
+70 −0
Original line number Diff line number Diff line 
#

# Test TRIM() function with Japanese characters sjis encoding

#



--source include/have_sjis.inc

--character_set sjis

SET NAMES sjis;

SET character_set_database = sjis;



--disable_warnings

DROP TABLE IF EXISTS `Ｔ１`;

DROP TABLE IF EXISTS `Ｔ２`;

DROP TABLE IF EXISTS `Ｔ３`;

--enable_warnings

--replace_result $engine <engine_to_be_tested>

eval CREATE TABLE `Ｔ１` (`Ｃ１` CHAR(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis ENGINE = $engine;

--replace_result $engine <engine_to_be_tested>

eval CREATE TABLE `Ｔ２` (`Ｃ１` CHAR(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis ENGINE = $engine;

--replace_result $engine <engine_to_be_tested>

eval CREATE TABLE `Ｔ３` (`Ｃ１` CHAR(12), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis ENGINE = $engine;



# Nothing to trim

INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');

# Test data for TRIM(TRAILING [remstr] FROM str)

INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶ');

INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶｶ');

INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵｶｶｶ');

# Test data for TRIM(LEADING [remstr] FROM str)

INSERT INTO `Ｔ１` VALUES ('ｶｱｲｳｴｵ');

INSERT INTO `Ｔ１` VALUES ('ｶｶｱｲｳｴｵ');

INSERT INTO `Ｔ１` VALUES ('ｶｶｶｱｲｳｴｵ');

# Test data for TRIM(BOTH [remstr] FROM str)

INSERT INTO `Ｔ１` VALUES ('ｶｶｶｱｲｳｴｵｶｶｶ');

# Test data for TRIM without [remstr] (remove spaces) 

INSERT INTO `Ｔ１` VALUES ('   ｱｲｳｴｵ   ');

INSERT INTO `Ｔ２` VALUES ('あいうえお');

INSERT INTO `Ｔ２` VALUES ('あいうえおか');

INSERT INTO `Ｔ２` VALUES ('あいうえおかか');

INSERT INTO `Ｔ２` VALUES ('あいうえおかかか');

INSERT INTO `Ｔ２` VALUES ('かあいうえお');

INSERT INTO `Ｔ２` VALUES ('かかあいうえお');

INSERT INTO `Ｔ２` VALUES ('かかかあいうえお');

INSERT INTO `Ｔ２` VALUES ('かかかあいうえおかかか');

INSERT INTO `Ｔ２` VALUES ('   あいうえお   ');

INSERT INTO `Ｔ３` VALUES ('ソ十表予構');

INSERT INTO `Ｔ３` VALUES ('ソ十表予構暴');

INSERT INTO `Ｔ３` VALUES ('ソ十表予構暴暴');

INSERT INTO `Ｔ３` VALUES ('ソ十表予構暴暴暴');

INSERT INTO `Ｔ３` VALUES ('暴ソ十表予構');

INSERT INTO `Ｔ３` VALUES ('暴暴ソ十表予構');

INSERT INTO `Ｔ３` VALUES ('暴暴暴ソ十表予構');

INSERT INTO `Ｔ３` VALUES ('暴暴暴ソ十表予構暴暴暴');

INSERT INTO `Ｔ３` VALUES ('   ソ十表予構   ');



SELECT `Ｃ１`,TRIM(TRAILING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;

SELECT `Ｃ１`,TRIM(LEADING 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;

SELECT `Ｃ１`,TRIM(BOTH 'ｶ' FROM `Ｃ１`) FROM `Ｔ１`;

SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ１`;

SELECT `Ｃ１`,TRIM(TRAILING 'か' FROM `Ｃ１`) FROM `Ｔ２`;

SELECT `Ｃ１`,TRIM(LEADING 'か' FROM `Ｃ１`) FROM `Ｔ２`;

SELECT `Ｃ１`,TRIM(BOTH 'か' FROM `Ｃ１`) FROM `Ｔ２`;

SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ２`;

SELECT `Ｃ１`,TRIM(TRAILING '暴' FROM `Ｃ１`) FROM `Ｔ３`;

SELECT `Ｃ１`,TRIM(LEADING '暴' FROM `Ｃ１`) FROM `Ｔ３`;

SELECT `Ｃ１`,TRIM(BOTH '暴' FROM `Ｃ１`) FROM `Ｔ３`;

SELECT `Ｃ１`,TRIM(`Ｃ１`) FROM `Ｔ３`;



DROP TABLE `Ｔ１`;

DROP TABLE `Ｔ２`;

DROP TABLE `Ｔ３`;

mysql-test/suite/jp/r/jp_alter_sjis.result

+93 −246

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/suite/jp/r/jp_alter_ucs2.result

+93 −246

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/suite/jp/r/jp_alter_ujis.result

+93 −246

File changed.

Preview size limit exceeded, changes collapsed.