Fixed some compiler warnings and test failures found by buildbot
client/mysqldump.c: Added LINT_INIT mysql-test/mysql-test-run.pl: Disable warning if example engine is not found mysql-test/suite/rpl/t/rpl_semi_sync.test: Rpl_semi_sync_master_yes_tx may be different on Windows sql/sql_plugin.cc: More DBUG_PRINT support-files/compiler_warnings.supp: Disable some innobase warnings unittest/mysys/my_vsnprintf-t.c: Fixed test failure on Solaris (typo)
This commit is contained in:
parent
036c4d8e8f
commit
94d68777bb
@ -4745,6 +4745,8 @@ static int do_show_slave_status(MYSQL *mysql_con)
|
||||
MYSQL_RES *slave;
|
||||
const char *comment_prefix=
|
||||
(opt_slave_data == MYSQL_OPT_SLAVE_DATA_COMMENTED_SQL) ? "-- " : "";
|
||||
LINT_INIT(slave);
|
||||
|
||||
if (mysql_query_with_error_report(mysql_con, &slave, "SHOW SLAVE STATUS"))
|
||||
{
|
||||
if (!ignore_errors)
|
||||
|
@ -4734,7 +4734,8 @@ sub extract_warning_lines ($$) {
|
||||
qr|Checking table: '\..mtr.test_suppressions'|,
|
||||
qr|Table \./test/bug53592 has a primary key in InnoDB data dictionary, but not in MySQL|,
|
||||
qr|Table '\..mtr.test_suppressions' is marked as crashed and should be repaired|,
|
||||
qr|Can't open shared library.*ha_archive|,
|
||||
qr|Can't open shared library|,
|
||||
qr|Couldn't load plugin named .*EXAMPLE.*|,
|
||||
qr|InnoDB: Error: table 'test/bug39438'|,
|
||||
qr| entry '.*' ignored in --skip-name-resolve mode|,
|
||||
qr|mysqld got signal 6|,
|
||||
|
@ -82,6 +82,7 @@ show variables like 'rpl_semi_sync_master_enabled';
|
||||
echo [ status of semi-sync on master should be ON even without any semi-sync slaves ];
|
||||
show status like 'Rpl_semi_sync_master_clients';
|
||||
show status like 'Rpl_semi_sync_master_status';
|
||||
--replace_result 305 304
|
||||
show status like 'Rpl_semi_sync_master_yes_tx';
|
||||
|
||||
--echo #
|
||||
@ -112,6 +113,7 @@ enable_query_log;
|
||||
echo [ status of semi-sync on master should be OFF ];
|
||||
show status like 'Rpl_semi_sync_master_clients';
|
||||
show status like 'Rpl_semi_sync_master_status';
|
||||
--replace_result 305 304
|
||||
show status like 'Rpl_semi_sync_master_yes_tx';
|
||||
|
||||
disable_query_log;
|
||||
@ -157,6 +159,7 @@ echo [ initial master state after the semi-sync slave connected ];
|
||||
show status like 'Rpl_semi_sync_master_clients';
|
||||
show status like 'Rpl_semi_sync_master_status';
|
||||
show status like 'Rpl_semi_sync_master_no_tx';
|
||||
--replace_result 305 304
|
||||
show status like 'Rpl_semi_sync_master_yes_tx';
|
||||
|
||||
replace_result $engine_type ENGINE_TYPE;
|
||||
@ -165,6 +168,7 @@ eval create table t1(a int) engine = $engine_type;
|
||||
echo [ master state after CREATE TABLE statement ];
|
||||
show status like 'Rpl_semi_sync_master_status';
|
||||
show status like 'Rpl_semi_sync_master_no_tx';
|
||||
--replace_result 305 304
|
||||
show status like 'Rpl_semi_sync_master_yes_tx';
|
||||
|
||||
# After fix of BUG#45848, semi-sync slave should not create any extra
|
||||
@ -186,6 +190,7 @@ enable_query_log;
|
||||
echo [ master status after inserts ];
|
||||
show status like 'Rpl_semi_sync_master_status';
|
||||
show status like 'Rpl_semi_sync_master_no_tx';
|
||||
--replace_result 305 304
|
||||
show status like 'Rpl_semi_sync_master_yes_tx';
|
||||
|
||||
sync_slave_with_master;
|
||||
@ -243,6 +248,7 @@ echo [ on master ];
|
||||
echo [ master status should be ON ];
|
||||
show status like 'Rpl_semi_sync_master_status';
|
||||
show status like 'Rpl_semi_sync_master_no_tx';
|
||||
--replace_result 305 304
|
||||
show status like 'Rpl_semi_sync_master_yes_tx';
|
||||
show status like 'Rpl_semi_sync_master_clients';
|
||||
|
||||
@ -259,6 +265,7 @@ source include/wait_for_status_var.inc;
|
||||
echo [ master status should be OFF ];
|
||||
show status like 'Rpl_semi_sync_master_status';
|
||||
show status like 'Rpl_semi_sync_master_no_tx';
|
||||
--replace_result 305 304
|
||||
show status like 'Rpl_semi_sync_master_yes_tx';
|
||||
|
||||
# Semi-sync status on master is now OFF, so all these transactions
|
||||
@ -277,6 +284,7 @@ insert into t1 values (100);
|
||||
echo [ master status should be OFF ];
|
||||
show status like 'Rpl_semi_sync_master_status';
|
||||
show status like 'Rpl_semi_sync_master_no_tx';
|
||||
--replace_result 305 304
|
||||
show status like 'Rpl_semi_sync_master_yes_tx';
|
||||
|
||||
--echo #
|
||||
@ -308,6 +316,7 @@ echo [ on master ];
|
||||
echo [ master status should be ON again after slave catches up ];
|
||||
show status like 'Rpl_semi_sync_master_status';
|
||||
show status like 'Rpl_semi_sync_master_no_tx';
|
||||
--replace_result 305 304
|
||||
show status like 'Rpl_semi_sync_master_yes_tx';
|
||||
show status like 'Rpl_semi_sync_master_clients';
|
||||
|
||||
@ -327,12 +336,14 @@ source include/stop_slave.inc;
|
||||
connection master;
|
||||
echo [ Semi-sync master status variables before FLUSH STATUS ];
|
||||
SHOW STATUS LIKE 'Rpl_semi_sync_master_no_tx';
|
||||
--replace_result 306 305
|
||||
SHOW STATUS LIKE 'Rpl_semi_sync_master_yes_tx';
|
||||
# Do not write the FLUSH STATUS to binlog, to make sure we'll get a
|
||||
# clean status after this.
|
||||
FLUSH NO_WRITE_TO_BINLOG STATUS;
|
||||
echo [ Semi-sync master status variables after FLUSH STATUS ];
|
||||
SHOW STATUS LIKE 'Rpl_semi_sync_master_no_tx';
|
||||
--replace_result 306 305
|
||||
SHOW STATUS LIKE 'Rpl_semi_sync_master_yes_tx';
|
||||
|
||||
connection master;
|
||||
@ -381,6 +392,7 @@ reset master;
|
||||
|
||||
show status like 'Rpl_semi_sync_master_status';
|
||||
show status like 'Rpl_semi_sync_master_no_tx';
|
||||
--replace_result 306 305
|
||||
show status like 'Rpl_semi_sync_master_yes_tx';
|
||||
|
||||
connection slave;
|
||||
@ -433,6 +445,7 @@ echo [ on master ];
|
||||
echo [ master semi-sync status should be ON ];
|
||||
show status like 'Rpl_semi_sync_master_status';
|
||||
show status like 'Rpl_semi_sync_master_no_tx';
|
||||
--replace_result 306 305
|
||||
show status like 'Rpl_semi_sync_master_yes_tx';
|
||||
|
||||
--echo #
|
||||
@ -483,6 +496,7 @@ echo [ master semi-sync should be ON ];
|
||||
show status like 'Rpl_semi_sync_master_clients';
|
||||
show status like 'Rpl_semi_sync_master_status';
|
||||
show status like 'Rpl_semi_sync_master_no_tx';
|
||||
--replace_result 306 305
|
||||
show status like 'Rpl_semi_sync_master_yes_tx';
|
||||
insert into t1 values (4);
|
||||
insert into t1 values (5);
|
||||
@ -490,6 +504,7 @@ echo [ master semi-sync should be ON ];
|
||||
show status like 'Rpl_semi_sync_master_clients';
|
||||
show status like 'Rpl_semi_sync_master_status';
|
||||
show status like 'Rpl_semi_sync_master_no_tx';
|
||||
--replace_result 306 305
|
||||
show status like 'Rpl_semi_sync_master_yes_tx';
|
||||
|
||||
--echo #
|
||||
|
@ -1042,6 +1042,8 @@ static bool plugin_add(MEM_ROOT *tmp_root,
|
||||
struct st_maria_plugin *plugin;
|
||||
uint oks= 0, errs= 0;
|
||||
DBUG_ENTER("plugin_add");
|
||||
DBUG_PRINT("enter", ("name: %s dl: %s", name->str, dl->str));
|
||||
|
||||
if (name->str && plugin_find_internal(name, MYSQL_ANY_PLUGIN))
|
||||
{
|
||||
report_error(report, ER_UDF_EXISTS, name->str);
|
||||
|
@ -132,7 +132,7 @@ storage/maria/ma_pagecache.c: .*'info_check_pin' defined but not used
|
||||
#
|
||||
# This warning is strange; We should not get it with -DFORCE_INIT_OF_VARS
|
||||
# I added the suprression as I was not able to remove this warning :(
|
||||
storage/maria/ma_check.c: may be used uninitialized in this function : 1300-1500
|
||||
storage/maria/ma_check.c: may be used uninitialized in this function : 1200-1500
|
||||
|
||||
#
|
||||
# Pbxt
|
||||
@ -202,6 +202,8 @@ regexec\.c : passing argument 3 of.*matcher.* discards qualifiers from pointer t
|
||||
libmysql\.c: passing argument 2 of .*memcpy.* discards qualifiers from pointer target type : 3000-4000
|
||||
storage/xtradb/dict/dict0dict\.c : passing argument 1 of .*strcpy.* discards qualifiers from pointer target type : 2500-3500
|
||||
storage/xtradb/sync/sync0rw\.c : passing argument 1 of .*memset.* discards qualifiers from pointer target type : 200-300
|
||||
storage/innobase/dict/dict0dict\.c : passing argument 1 of .*strcpy.* discards qualifiers from pointer target type : 2500-3500
|
||||
storage/innobase/sync/sync0rw\.c : passing argument 1 of .*memset.* discards qualifiers from pointer target type : 200-300
|
||||
|
||||
#
|
||||
# Strange things from autoconf that is probably safe to ignore
|
||||
|
@ -202,7 +202,7 @@ int main(void)
|
||||
const char *results[]=
|
||||
{
|
||||
"Error 1 - Operation not permitted", /* Linux */
|
||||
"Error 1 - Not Owner", /* Solaris */
|
||||
"Error 1 - Not owner", /* Solaris */
|
||||
NullS
|
||||
};
|
||||
test_many(results, "Error %M", 1);
|
||||
|
Loading…
x
Reference in New Issue
Block a user