mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Fixed compiler warnings
Fixed wrong merge that disabled 'make test' Renamed all suppress files to end in '.supp' Don't give "skipped %d bytes from file" warnings in 5.0 mysql-test/purify.supp: Rename: mysql-test/suppress.purify -> mysql-test/purify.supp support-files/compiler_warnings.supp: Rename: support-files/disabled_compiler_warnings.txt -> support-files/compiler_warnings.supp Makefile.am: Added back missing cd from wrong merge heap/hp_write.c: Fixed compiler warning mysql-test/r/mysqlbinlog.result: Fixed test case to drop all used tables at start and used tables after each test group mysql-test/t/mysqlbinlog.test: Fixed test case to drop all used tables at start and used tables after each test group sql/net_serv.cc: Don't give "skipped %d bytes from file" warnings in 5.0 (The proper fix for this is in 5.1) sql/table.cc: Fixed compiler warning
This commit is contained in:
@ -7,7 +7,7 @@
|
||||
set timestamp=1000000000;
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t1,t2;
|
||||
drop table if exists t1,t2,t3,t4,t5,t03,t04;
|
||||
--enable_warnings
|
||||
|
||||
create table t1 (word varchar(20));
|
||||
@ -106,8 +106,11 @@ select "--- reading stdin --" as "";
|
||||
|
||||
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
||||
--exec $MYSQL_BINLOG --short-form --position=79 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
|
||||
drop table t1,t2;
|
||||
|
||||
#
|
||||
# Bug#16217 (mysql client did not know how not switch its internal charset)
|
||||
#
|
||||
flush logs;
|
||||
create table t3 (f text character set utf8);
|
||||
create table t4 (f text character set cp932);
|
||||
@ -121,6 +124,7 @@ select HEX(f) from t03;
|
||||
select HEX(f) from t3;
|
||||
select HEX(f) from t04;
|
||||
select HEX(f) from t4;
|
||||
drop table t3,t4,t03,t04;
|
||||
|
||||
#
|
||||
#BUG#14157: utf8 encoding in binlog without set character_set_client
|
||||
@ -133,6 +137,7 @@ flush logs;
|
||||
# should use default-character-set same as the server.
|
||||
--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000006 | $MYSQL
|
||||
select * from t5 /* must be (1),(1) */;
|
||||
drop table t5;
|
||||
|
||||
#
|
||||
# Bug#22645 LC_TIME_NAMES: Statement not replicated
|
||||
@ -140,7 +145,6 @@ select * from t5 /* must be (1),(1) */;
|
||||
# lc_time_names dependent values correctly
|
||||
#
|
||||
flush logs;
|
||||
drop table if exists t5;
|
||||
create table t5 (c1 int, c2 varchar(128) character set latin1 not null);
|
||||
insert into t5 values (1, date_format('2001-01-01','%W'));
|
||||
set lc_time_names=de_DE;
|
||||
@ -152,6 +156,8 @@ flush logs;
|
||||
drop table t5;
|
||||
--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007 | $MYSQL
|
||||
select * from t5 order by c1;
|
||||
drop table t5;
|
||||
|
||||
#
|
||||
# Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails
|
||||
#
|
||||
@ -175,6 +181,8 @@ call p1();
|
||||
--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009 | $MYSQL
|
||||
call p1();
|
||||
drop procedure p1;
|
||||
|
||||
#
|
||||
# Some coverage of not normally used parts
|
||||
#
|
||||
--disable_query_log
|
||||
@ -182,7 +190,4 @@ drop procedure p1;
|
||||
--exec $MYSQL_BINLOG --help 2>&1 > /dev/null
|
||||
--enable_query_log
|
||||
|
||||
# clean up
|
||||
drop table t1, t2, t03, t04, t3, t4, t5;
|
||||
|
||||
# End of 5.0 tests
|
||||
|
Reference in New Issue
Block a user