Commit 0f57c004 authored by unknown's avatar unknown
Browse files

Manual merge 


mysql-test/t/rpl_ddl.test:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents af27fd8a 25136336

mysql-test/include/rpl_stmt_seq.inc

+25 −4
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ 
# the $variables is extreme sensitive. 

#



###############################################################

# Debug options : To debug this test script

###############################################################

let $showbinlog= 0;

let $manipulate= 1;



######## The typical test sequence

# 1. INSERT without commit

#    check table content of master and slave
@@ -52,9 +58,12 @@ let $MAX= `SELECT MAX(f1) FROM t1` ; 
eval INSERT INTO t1 SET f1= $MAX + 1;

# results before DDL(to be tested)

SELECT MAX(f1) FROM t1;

if ($show_binlog)

{

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';

}

sync_slave_with_master;



connection slave;
@@ -63,9 +72,12 @@ SELECT '-------- switch to slave --------' as ""; 
--enable_query_log

# results before DDL(to be tested)

SELECT MAX(f1) FROM t1;

if ($show_binlog)

{

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';

}



###############################################################

# command to be tested
@@ -79,9 +91,12 @@ eval $my_stmt; 
let $my_stmt= ERROR: YOU FORGOT TO FILL IN THE STATEMENT;

# results after DDL(to be tested)

SELECT MAX(f1) FROM t1;

if ($show_binlog)

{

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';

}

sync_slave_with_master;



connection slave;
@@ -90,9 +105,12 @@ SELECT '-------- switch to slave --------' as ""; 
--enable_query_log

# results after DDL(to be tested)

SELECT MAX(f1) FROM t1;

if ($show_binlog)

{

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';

}



###############################################################

# ROLLBACK
@@ -114,9 +132,12 @@ eval SELECT CONCAT(CONCAT('TEST-INFO: MASTER: The INSERT is ', 
                ' (Failed)')) AS "" 

               FROM mysqltest1.t1;

--enable_query_log

if ($show_binlog)

{

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';

}

sync_slave_with_master;



connection slave;
@@ -133,16 +154,17 @@ eval SELECT CONCAT(CONCAT('TEST-INFO: SLAVE: The INSERT is ', 
                ' (Failed)')) AS "" 

               FROM mysqltest1.t1;

--enable_query_log

if ($show_binlog)

{

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';

}



###############################################################

# Manipulate binlog

###############################################################

#let $manipulate= 0;

let $manipulate= 1;

while ($manipulate)

if ($manipulate)

{

#### Manipulate the binary logs,

# so that the output of SHOW BINLOG EVENTS IN <current log>
@@ -171,7 +193,6 @@ flush logs; 
# sleep 1;

# eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';

inc $_log_num_n;

let $manipulate= 0;

}



connection master;

mysql-test/r/bdb_cache.result

+1 −3
Original line number Diff line number Diff line
@@ -12,10 +12,9 @@ show status like "Qcache_queries_in_cache"; 
Variable_name	Value

Qcache_queries_in_cache	0

drop table t1;

commit;

set autocommit=1;

begin;

create table t1 (a int not null) engine=bdb;

begin;

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

select * from t1;

a
@@ -26,7 +25,6 @@ show status like "Qcache_queries_in_cache"; 
Variable_name	Value

Qcache_queries_in_cache	0

drop table t1;

commit;

create table t1 (a int not null) engine=bdb;

create table t2 (a int not null) engine=bdb;

create table t3 (a int not null) engine=bdb;

mysql-test/r/group_by.result

+12 −1
Original line number Diff line number Diff line
@@ -721,7 +721,8 @@ SELECT hostname, COUNT(DISTINCT user_id) as no FROM t1 
WHERE hostname LIKE '%aol%'

    GROUP BY hostname;

hostname	no

cache-dtc-af05.proxy.aol.com	1

cache-dtc-af05.proxy.aol.com

DROP TABLE t1;	1

drop table if exists t1, t2;

Warnings:

Note	1051	Unknown table 't2'
@@ -746,3 +747,13 @@ aaa 
show warnings;

Level	Code	Message

drop table t1, t2;

DROP TABLE t1;

CREATE TABLE t1 (a  int, b int);

INSERT INTO t1 VALUES (1,2), (1,3);

SELECT a, b FROM t1 GROUP BY 'const';

a	b

1	2

SELECT DISTINCT a, b FROM t1 GROUP BY 'const';

a	b

1	2

DROP TABLE t1;

mysql-test/t/bdb_cache.test

+1 −3
Original line number Diff line number Diff line
@@ -14,15 +14,13 @@ insert into t1 values (1),(2),(3); 
select * from t1;

show status like "Qcache_queries_in_cache";

drop table t1;

commit;

set autocommit=1;

begin;

create table t1 (a int not null) engine=bdb;

begin;

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

select * from t1;

show status like "Qcache_queries_in_cache";

drop table t1;

commit;

create table t1 (a int not null) engine=bdb;

create table t2 (a int not null) engine=bdb;

create table t3 (a int not null) engine=bdb;

mysql-test/t/group_by.test

+15 −1
Original line number Diff line number Diff line 


# Initialise

--disable_warnings

drop table if exists t1,t2,t3;
@@ -524,7 +525,7 @@ select min(b) from t1; 
drop table t1;



#

# Test for bug #11088: GROUP BY a BLOB colimn with COUNT(DISTINCT column1) 

# Test for bug #11088: GROUP BY a BLOB column with COUNT(DISTINCT column1) 

#



CREATE TABLE t1 (id int PRIMARY KEY, user_id int, hostname longtext);
@@ -539,6 +540,8 @@ SELECT hostname, COUNT(DISTINCT user_id) as no FROM t1 
  WHERE hostname LIKE '%aol%'

    GROUP BY hostname;



DROP TABLE t1;



#

# Bug#11211: Ambiguous column reference in GROUP BY.

#
@@ -563,3 +566,14 @@ group by t1.c1; 
show warnings;



drop table t1, t2;



#

# Test for bug #8614: GROUP BY 'const with DISTINCT  

#



CREATE TABLE t1 (a  int, b int);

INSERT INTO t1 VALUES (1,2), (1,3);

SELECT a, b FROM t1 GROUP BY 'const';

SELECT DISTINCT a, b FROM t1 GROUP BY 'const';



DROP TABLE t1;