Commit b4f80eed authored by unknown's avatar unknown
Browse files

Give warnings for unused objects 

Changed error message to be compatible with old error file
Added new error message for new DUP_ENTRY syntax


BUILD/SETUP.sh:
  Give warnings for unused objects
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Changed to use new error message
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_auto_increment.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_loaddata.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_trig004.test:
  Changed to use new error message
mysql-test/include/mix1.inc:
  Changed to use new error message
mysql-test/include/mix2.inc:
  Changed to use new error message
mysql-test/include/ps_modify.inc:
  Changed to use new error message
mysql-test/include/query_cache.inc:
  Changed to use new error message
mysql-test/include/varchar.inc:
  Changed to use new error message
mysql-test/r/create.result:
  Changed to use new error message
mysql-test/r/rpl_sp.result:
  Changed to use new error message
mysql-test/r/sp.result:
  Changed to use new error message
mysql-test/r/view.result:
  Changed to use new error message
mysql-test/t/auto_increment.test:
  Changed to use new error message
mysql-test/t/create.test:
  Changed to use new error message
mysql-test/t/create_select_tmp.test:
  Changed to use new error message
mysql-test/t/ctype_utf8.test:
  Changed to use new error message
mysql-test/t/delayed.test:
  Changed to use new error message
mysql-test/t/heap.test:
  Changed to use new error message
mysql-test/t/heap_btree.test:
  Changed to use new error message
mysql-test/t/heap_hash.test:
  Changed to use new error message
mysql-test/t/innodb.test:
  Changed to use new error message
mysql-test/t/insert_select.test:
  Changed to use new error message
mysql-test/t/insert_update.test:
  Changed to use new error message
mysql-test/t/join_outer.test:
  Changed to use new error message
mysql-test/t/key.test:
  Changed to use new error message
mysql-test/t/merge.test:
  Changed to use new error message
mysql-test/t/myisam.test:
  Changed to use new error message
mysql-test/t/ndb_charset.test:
  Changed to use new error message
mysql-test/t/ndb_index_unique.test:
  Changed to use new error message
mysql-test/t/ndb_insert.test:
  Changed to use new error message
mysql-test/t/ndb_replace.test:
  Changed to use new error message
mysql-test/t/ndb_update.test:
  Changed to use new error message
mysql-test/t/replace.test:
  Changed to use new error message
mysql-test/t/rpl_err_ignoredtable.test:
  Changed to use new error message
mysql-test/t/rpl_row_create_table.test:
  Changed to use new error message
mysql-test/t/rpl_skip_error-slave.opt:
  Changed to use new error message
mysql-test/t/rpl_sp.test:
  Changed to use new error message
mysql-test/t/show_check.test:
  Changed to use new error message
mysql-test/t/sp-error.test:
  Changed to use new error message
mysql-test/t/sp.test:
  Changed to use new error message
mysql-test/t/sp_trans.test:
  Changed to use new error message
mysql-test/t/temp_table.test:
  Changed to use new error message
mysql-test/t/type_binary.test:
  Changed to use new error message
mysql-test/t/type_bit.test:
  Changed to use new error message
mysql-test/t/type_bit_innodb.test:
  Changed to use new error message
mysql-test/t/type_blob.test:
  Changed to use new error message
mysql-test/t/type_varchar.test:
  Changed to use new error message
mysql-test/t/view.test:
  Changed to use new error message
sql/handler.cc:
  ER_DUP_ENTRY -> ER_DUP_ENTRY_WITH_KEY_NAME
sql/share/errmsg.txt:
  Changed error message to be compatible with old error file
  Added new error message for new DUP_ENTRY syntax
sql/sql_table.cc:
  ER_DUP_ENTRY -> ER_DUP_ENTRY_WITH_KEY_NAME
sql-bench/example:
  Example file for how to run tests
parent 9b1336fe

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 -Wshadow"

# 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"

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;

mysql-test/extra/rpl_tests/rpl_auto_increment.test

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ insert into t1 values (NULL),(5),(NULL),(NULL); 
insert into t1 values (500),(NULL),(502),(NULL),(NULL);

select * from t1;

set @@insert_id=600;

--error 1062

--error ER_DUP_ENTRY_WITH_KEY_NAME

insert into t1 values(600),(NULL),(NULL);

set @@insert_id=600;

insert ignore into t1 values(600),(NULL),(NULL),(610),(NULL);
@@ -119,7 +119,7 @@ set auto_increment_increment=11; 
set auto_increment_offset=4;

insert into t1 values(null);

insert into t1 values(null);

--error 1062

--error ER_DUP_ENTRY_WITH_KEY_NAME

insert into t1 values(null);

select a, mod(a-@@auto_increment_offset,@@auto_increment_increment) from t1 order by a;

mysql-test/extra/rpl_tests/rpl_foreign_key.test

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ SET TIMESTAMP=1000000000; 
CREATE TABLE t3 ( a INT UNIQUE );

SET FOREIGN_KEY_CHECKS=0;

# Had to add 1022 for run with ndb as ndb uses different

# error and error code for 1062. Bug 16677

--error 1022, 1062

# error and error code for error ER_DUP_ENTRY_WITH_KEY_NAME. Bug 16677

--error 1022, ER_DUP_ENTRY_WITH_KEY_NAME

INSERT INTO t3 VALUES (1),(1);

sync_slave_with_master;