Commit d6759bed authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
parents 8664552c 61e67472

BUILD/SETUP.sh

+2 −2
Original line number Diff line number Diff line
@@ -92,9 +92,9 @@ if [ "x$warning_mode" != "xpedantic" ]; then 
# Both C and C++ warnings

  warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W"

  warnings="$warnings -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare"

  warnings="$warnings -Wwrite-strings"

  warnings="$warnings -Wwrite-strings -Wunused-function -Wunused-label -Wunused-value -Wunused-variable"

# C warnings

  c_warnings="$warnings -Wunused"

  c_warnings="$warnings -Wunused-parameter"

# C++ warnings

  cxx_warnings="$warnings -Woverloaded-virtual -Wsign-promo -Wreorder"

  cxx_warnings="$warnings -Wctor-dtor-privacy -Wnon-virtual-dtor"

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.1.15-beta)

AM_INIT_AUTOMAKE(mysql, 5.1.16-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

include/thr_lock.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ typedef struct st_thr_lock { 
  void (*get_status)(void*, int);	/* When one gets a lock */

  void (*copy_status)(void*,void*);

  void (*update_status)(void*);		/* Before release of write */

  void (*restore_status)(void*);         /* Before release of read */

  my_bool (*check_status)(void *);

} THR_LOCK;

mysql-test/extra/binlog_tests/insert_select-binlog.test

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ insert into t1 values(2); 
create table t2(a int);

insert into t2 values(1),(2);

reset master;

--error 1062

--error ER_DUP_ENTRY_WITH_KEY_NAME

insert into t1 select * from t2;

# The above should produce an error, but still be in the binlog;

# verify the binlog :
@@ -29,7 +29,7 @@ drop table t1, t2; 
create table t1(a int);

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

reset master;

--error 1062

--error ER_DUP_ENTRY_WITH_KEY_NAME

create table t2(unique(a)) select a from t1;

# The above should produce an error, *and* not appear in the binlog

let $VERSION=`select version()`;

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test

+9 −9
Original line number Diff line number Diff line
@@ -273,12 +273,12 @@ set autocommit=0; 
CREATE TABLE t1 (a int, b int) engine=myisam;

reset master;

INSERT INTO t1 values (1,1),(1,2);

--error 1062

--error ER_DUP_ENTRY_WITH_KEY_NAME

CREATE TABLE t2 (primary key (a)) engine=innodb select * from t1;

# This should give warning

DROP TABLE if exists t2;

INSERT INTO t1 values (3,3);

--error 1062

--error ER_DUP_ENTRY_WITH_KEY_NAME

CREATE TEMPORARY TABLE t2 (primary key (a)) engine=innodb select * from t1;

ROLLBACK;

# This should give warning
@@ -286,12 +286,12 @@ DROP TABLE IF EXISTS t2; 


CREATE TABLE t2 (a int, b int, primary key (a)) engine=innodb;

INSERT INTO t1 VALUES (4,4);

--error 1062

--error ER_DUP_ENTRY_WITH_KEY_NAME

CREATE TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;

SELECT * from t2;

TRUNCATE table t2;

INSERT INTO t1 VALUES (5,5);

--error 1062

--error ER_DUP_ENTRY_WITH_KEY_NAME

INSERT INTO t2 select * from t1;

SELECT * FROM t2;

DROP TABLE t2;
@@ -301,25 +301,25 @@ CREATE TEMPORARY TABLE t2 (a int, b int, primary key (a)) engine=innodb ; 
INSERT INTO t1 values (7,7);

ROLLBACK;

INSERT INTO t1 values (8,8);

--error 1062

--error ER_DUP_ENTRY_WITH_KEY_NAME

CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;

COMMIT;

INSERT INTO t1 values (9,9);

--error 1062

--error ER_DUP_ENTRY_WITH_KEY_NAME

CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;

ROLLBACK;

SELECT * from t2;

TRUNCATE table t2;

INSERT INTO t1 values (10,10);

--error 1062

--error ER_DUP_ENTRY_WITH_KEY_NAME

INSERT INTO t2 select * from t1;

SELECT * from t1;

INSERT INTO t2 values (100,100);

--error 1062

--error ER_DUP_ENTRY_WITH_KEY_NAME

CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;

COMMIT;

INSERT INTO t2 values (101,101);

--error 1062

--error ER_DUP_ENTRY_WITH_KEY_NAME

CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;

ROLLBACK;

SELECT * from t2;