Commit 08f93037 authored by unknown's avatar unknown
Browse files

Manually merged 


client/mysql.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/rpl_relayrotate.test:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
BitKeeper/deleted/.del-innodb_unsafe_binlog-master.opt~9cbe1bb3d8696c5b:
  Auto merged
mysql-test/t/rpl_stm_until.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.h:
  Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
parents c9841352 6692dcf7

mysql-test/extra/rpl_tests/rpl_deadlock.test

+7 −1
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ select * from t2; 
# check that no error is reported

--replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 #

--replace_result $MASTER_MYPORT MASTER_MYPORT

--vertical_results

show slave status;

--horizontal_results



# 2) Test lock wait timeout
@@ -81,9 +83,11 @@ sync_with_master; 
select * from t1; # check that slave succeeded finally

select * from t2;

# check that no error is reported

--replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 #

--replace_column 1 # 7 # 8 # 9 # 11 # 16 # 22 # 23 # 33 #

--replace_result $MASTER_MYPORT MASTER_MYPORT

--vertical_results

show slave status;

--horizontal_results



# Now we repeat 2), but with BEGIN in the same relay log as

# COMMIT (to see if seeking into hot log is ok).
@@ -103,7 +107,9 @@ select * from t1; 
select * from t2;

--replace_column 1 # 7 # 8 # 9 # 11 # 16 # 22 # 23 # 33 #

--replace_result $MASTER_MYPORT MASTER_MYPORT

--vertical_results

show slave status;

--horizontal_results



connection master;

drop table t1,t2,t3,t4;

mysql-test/mysql-test-run.sh

+3 −1
Original line number Diff line number Diff line
@@ -669,7 +669,9 @@ fi 
[ -d $MYSQL_TEST_DIR/var/tmp ] || mkdir $MYSQL_TEST_DIR/var/tmp

[ -d $MYSQL_TEST_DIR/var/run ] || mkdir $MYSQL_TEST_DIR/var/run

[ -d $MYSQL_TEST_DIR/var/log ] || mkdir $MYSQL_TEST_DIR/var/log

if ! test -L $MYSQL_TEST_DIR/var/std_data_ln ; then



# Use 'test', not '[' as the shell builtin might not have '-L

if test ! -L "$MYSQL_TEST_DIR/var/std_data_ln" ; then

  ln -s $MYSQL_TEST_DIR/std_data/ $MYSQL_TEST_DIR/var/std_data_ln

fi

mysql-test/r/func_gconcat.result

+10 −0
Original line number Diff line number Diff line
@@ -611,6 +611,16 @@ count(distinct (f1+1)) 
1

3

drop table t1;

create table t1 (f1 int unsigned, f2 varchar(255));

insert into t1 values (1,repeat('a',255)),(2,repeat('b',255));

select f2,group_concat(f1) from t1 group by f2;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t1	f2	f2	253	255	255	Y	0	0	8

def					group_concat(f1)	253	400	1	Y	128	0	63

f2	group_concat(f1)

aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa	1

bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb	2

drop table t1;

set names latin1;

create table t1 (a char, b char);

insert into t1 values ('a', 'a'), ('a', 'b'), ('b', 'a'), ('b', 'b');

mysql-test/r/key_cache.result

+42 −0
Original line number Diff line number Diff line
@@ -289,6 +289,48 @@ check table t1; 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

CREATE TABLE t1(a int NOT NULL AUTO_INCREMENT PRIMARY KEY);

SET GLOBAL key_cache_block_size=1536;

INSERT INTO t1 VALUES (1);

SELECT @@key_cache_block_size;

@@key_cache_block_size

1536

CHECK TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

DROP TABLE t1;

CREATE TABLE t1(a int NOT NULL AUTO_INCREMENT PRIMARY KEY, b int);

CREATE TABLE t2(a int NOT NULL AUTO_INCREMENT PRIMARY KEY, b int);

SET GLOBAL key_cache_block_size=1536;

INSERT INTO t1 VALUES (1,0);

INSERT INTO t2(b) SELECT b FROM t1;

INSERT INTO t1(b) SELECT b FROM t2;

INSERT INTO t2(b) SELECT b FROM t1;

INSERT INTO t1(b) SELECT b FROM t2;

INSERT INTO t2(b) SELECT b FROM t1;

INSERT INTO t1(b) SELECT b FROM t2;

INSERT INTO t2(b) SELECT b FROM t1;

INSERT INTO t1(b) SELECT b FROM t2;

INSERT INTO t2(b) SELECT b FROM t1;

INSERT INTO t1(b) SELECT b FROM t2;

INSERT INTO t2(b) SELECT b FROM t1;

INSERT INTO t1(b) SELECT b FROM t2;

INSERT INTO t2(b) SELECT b FROM t1;

INSERT INTO t1(b) SELECT b FROM t2;

INSERT INTO t2(b) SELECT b FROM t1;

INSERT INTO t1(b) SELECT b FROM t2;

INSERT INTO t2(b) SELECT b FROM t1;

INSERT INTO t1(b) SELECT b FROM t2;

SELECT COUNT(*) FROM t1;

COUNT(*)

4181

SELECT @@key_cache_block_size;

@@key_cache_block_size

1536

CHECK TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

DROP TABLE t1,t2;

set @@global.key_buffer_size=0;

Warnings:

Warning	1438	Cannot drop default keycache

mysql-test/r/order_by.result

+32 −0
Original line number Diff line number Diff line
@@ -820,3 +820,35 @@ a 
2

2

DROP TABLE t1;

CREATE TABLE t1 (a int, b int);

INSERT INTO t1 VALUES (1,30), (2,20), (1,10), (2,30), (1,20), (2,10);

(SELECT b,a FROM t1 ORDER BY a,b) ORDER BY b,a;

b	a

10	1

10	2

20	1

20	2

30	1

30	2

(SELECT b FROM t1 ORDER BY b DESC) ORDER BY b ASC;

b

10

10

20

20

30

30

(SELECT b,a FROM t1 ORDER BY b,a) ORDER BY a,b;

b	a

10	1

20	1

30	1

10	2

20	2

30	2

(SELECT b,a FROM t1 ORDER by b,a LIMIT 3) ORDER by a,b;

b	a

10	1

20	1

10	2

DROP TABLE t1;