Skip to content

M
mariadb
Commit 441b1137 authored by unknown's avatar unknown
Browse files
Options

Don't give warning that readonly variable is forced to be readonly 

mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms


mysql-test/lib/mtr_report.pl:
  Test run now fails if we have [Warning] and [ERROR] as tags in .err file
  Added list of all common 'not fatal' errors to ignore error list
mysql-test/mysql-test-run-shell.sh:
  Fixed some wrong startup options
mysql-test/t/disabled.def:
  Disable instance manager tests because they generate warnings (and probably don't read the option files correctly)
sql/ha_ndbcluster_binlog.cc:
  Ensure we log all binglog errors with the "NDB Binlog" tag
sql/slave.cc:
  Make errors uniform
sql/sql_plugin.cc:
  Don't give warning that readonly variable is forced to be readonly
sql/stacktrace.c:
  Corrected manual reference
storage/blackhole/ha_blackhole.cc:
  Fixed wrong prototype that caused test to fail on 64 bit platforms
storage/example/ha_example.cc:
  Fixed wrong prototype that caused test to fail on 64 bit platforms
parent 7f62e09d
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 28 deletions
mysql-test/lib/mtr_report.pl
View file @ 441b1137
...@@ -265,8 +265,12 @@ sub mtr_report_stats ($) { ...@@ -265,8 +265,12 @@ sub mtr_report_stats ($) {
else else
{ {
# We report different types of problems in order # We report different types of problems in order
foreach my $pattern ( "^Warning:", "^Error:", "^==.* at 0x", foreach my $pattern ( "^Warning:",
"InnoDB: Warning", "missing DBUG_RETURN", "\\[Warning\\]",
"\\[ERROR\\]",
"^Error:", "^==.* at 0x",
"InnoDB: Warning",
"missing DBUG_RETURN",
"mysqld: Warning", "mysqld: Warning",
"allocated at line", "allocated at line",
"Attempting backtrace", "Assertion .* failed" ) "Attempting backtrace", "Assertion .* failed" )
...@@ -281,10 +285,58 @@ sub mtr_report_stats ($) { ...@@ -281,10 +285,58 @@ sub mtr_report_stats ($) {
while ( <ERR> ) while ( <ERR> )
{ {
# Skip some non fatal warnings from the log files # Skip some non fatal warnings from the log files
if ( /Warning:\s+Table:.* on (delete|rename)/ or if (
/Warning:\s+Setting lower_case_table_names=2/ or /Aborted connection/ or
/Client requested master to start replication from impossible position/ or
/Could not find first log file name in binary log/ or
/Enabling keys got errno/ or
/Error reading master configuration/ or
/Error reading packet/ or
/Event Scheduler/ or
/Failed to open the existing master info file/ or
/Failed to open log/ or
/Forcing shutdown of [0-9]* plugins/ or
/Got error [0-9]* when reading table/ or
/Incorrect definition of table/ or
/Incorrect information in file/ or
/InnoDB: Warning: we did not need to do crash recovery/ or
/Invalid \(old\?\) table or database name/ or
/Lock wait timeout exceeded/ or
/Log entry on master is longer than max_allowed_packet/ or
/NDB Binlog:/ or
/Neither --relay-log nor --relay-log-index were used/ or
/Query partially completed/ or
/Slave I.O thread aborted while waiting for relay log/ or
/Slave SQL thread is stopped because UNTIL condition/ or
/Slave \(additional info\)/ or
/Slave: According to the master's version/ or
/Slave: Error .*Deadlock found/ or
/Slave: Error .*Unknown table/ or
/Slave: Query caused different errors on master and slave/ or
/Slave: The incident LOST_EVENTS occured on the master/ or
/Slave: Unknown error.* 1105/ or
/Slave: .*master may suffer from/ or
/Slave: Error in Write_rows event: / or
/Slave: Table width mismatch/ or
/Slave: Error .* doesn't exist/ or
/Slave: Column [0-9]* type mismatch/ or
/Slave: Table .* doesn't exist/ or
/Slave: Field .* of table .* has no default value/ or
/Sort aborted/ or
/Warning:\s+One can only use the --user.*root/ or /Warning:\s+One can only use the --user.*root/ or
/InnoDB: Warning: we did not need to do crash recovery/) /Warning:\s+Setting lower_case_table_names=2/ or
/Warning:\s+Table:.* on (delete|rename)/ or
/You have an error in your SQL syntax/ or
/deprecated/ or
/description of time zone/ or
/equal MySQL server ids/ or
/error .*connecting to master/ or
/error reading log entry/ or
/lower_case_table_names is set/ or
/skip-name-resolve mode/ or
/slave SQL thread aborted/ or
/Slave: .*Duplicate entry/
)
{ {
next; # Skip these lines next; # Skip these lines
} }
......
mysql-test/mysql-test-run-shell.sh
View file @ 441b1137
...@@ -629,6 +629,11 @@ else ...@@ -629,6 +629,11 @@ else
TEST_MODE=`echo $TEST_MODE | sed 's/^ *//'` TEST_MODE=`echo $TEST_MODE | sed 's/^ *//'`
fi fi
#
# Skip tests that doesn't work with shell version
#
SKIP_TEST="$SKIP_TEST bootstrap"
#++ #++
# mysqld Environment Parameters # mysqld Environment Parameters
#-- #--
...@@ -900,8 +905,8 @@ MYSQL_DUMP="$MYSQL_DUMP --no-defaults --debug-info -uroot --socket=$MASTER_MYSOC ...@@ -900,8 +905,8 @@ MYSQL_DUMP="$MYSQL_DUMP --no-defaults --debug-info -uroot --socket=$MASTER_MYSOC
MYSQL_SLAP="$MYSQL_SLAP -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLSLAP_OPT" MYSQL_SLAP="$MYSQL_SLAP -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLSLAP_OPT"
MYSQL_DUMP_SLAVE="$MYSQL_DUMP_DIR --no-defaults -uroot --socket=$SLAVE_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT" MYSQL_DUMP_SLAVE="$MYSQL_DUMP_DIR --no-defaults -uroot --socket=$SLAVE_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
MYSQL_SHOW="$MYSQL_SHOW --no-defaults --debug-info -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLSHOW_OPT" MYSQL_SHOW="$MYSQL_SHOW --no-defaults --debug-info -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLSHOW_OPT"
MYSQL_BINLOG="$MYSQL_BINLOG --debug-info --no-defaults --local-load=$MYSQL_TMP_DIR --character-sets-dir=$CHARSETSDIR $EXTRA_MYSQLBINLOG_OPT" MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --debug-info --local-load=$MYSQL_TMP_DIR --character-sets-dir=$CHARSETSDIR $EXTRA_MYSQLBINLOG_OPT"
MYSQL_IMPORT="$MYSQL_IMPORT --debug-info -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT" MYSQL_IMPORT="$MYSQL_IMPORT --no-defaults --debug-info -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose" MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"
MYSQL="$MYSQL --no-defaults --debug-info --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD" MYSQL="$MYSQL --no-defaults --debug-info --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"
export MYSQL MYSQL_CHECK MYSQL_DUMP MYSQL_DUMP_SLAVE MYSQL_SHOW MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES MYSQL_IMPORT export MYSQL MYSQL_CHECK MYSQL_DUMP MYSQL_DUMP_SLAVE MYSQL_SHOW MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES MYSQL_IMPORT
......
mysql-test/t/disabled.def
View file @ 441b1137
...@@ -15,6 +15,9 @@ im_options : Bug#20294 2006-07-24 stewart Instance manager test ...@@ -15,6 +15,9 @@ im_options : Bug#20294 2006-07-24 stewart Instance manager test
im_daemon_life_cycle : Bug#20294 2007-05-14 alik Instance manager tests fail randomly im_daemon_life_cycle : Bug#20294 2007-05-14 alik Instance manager tests fail randomly
im_cmd_line : Bug#20294 2007-05-14 alik Instance manager tests fail randomly im_cmd_line : Bug#20294 2007-05-14 alik Instance manager tests fail randomly
im_life_cycle : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance. im_life_cycle : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance.
im_instance_conf : BUG#28743 Instance manager generates warnings in test suite
im_utils : BUG#28743 Instance manager generates warnings in test suite
concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
......
sql/ha_ndbcluster_binlog.cc
View file @ 441b1137
...@@ -1893,16 +1893,16 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb, ...@@ -1893,16 +1893,16 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
pthread_mutex_lock(&LOCK_open); pthread_mutex_lock(&LOCK_open);
if (ndbcluster_check_if_local_table(schema->db, schema->name)) if (ndbcluster_check_if_local_table(schema->db, schema->name))
{ {
DBUG_PRINT("info", ("NDB binlog: Skipping locally defined table '%s.%s'", DBUG_PRINT("info", ("NDB Binlog: Skipping locally defined table '%s.%s'",
schema->db, schema->name)); schema->db, schema->name));
sql_print_error("NDB binlog: Skipping locally defined table '%s.%s' from " sql_print_error("NDB Binlog: Skipping locally defined table '%s.%s' from "
"binlog schema event '%s' from node %d. ", "binlog schema event '%s' from node %d. ",
schema->db, schema->name, schema->query, schema->db, schema->name, schema->query,
schema->node_id); schema->node_id);
} }
else if (ndb_create_table_from_engine(thd, schema->db, schema->name)) else if (ndb_create_table_from_engine(thd, schema->db, schema->name))
{ {
sql_print_error("NDB binlog: Could not discover table '%s.%s' from " sql_print_error("NDB Binlog: Could not discover table '%s.%s' from "
"binlog schema event '%s' from node %d. " "binlog schema event '%s' from node %d. "
"my_errno: %d", "my_errno: %d",
schema->db, schema->name, schema->query, schema->db, schema->name, schema->query,
...@@ -1910,7 +1910,7 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb, ...@@ -1910,7 +1910,7 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
List_iterator_fast<MYSQL_ERROR> it(thd->warn_list); List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
MYSQL_ERROR *err; MYSQL_ERROR *err;
while ((err= it++)) while ((err= it++))
sql_print_warning("NDB binlog: (%d)%s", err->code, err->msg); sql_print_warning("NDB Binlog: (%d)%s", err->code, err->msg);
} }
pthread_mutex_unlock(&LOCK_open); pthread_mutex_unlock(&LOCK_open);
log_query= 1; log_query= 1;
...@@ -1931,7 +1931,7 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb, ...@@ -1931,7 +1931,7 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
else else
{ {
/* Database contained local tables, leave it */ /* Database contained local tables, leave it */
sql_print_error("NDB binlog: Skipping drop database '%s' since it contained local tables " sql_print_error("NDB Binlog: Skipping drop database '%s' since it contained local tables "
"binlog schema event '%s' from node %d. ", "binlog schema event '%s' from node %d. ",
schema->db, schema->query, schema->db, schema->query,
schema->node_id); schema->node_id);
...@@ -2179,23 +2179,23 @@ ndb_binlog_thread_handle_schema_event_post_epoch(THD *thd, ...@@ -2179,23 +2179,23 @@ ndb_binlog_thread_handle_schema_event_post_epoch(THD *thd,
pthread_mutex_lock(&LOCK_open); pthread_mutex_lock(&LOCK_open);
if (ndbcluster_check_if_local_table(schema->db, schema->name)) if (ndbcluster_check_if_local_table(schema->db, schema->name))
{ {
DBUG_PRINT("info", ("NDB binlog: Skipping locally defined table '%s.%s'", DBUG_PRINT("info", ("NDB Binlog: Skipping locally defined table '%s.%s'",
schema->db, schema->name)); schema->db, schema->name));
sql_print_error("NDB binlog: Skipping locally defined table '%s.%s' from " sql_print_error("NDB Binlog: Skipping locally defined table '%s.%s' from "
"binlog schema event '%s' from node %d. ", "binlog schema event '%s' from node %d. ",
schema->db, schema->name, schema->query, schema->db, schema->name, schema->query,
schema->node_id); schema->node_id);
} }
else if (ndb_create_table_from_engine(thd, schema->db, schema->name)) else if (ndb_create_table_from_engine(thd, schema->db, schema->name))
{ {
sql_print_error("NDB binlog: Could not discover table '%s.%s' from " sql_print_error("NDB Binlog: Could not discover table '%s.%s' from "
"binlog schema event '%s' from node %d. my_errno: %d", "binlog schema event '%s' from node %d. my_errno: %d",
schema->db, schema->name, schema->query, schema->db, schema->name, schema->query,
schema->node_id, my_errno); schema->node_id, my_errno);
List_iterator_fast<MYSQL_ERROR> it(thd->warn_list); List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
MYSQL_ERROR *err; MYSQL_ERROR *err;
while ((err= it++)) while ((err= it++))
sql_print_warning("NDB binlog: (%d)%s", err->code, err->msg); sql_print_warning("NDB Binlog: (%d)%s", err->code, err->msg);
} }
pthread_mutex_unlock(&LOCK_open); pthread_mutex_unlock(&LOCK_open);
} }
...@@ -4113,7 +4113,7 @@ restart: ...@@ -4113,7 +4113,7 @@ restart:
injector::transaction::binlog_pos start= trans.start_pos(); injector::transaction::binlog_pos start= trans.start_pos();
if (int r= trans.commit()) if (int r= trans.commit())
{ {
sql_print_error("NDB binlog: " sql_print_error("NDB Binlog: "
"Error during COMMIT of GCI. Error: %d", "Error during COMMIT of GCI. Error: %d",
r); r);
/* TODO: Further handling? */ /* TODO: Further handling? */
......
sql/slave.cc
View file @ 441b1137
...@@ -603,7 +603,7 @@ void slave_print_msg(enum loglevel level, RELAY_LOG_INFO const *rli, ...@@ -603,7 +603,7 @@ void slave_print_msg(enum loglevel level, RELAY_LOG_INFO const *rli,
if (pbuff[0] && (*(strend(pbuff)-1) == '.')) if (pbuff[0] && (*(strend(pbuff)-1) == '.'))
(*report_function)("Slave: %s Error_code: %d", pbuff, err_code); (*report_function)("Slave: %s Error_code: %d", pbuff, err_code);
else else
(*report_function)("Slave: %s, Error_code: %d", pbuff, err_code); (*report_function)("Slave: %s. Error_code: %d", pbuff, err_code);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
......
sql/sql_plugin.cc
View file @ 441b1137
...@@ -2879,9 +2879,9 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp, ...@@ -2879,9 +2879,9 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
if (!opt->update) if (!opt->update)
{ {
opt->update= update_func_str; opt->update= update_func_str;
if (!(opt->flags & PLUGIN_VAR_MEMALLOC)) if (!(opt->flags & PLUGIN_VAR_MEMALLOC | PLUGIN_VAR_READONLY))
{ {
opt->flags |= PLUGIN_VAR_READONLY; opt->flags|= PLUGIN_VAR_READONLY;
sql_print_warning("Server variable %s of plugin %s was forced " sql_print_warning("Server variable %s of plugin %s was forced "
"to be read-only: string variable without " "to be read-only: string variable without "
"update_func and PLUGIN_VAR_MEMALLOC flag", "update_func and PLUGIN_VAR_MEMALLOC flag",
......
sql/stacktrace.c
View file @ 441b1137
...@@ -206,9 +206,11 @@ terribly wrong...\n"); ...@@ -206,9 +206,11 @@ terribly wrong...\n");
fprintf(stderr, "Stack trace seems successful - bottom reached\n"); fprintf(stderr, "Stack trace seems successful - bottom reached\n");
end: end:
fprintf(stderr, "Please read http://dev.mysql.com/doc/mysql/en/using-stack-trace.html and follow instructions on how to resolve the stack trace. Resolved\n\ fprintf(stderr,
stack trace is much more helpful in diagnosing the problem, so please do \n\ "Please read http://dev.mysql.com/doc/refman/5.1/en/resolve-stack-dump.html\n"
resolve it\n"); "and follow instructions on how to resolve the stack trace.\n"
"Resolved stack trace is much more helpful in diagnosing the\n"
"problem, so please do resolve it\n");
} }
#endif /* TARGET_OS_LINUX */ #endif /* TARGET_OS_LINUX */
#endif /* HAVE_STACKTRACE */ #endif /* HAVE_STACKTRACE */
......
storage/blackhole/ha_blackhole.cc
View file @ 441b1137
...@@ -287,7 +287,7 @@ static void blackhole_free_key(st_blackhole_share *share) ...@@ -287,7 +287,7 @@ static void blackhole_free_key(st_blackhole_share *share)
my_free((uchar*) share, MYF(0)); my_free((uchar*) share, MYF(0));
} }
static uchar* blackhole_get_key(st_blackhole_share *share, uint *length, static uchar* blackhole_get_key(st_blackhole_share *share, size_t *length,
my_bool not_used __attribute__((unused))) my_bool not_used __attribute__((unused)))
{ {
*length= share->table_name_length; *length= share->table_name_length;
......
storage/example/ha_example.cc
View file @ 441b1137
...@@ -114,7 +114,7 @@ pthread_mutex_t example_mutex; ...@@ -114,7 +114,7 @@ pthread_mutex_t example_mutex;
Function we use in the creation of our hash to get key. Function we use in the creation of our hash to get key.
*/ */
static uchar* example_get_key(EXAMPLE_SHARE *share,uint *length, static uchar* example_get_key(EXAMPLE_SHARE *share, size_t *length,
my_bool not_used __attribute__((unused))) my_bool not_used __attribute__((unused)))
{ {
*length=share->table_name_length; *length=share->table_name_length;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7