mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Added casts to avoid compiler warnings and fixed a wrong type.
--- Added casts and fixed wrong type. --- Added casts and fixed wrong type. --- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel --- 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 --- Disabled compiler warnings mainly for Win 64. --- Added casts to remove compiler warnings on windows Give warnings also for safe_mutex errors found by test system Added some warnings from different machines in pushbuild --- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into mysql.com:/home/my/mysql-5.1 --- Added escapes for double quotes and parenthesis. --- Archive db fix plus added non-critical warnings in ignore list. --- Fixed previously added patch and added new ignored warning.
This commit is contained in:
parent
b035219762
commit
2c8f4f9791
@@ -1893,16 +1893,16 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
|
||||
pthread_mutex_lock(&LOCK_open);
|
||||
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));
|
||||
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. ",
|
||||
schema->db, schema->name, schema->query,
|
||||
schema->node_id);
|
||||
}
|
||||
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",
|
||||
schema->db, schema->name, schema->query,
|
||||
@@ -1910,7 +1910,7 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
|
||||
List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
|
||||
MYSQL_ERROR *err;
|
||||
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);
|
||||
log_query= 1;
|
||||
@@ -1931,7 +1931,7 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
|
||||
else
|
||||
{
|
||||
/* 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. ",
|
||||
schema->db, schema->query,
|
||||
schema->node_id);
|
||||
@@ -2179,23 +2179,23 @@ ndb_binlog_thread_handle_schema_event_post_epoch(THD *thd,
|
||||
pthread_mutex_lock(&LOCK_open);
|
||||
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));
|
||||
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. ",
|
||||
schema->db, schema->name, schema->query,
|
||||
schema->node_id);
|
||||
}
|
||||
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",
|
||||
schema->db, schema->name, schema->query,
|
||||
schema->node_id, my_errno);
|
||||
List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
|
||||
MYSQL_ERROR *err;
|
||||
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);
|
||||
}
|
||||
@@ -4113,7 +4113,7 @@ restart:
|
||||
injector::transaction::binlog_pos start= trans.start_pos();
|
||||
if (int r= trans.commit())
|
||||
{
|
||||
sql_print_error("NDB binlog: "
|
||||
sql_print_error("NDB Binlog: "
|
||||
"Error during COMMIT of GCI. Error: %d",
|
||||
r);
|
||||
/* TODO: Further handling? */
|
||||
|
||||
Reference in New Issue
Block a user