Skip to content

M
MariaDB
Commit 175507b7 authored by unknown's avatar unknown
Browse files
Options

Fixes for compiler warnings. 


include/my_dbug.h:
  Added macro for fixing compiler warnings.
sql/field.cc:
  Fixed compiler warnings.
sql/ha_ndbcluster.cc:
  Fixed compiler warnings.
sql/ha_ndbcluster_binlog.cc:
  Fixed compiler warnings.
  Changed some tabs into spaces.
sql/rpl_injector.h:
  Fixed compiler warnings.
sql/sql_binlog.cc:
  Fixed compiler warnings.
sql/sql_repl.cc:
  Fixed compiler warnings.
sql/sql_table.cc:
  Fixed compiler warnings.
storage/myisammrg/ha_myisammrg.cc:
  Fixed compiler warnings.
strings/ctype-ucs2.c:
  Fixed compiler warnings.
strings/ctype-utf8.c:
  Fixed compiler warnings.
support-files/compiler_warnings.supp:
  Added suppressed warnings.
parent 1eb71c68
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 81 deletions
include/my_dbug.h
View file @ 175507b7
...@@ -80,6 +80,7 @@ extern FILE *_db_fp_(void); ...@@ -80,6 +80,7 @@ extern FILE *_db_fp_(void);
#define DBUG_ASSERT(A) assert(A) #define DBUG_ASSERT(A) assert(A)
#define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len)) #define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len))
#define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len)) #define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len))
#define IF_DBUG(A) A
#else /* No debugger */ #else /* No debugger */
#define DBUG_ENTER(a1) #define DBUG_ENTER(a1)
...@@ -106,6 +107,7 @@ extern FILE *_db_fp_(void); ...@@ -106,6 +107,7 @@ extern FILE *_db_fp_(void);
#define DBUG_UNLOCK_FILE #define DBUG_UNLOCK_FILE
#define DBUG_EXPLAIN(buf,len) #define DBUG_EXPLAIN(buf,len)
#define DBUG_EXPLAIN_INITIAL(buf,len) #define DBUG_EXPLAIN_INITIAL(buf,len)
#define IF_DBUG(A)
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
......
sql/field.cc
View file @ 175507b7
...@@ -6297,10 +6297,12 @@ int Field_string::cmp(const char *a_ptr, const char *b_ptr) ...@@ -6297,10 +6297,12 @@ int Field_string::cmp(const char *a_ptr, const char *b_ptr)
void Field_string::sort_string(char *to,uint length) void Field_string::sort_string(char *to,uint length)
{ {
#ifndef DBUG_OFF
uint tmp= my_strnxfrm(field_charset, uint tmp= my_strnxfrm(field_charset,
(uchar*) to, length, (uchar*) to, length,
(uchar*) ptr, field_length); (uchar*) ptr, field_length);
DBUG_ASSERT(tmp == length); DBUG_ASSERT(tmp == length);
#endif
} }
......
sql/ha_ndbcluster.cc
View file @ 175507b7
...@@ -2764,10 +2764,12 @@ int ha_ndbcluster::write_row(byte *record) ...@@ -2764,10 +2764,12 @@ int ha_ndbcluster::write_row(byte *record)
{ {
Ndb *ndb= get_ndb(); Ndb *ndb= get_ndb();
Uint64 next_val= (Uint64) table->next_number_field->val_int() + 1; Uint64 next_val= (Uint64) table->next_number_field->val_int() + 1;
#ifndef DBUG_OFF
char buff[22]; char buff[22];
DBUG_PRINT("info", DBUG_PRINT("info",
("Trying to set next auto increment value to %s", ("Trying to set next auto increment value to %s",
llstr(next_val, buff))); llstr(next_val, buff)));
#endif
Ndb_tuple_id_range_guard g(m_share); Ndb_tuple_id_range_guard g(m_share);
if (ndb->setAutoIncrementValue(m_table, g.range, next_val, TRUE) if (ndb->setAutoIncrementValue(m_table, g.range, next_val, TRUE)
== -1) == -1)
...@@ -3999,7 +4001,7 @@ int ha_ndbcluster::end_bulk_insert() ...@@ -3999,7 +4001,7 @@ int ha_ndbcluster::end_bulk_insert()
} }
else else
{ {
int res= trans->restart(); IF_DBUG(int res=) trans->restart();
DBUG_ASSERT(res == 0); DBUG_ASSERT(res == 0);
} }
} }
...@@ -4717,7 +4719,7 @@ static int create_ndb_column(NDBCOL &col, ...@@ -4717,7 +4719,7 @@ static int create_ndb_column(NDBCOL &col,
// Set autoincrement // Set autoincrement
if (field->flags & AUTO_INCREMENT_FLAG) if (field->flags & AUTO_INCREMENT_FLAG)
{ {
char buff[22]; IF_DBUG(char buff[22]);
col.setAutoIncrement(TRUE); col.setAutoIncrement(TRUE);
ulonglong value= info->auto_increment_value ? ulonglong value= info->auto_increment_value ?
info->auto_increment_value : (ulonglong) 1; info->auto_increment_value : (ulonglong) 1;
...@@ -5388,7 +5390,7 @@ int ha_ndbcluster::rename_table(const char *from, const char *to) ...@@ -5388,7 +5390,7 @@ int ha_ndbcluster::rename_table(const char *from, const char *to)
{ {
DBUG_PRINT("NDB_SHARE", ("%s temporary use_count: %u", DBUG_PRINT("NDB_SHARE", ("%s temporary use_count: %u",
share->key, share->use_count)); share->key, share->use_count));
int r= rename_share(share, to); IF_DBUG(int r=) rename_share(share, to);
DBUG_ASSERT(r == 0); DBUG_ASSERT(r == 0);
} }
#endif #endif
...@@ -5409,7 +5411,7 @@ int ha_ndbcluster::rename_table(const char *from, const char *to) ...@@ -5409,7 +5411,7 @@ int ha_ndbcluster::rename_table(const char *from, const char *to)
#ifdef HAVE_NDB_BINLOG #ifdef HAVE_NDB_BINLOG
if (share) if (share)
{ {
int r= rename_share(share, from); IF_DBUG(int r=) rename_share(share, from);
DBUG_ASSERT(r == 0); DBUG_ASSERT(r == 0);
/* ndb_share reference temporary free */ /* ndb_share reference temporary free */
DBUG_PRINT("NDB_SHARE", ("%s temporary free use_count: %u", DBUG_PRINT("NDB_SHARE", ("%s temporary free use_count: %u",
...@@ -7268,7 +7270,7 @@ uint ndb_get_commitcount(THD *thd, char *dbname, char *tabname, ...@@ -7268,7 +7270,7 @@ uint ndb_get_commitcount(THD *thd, char *dbname, char *tabname,
if (share->commit_count != 0) if (share->commit_count != 0)
{ {
*commit_count= share->commit_count; *commit_count= share->commit_count;
char buff[22]; IF_DBUG(char buff[22]);
DBUG_PRINT("info", ("Getting commit_count: %s from share", DBUG_PRINT("info", ("Getting commit_count: %s from share",
llstr(share->commit_count, buff))); llstr(share->commit_count, buff)));
pthread_mutex_unlock(&share->mutex); pthread_mutex_unlock(&share->mutex);
...@@ -7304,7 +7306,7 @@ uint ndb_get_commitcount(THD *thd, char *dbname, char *tabname, ...@@ -7304,7 +7306,7 @@ uint ndb_get_commitcount(THD *thd, char *dbname, char *tabname,
pthread_mutex_lock(&share->mutex); pthread_mutex_lock(&share->mutex);
if (share->commit_count_lock == lock) if (share->commit_count_lock == lock)
{ {
char buff[22]; IF_DBUG(char buff[22]);
DBUG_PRINT("info", ("Setting commit_count to %s", DBUG_PRINT("info", ("Setting commit_count to %s",
llstr(stat.commit_count, buff))); llstr(stat.commit_count, buff)));
share->commit_count= stat.commit_count; share->commit_count= stat.commit_count;
...@@ -7363,7 +7365,8 @@ ndbcluster_cache_retrieval_allowed(THD *thd, ...@@ -7363,7 +7365,8 @@ ndbcluster_cache_retrieval_allowed(THD *thd,
bool is_autocommit= !(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)); bool is_autocommit= !(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN));
char *dbname= full_name; char *dbname= full_name;
char *tabname= dbname+strlen(dbname)+1; char *tabname= dbname+strlen(dbname)+1;
char buff[22], buff2[22]; IF_DBUG(char buff[22]);
IF_DBUG(char buff2[22]);
DBUG_ENTER("ndbcluster_cache_retrieval_allowed"); DBUG_ENTER("ndbcluster_cache_retrieval_allowed");
DBUG_PRINT("enter", ("dbname: %s, tabname: %s, is_autocommit: %d", DBUG_PRINT("enter", ("dbname: %s, tabname: %s, is_autocommit: %d",
dbname, tabname, is_autocommit)); dbname, tabname, is_autocommit));
...@@ -7430,7 +7433,7 @@ ha_ndbcluster::register_query_cache_table(THD *thd, ...@@ -7430,7 +7433,7 @@ ha_ndbcluster::register_query_cache_table(THD *thd,
ulonglong *engine_data) ulonglong *engine_data)
{ {
Uint64 commit_count; Uint64 commit_count;
char buff[22]; IF_DBUG(char buff[22]);
bool is_autocommit= !(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)); bool is_autocommit= !(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN));
DBUG_ENTER("ha_ndbcluster::register_query_cache_table"); DBUG_ENTER("ha_ndbcluster::register_query_cache_table");
DBUG_PRINT("enter",("dbname: %s, tabname: %s, is_autocommit: %d", DBUG_PRINT("enter",("dbname: %s, tabname: %s, is_autocommit: %d",
...@@ -7875,7 +7878,10 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb, const ...@@ -7875,7 +7878,10 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb, const
int retries= 10; int retries= 10;
int reterr= 0; int reterr= 0;
int retry_sleep= 30 * 1000; /* 30 milliseconds */ int retry_sleep= 30 * 1000; /* 30 milliseconds */
char buff[22], buff2[22], buff3[22], buff4[22]; IF_DBUG(char buff[22]);
IF_DBUG(char buff2[22]);
IF_DBUG(char buff3[22]);
IF_DBUG(char buff4[22]);
DBUG_ENTER("ndb_get_table_statistics"); DBUG_ENTER("ndb_get_table_statistics");
DBUG_PRINT("enter", ("table: %s", ndbtab->getName())); DBUG_PRINT("enter", ("table: %s", ndbtab->getName()));
...@@ -8693,7 +8699,8 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) ...@@ -8693,7 +8699,8 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
ndb_get_table_statistics(NULL, FALSE, ndb, ndb_get_table_statistics(NULL, FALSE, ndb,
ndbtab_g.get_table(), &stat) == 0) ndbtab_g.get_table(), &stat) == 0)
{ {
char buff[22], buff2[22]; IF_DBUG(char buff[22]);
IF_DBUG(char buff2[22]);
DBUG_PRINT("info", DBUG_PRINT("info",
("Table: %s commit_count: %s rows: %s", ("Table: %s commit_count: %s rows: %s",
share->key, share->key,
...@@ -9545,7 +9552,7 @@ void ndb_serialize_cond(const Item *item, void *arg) ...@@ -9545,7 +9552,7 @@ void ndb_serialize_cond(const Item *item, void *arg)
DBUG_PRINT("info", ("INT_ITEM")); DBUG_PRINT("info", ("INT_ITEM"));
if (context->expecting(Item::INT_ITEM)) if (context->expecting(Item::INT_ITEM))
{ {
Item_int *int_item= (Item_int *) item; IF_DBUG(Item_int *int_item= (Item_int *) item);
DBUG_PRINT("info", ("value %ld", (long) int_item->value)); DBUG_PRINT("info", ("value %ld", (long) int_item->value));
NDB_ITEM_QUALIFICATION q; NDB_ITEM_QUALIFICATION q;
q.value_type= Item::INT_ITEM; q.value_type= Item::INT_ITEM;
...@@ -9572,7 +9579,7 @@ void ndb_serialize_cond(const Item *item, void *arg) ...@@ -9572,7 +9579,7 @@ void ndb_serialize_cond(const Item *item, void *arg)
DBUG_PRINT("info", ("REAL_ITEM")); DBUG_PRINT("info", ("REAL_ITEM"));
if (context->expecting(Item::REAL_ITEM)) if (context->expecting(Item::REAL_ITEM))
{ {
Item_float *float_item= (Item_float *) item; IF_DBUG(Item_float *float_item= (Item_float *) item);
DBUG_PRINT("info", ("value %f", float_item->value)); DBUG_PRINT("info", ("value %f", float_item->value));
NDB_ITEM_QUALIFICATION q; NDB_ITEM_QUALIFICATION q;
q.value_type= Item::REAL_ITEM; q.value_type= Item::REAL_ITEM;
...@@ -9620,7 +9627,7 @@ void ndb_serialize_cond(const Item *item, void *arg) ...@@ -9620,7 +9627,7 @@ void ndb_serialize_cond(const Item *item, void *arg)
DBUG_PRINT("info", ("DECIMAL_ITEM")); DBUG_PRINT("info", ("DECIMAL_ITEM"));
if (context->expecting(Item::DECIMAL_ITEM)) if (context->expecting(Item::DECIMAL_ITEM))
{ {
Item_decimal *decimal_item= (Item_decimal *) item; IF_DBUG(Item_decimal *decimal_item= (Item_decimal *) item);
DBUG_PRINT("info", ("value %f", decimal_item->val_real())); DBUG_PRINT("info", ("value %f", decimal_item->val_real()));
NDB_ITEM_QUALIFICATION q; NDB_ITEM_QUALIFICATION q;
q.value_type= Item::DECIMAL_ITEM; q.value_type= Item::DECIMAL_ITEM;
......
sql/ha_ndbcluster_binlog.cc
View file @ 175507b7
...@@ -1829,15 +1829,15 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb, ...@@ -1829,15 +1829,15 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
// fall through // fall through
case SOT_CREATE_TABLE: case SOT_CREATE_TABLE:
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 "
...@@ -1854,27 +1854,27 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb, ...@@ -1854,27 +1854,27 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
log_query= 1; log_query= 1;
break; break;
case SOT_DROP_DB: case SOT_DROP_DB:
/* Drop the database locally if it only contains ndb tables */ /* Drop the database locally if it only contains ndb tables */
if (! ndbcluster_check_if_local_tables_in_db(thd, schema->db)) if (! ndbcluster_check_if_local_tables_in_db(thd, schema->db))
{ {
run_query(thd, schema->query, run_query(thd, schema->query,
schema->query + schema->query_length, schema->query + schema->query_length,
TRUE, /* print error */ TRUE, /* print error */
TRUE); /* don't binlog the query */ TRUE); /* don't binlog the query */
/* binlog dropping database after any table operations */ /* binlog dropping database after any table operations */
post_epoch_log_list->push_back(schema, mem_root); post_epoch_log_list->push_back(schema, mem_root);
/* acknowledge this query _after_ epoch completion */ /* acknowledge this query _after_ epoch completion */
post_epoch_unlock= 1; post_epoch_unlock= 1;
} }
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);
log_query= 1; log_query= 1;
} }
break; break;
case SOT_CREATE_DB: case SOT_CREATE_DB:
/* fall through */ /* fall through */
...@@ -2121,18 +2121,18 @@ ndb_binlog_thread_handle_schema_event_post_epoch(THD *thd, ...@@ -2121,18 +2121,18 @@ ndb_binlog_thread_handle_schema_event_post_epoch(THD *thd,
share= 0; share= 0;
} }
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);
...@@ -2260,7 +2260,7 @@ int ndb_add_ndb_binlog_index(THD *thd, void *_row) ...@@ -2260,7 +2260,7 @@ int ndb_add_ndb_binlog_index(THD *thd, void *_row)
{ {
TABLE_LIST *p_binlog_tables= &binlog_tables; TABLE_LIST *p_binlog_tables= &binlog_tables;
close_tables_for_reopen(thd, &p_binlog_tables); close_tables_for_reopen(thd, &p_binlog_tables);
ndb_binlog_index= 0; ndb_binlog_index= 0;
continue; continue;
} }
sql_print_error("NDB Binlog: Unable to lock table ndb_binlog_index"); sql_print_error("NDB Binlog: Unable to lock table ndb_binlog_index");
...@@ -3225,15 +3225,17 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp, ...@@ -3225,15 +3225,17 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp,
if (share->flags & NSF_BLOB_FLAG) if (share->flags & NSF_BLOB_FLAG)
{ {
my_ptrdiff_t ptrdiff= 0; my_ptrdiff_t ptrdiff= 0;
int ret= get_ndb_blobs_value(table, share->ndb_value[0], IF_DBUG(int ret =) get_ndb_blobs_value(table, share->ndb_value[0],
blobs_buffer[0], blobs_buffer_size[0], blobs_buffer[0],
ptrdiff); blobs_buffer_size[0],
ptrdiff);
DBUG_ASSERT(ret == 0); DBUG_ASSERT(ret == 0);
} }
ndb_unpack_record(table, share->ndb_value[0], &b, table->record[0]); ndb_unpack_record(table, share->ndb_value[0], &b, table->record[0]);
int ret= trans.write_row(::server_id, IF_DBUG(int ret=) trans.write_row(::server_id,
injector::transaction::table(table, TRUE), injector::transaction::table(table,
&b, n_fields, table->record[0]); TRUE),
&b, n_fields, table->record[0]);
DBUG_ASSERT(ret == 0); DBUG_ASSERT(ret == 0);
} }
break; break;
...@@ -3251,27 +3253,29 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp, ...@@ -3251,27 +3253,29 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp,
n= 0; /* n= 0; /*
use the primary key only as it save time and space and use the primary key only as it save time and space and
it is the only thing needed to log the delete it is the only thing needed to log the delete
*/ */
else else
n= 1; /* n= 1; /*
we use the before values since we don't have a primary key we use the before values since we don't have a primary key
since the mysql server does not handle the hidden primary since the mysql server does not handle the hidden primary
key key
*/ */
if (share->flags & NSF_BLOB_FLAG) if (share->flags & NSF_BLOB_FLAG)
{ {
my_ptrdiff_t ptrdiff= table->record[n] - table->record[0]; my_ptrdiff_t ptrdiff= table->record[n] - table->record[0];
int ret= get_ndb_blobs_value(table, share->ndb_value[n], IF_DBUG(int ret =) get_ndb_blobs_value(table, share->ndb_value[n],
blobs_buffer[n], blobs_buffer_size[n], blobs_buffer[n],
ptrdiff); blobs_buffer_size[n],
ptrdiff);
DBUG_ASSERT(ret == 0); DBUG_ASSERT(ret == 0);
} }
ndb_unpack_record(table, share->ndb_value[n], &b, table->record[n]); ndb_unpack_record(table, share->ndb_value[n], &b, table->record[n]);
DBUG_EXECUTE("info", print_records(table, table->record[n]);); DBUG_EXECUTE("info", print_records(table, table->record[n]););
int ret= trans.delete_row(::server_id, IF_DBUG(int ret =) trans.delete_row(::server_id,
injector::transaction::table(table, TRUE), injector::transaction::table(table,
&b, n_fields, table->record[n]); TRUE),
&b, n_fields, table->record[n]);
DBUG_ASSERT(ret == 0); DBUG_ASSERT(ret == 0);
} }
break; break;
...@@ -3283,9 +3287,10 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp, ...@@ -3283,9 +3287,10 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp,
if (share->flags & NSF_BLOB_FLAG) if (share->flags & NSF_BLOB_FLAG)
{ {
my_ptrdiff_t ptrdiff= 0; my_ptrdiff_t ptrdiff= 0;
int ret= get_ndb_blobs_value(table, share->ndb_value[0], IF_DBUG(int ret =) get_ndb_blobs_value(table, share->ndb_value[0],
blobs_buffer[0], blobs_buffer_size[0], blobs_buffer[0],
ptrdiff); blobs_buffer_size[0],
ptrdiff);
DBUG_ASSERT(ret == 0); DBUG_ASSERT(ret == 0);
} }
ndb_unpack_record(table, share->ndb_value[0], ndb_unpack_record(table, share->ndb_value[0],
...@@ -3296,7 +3301,7 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp, ...@@ -3296,7 +3301,7 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp,
/* /*
since table has a primary key, we can do a write since table has a primary key, we can do a write
using only after values using only after values
*/ */
trans.write_row(::server_id, injector::transaction::table(table, TRUE), trans.write_row(::server_id, injector::transaction::table(table, TRUE),
&b, n_fields, table->record[0]);// after values &b, n_fields, table->record[0]);// after values
} }
...@@ -3305,22 +3310,24 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp, ...@@ -3305,22 +3310,24 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp,
/* /*
mysql server cannot handle the ndb hidden key and mysql server cannot handle the ndb hidden key and
therefore needs the before image as well therefore needs the before image as well
*/ */
if (share->flags & NSF_BLOB_FLAG) if (share->flags & NSF_BLOB_FLAG)
{ {
my_ptrdiff_t ptrdiff= table->record[1] - table->record[0]; my_ptrdiff_t ptrdiff= table->record[1] - table->record[0];
int ret= get_ndb_blobs_value(table, share->ndb_value[1], IF_DBUG(int ret =) get_ndb_blobs_value(table, share->ndb_value[1],
blobs_buffer[1], blobs_buffer_size[1], blobs_buffer[1],
ptrdiff); blobs_buffer_size[1],
ptrdiff);
DBUG_ASSERT(ret == 0); DBUG_ASSERT(ret == 0);
} }
ndb_unpack_record(table, share->ndb_value[1], &b, table->record[1]); ndb_unpack_record(table, share->ndb_value[1], &b, table->record[1]);
DBUG_EXECUTE("info", print_records(table, table->record[1]);); DBUG_EXECUTE("info", print_records(table, table->record[1]););
int ret= trans.update_row(::server_id, IF_DBUG(int ret =) trans.update_row(::server_id,
injector::transaction::table(table, TRUE), injector::transaction::table(table,
&b, n_fields, TRUE),
table->record[1], // before values &b, n_fields,
table->record[0]);// after values table->record[1], // before values
table->record[0]);// after values
DBUG_ASSERT(ret == 0); DBUG_ASSERT(ret == 0);
} }
} }
...@@ -3850,7 +3857,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) ...@@ -3850,7 +3857,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
continue; continue;
} }
TABLE *table= share->table; TABLE *table= share->table;
const LEX_STRING &name= table->s->table_name; IF_DBUG(const LEX_STRING &name= table->s->table_name);
if ((event_types & (NdbDictionary::Event::TE_INSERT | if ((event_types & (NdbDictionary::Event::TE_INSERT |
NdbDictionary::Event::TE_UPDATE | NdbDictionary::Event::TE_UPDATE |
NdbDictionary::Event::TE_DELETE)) == 0) NdbDictionary::Event::TE_DELETE)) == 0)
...@@ -3867,7 +3874,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) ...@@ -3867,7 +3874,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
} }
DBUG_PRINT("info", ("use_table: %.*s", name.length, name.str)); DBUG_PRINT("info", ("use_table: %.*s", name.length, name.str));
injector::transaction::table tbl(table, TRUE); injector::transaction::table tbl(table, TRUE);
int ret= trans.use_table(::server_id, tbl); IF_DBUG(int ret=) trans.use_table(::server_id, tbl);
DBUG_ASSERT(ret == 0); DBUG_ASSERT(ret == 0);
} }
} }
...@@ -3877,10 +3884,10 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) ...@@ -3877,10 +3884,10 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
{ {
TABLE *table= ndb_apply_status_share->table; TABLE *table= ndb_apply_status_share->table;
const LEX_STRING& name=table->s->table_name; IF_DBUG(const LEX_STRING& name= table->s->table_name);
DBUG_PRINT("info", ("use_table: %.*s", name.length, name.str)); DBUG_PRINT("info", ("use_table: %.*s", name.length, name.str));
injector::transaction::table tbl(table, TRUE); injector::transaction::table tbl(table, TRUE);
int ret= trans.use_table(::server_id, tbl); IF_DBUG(int ret=) trans.use_table(::server_id, tbl);
DBUG_ASSERT(ret == 0); DBUG_ASSERT(ret == 0);
// Set all fields non-null. // Set all fields non-null.
...@@ -3945,7 +3952,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) ...@@ -3945,7 +3952,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
else else
{ {
// set injector_ndb database/schema from table internal name // set injector_ndb database/schema from table internal name
int ret= IF_DBUG(int ret=)
i_ndb->setDatabaseAndSchemaName(pOp->getEvent()->getTable()); i_ndb->setDatabaseAndSchemaName(pOp->getEvent()->getTable());
DBUG_ASSERT(ret == 0); DBUG_ASSERT(ret == 0);
ndb_binlog_thread_handle_non_data_event(thd, i_ndb, pOp, row); ndb_binlog_thread_handle_non_data_event(thd, i_ndb, pOp, row);
...@@ -3979,7 +3986,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) ...@@ -3979,7 +3986,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
/* /*
note! pOp is not referring to an event in the next epoch note! pOp is not referring to an event in the next epoch
or is == 0 or is == 0
*/ */
#ifdef RUN_NDB_BINLOG_TIMER #ifdef RUN_NDB_BINLOG_TIMER
write_timer.stop(); write_timer.stop();
#endif #endif
......
sql/rpl_injector.h
View file @ 175507b7
...@@ -284,12 +284,14 @@ class injector ...@@ -284,12 +284,14 @@ class injector
*/ */
int check_state(enum_state const target_state) int check_state(enum_state const target_state)
{ {
#ifndef DBUG_OFF
static char const *state_name[] = { static char const *state_name[] = {
"START_STATE", "TABLE_STATE", "ROW_STATE", "STATE_COUNT" "START_STATE", "TABLE_STATE", "ROW_STATE", "STATE_COUNT"
}; };
DBUG_ASSERT(0 <= target_state && target_state <= STATE_COUNT); DBUG_ASSERT(0 <= target_state && target_state <= STATE_COUNT);
DBUG_PRINT("info", ("In state %s", state_name[m_state])); DBUG_PRINT("info", ("In state %s", state_name[m_state]));
#endif
if (m_state <= target_state && target_state <= m_state + 1 && if (m_state <= target_state && target_state <= m_state + 1 &&
m_state < STATE_COUNT) m_state < STATE_COUNT)
......
sql/sql_binlog.cc
View file @ 175507b7
...@@ -163,7 +163,7 @@ void mysql_client_binlog_statement(THD* thd) ...@@ -163,7 +163,7 @@ void mysql_client_binlog_statement(THD* thd)
(ulong) uint4korr(bufptr+EVENT_LEN_OFFSET))); (ulong) uint4korr(bufptr+EVENT_LEN_OFFSET)));
#endif #endif
ev->thd= thd; ev->thd= thd;
if (int err= ev->exec_event(thd->rli_fake)) if (IF_DBUG(int err= ) ev->exec_event(thd->rli_fake))
{ {
DBUG_PRINT("error", ("exec_event() returned: %d", err)); DBUG_PRINT("error", ("exec_event() returned: %d", err));
/* /*
......
sql/sql_repl.cc
View file @ 175507b7
...@@ -23,7 +23,9 @@ ...@@ -23,7 +23,9 @@
int max_binlog_dump_events = 0; // unlimited int max_binlog_dump_events = 0; // unlimited
my_bool opt_sporadic_binlog_dump_fail = 0; my_bool opt_sporadic_binlog_dump_fail = 0;
#ifndef DBUG_OFF
static int binlog_dump_count = 0; static int binlog_dump_count = 0;
#endif
/* /*
fake_rotate_event() builds a fake (=which does not exist physically in any fake_rotate_event() builds a fake (=which does not exist physically in any
......
sql/sql_table.cc
View file @ 175507b7
...@@ -4818,7 +4818,7 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, ...@@ -4818,7 +4818,7 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table,
else else
unlock_dst_table= TRUE; unlock_dst_table= TRUE;
int result= store_create_info(thd, table, &query, create_info); IF_DBUG(int result=)store_create_info(thd, table, &query, create_info);
DBUG_ASSERT(result == 0); // store_create_info() always return 0 DBUG_ASSERT(result == 0); // store_create_info() always return 0
write_bin_log(thd, TRUE, query.ptr(), query.length()); write_bin_log(thd, TRUE, query.ptr(), query.length());
......
storage/myisammrg/ha_myisammrg.cc
View file @ 175507b7
...@@ -460,6 +460,8 @@ void ha_myisammrg::update_create_info(HA_CREATE_INFO *create_info) ...@@ -460,6 +460,8 @@ void ha_myisammrg::update_create_info(HA_CREATE_INFO *create_info)
{ {
TABLE_LIST *ptr; TABLE_LIST *ptr;
LEX_STRING db, name; LEX_STRING db, name;
db.length= 0;
db.str= 0;
if (!(ptr = (TABLE_LIST *) thd->calloc(sizeof(TABLE_LIST)))) if (!(ptr = (TABLE_LIST *) thd->calloc(sizeof(TABLE_LIST))))
goto err; goto err;
...@@ -570,6 +572,8 @@ void ha_myisammrg::append_create_info(String *packet) ...@@ -570,6 +572,8 @@ void ha_myisammrg::append_create_info(String *packet)
open_table++) open_table++)
{ {
LEX_STRING db, name; LEX_STRING db, name;
db.length= 0;
db.str= 0;
split_file_name(open_table->table->filename, &db, &name); split_file_name(open_table->table->filename, &db, &name);
if (open_table != first) if (open_table != first)
packet->append(','); packet->append(',');
......
strings/ctype-ucs2.c
View file @ 175507b7
...@@ -322,6 +322,7 @@ static int my_strncasecmp_ucs2(CHARSET_INFO *cs, ...@@ -322,6 +322,7 @@ static int my_strncasecmp_ucs2(CHARSET_INFO *cs,
const char *te=t+len; const char *te=t+len;
MY_UNICASE_INFO **uni_plane= cs->caseinfo; MY_UNICASE_INFO **uni_plane= cs->caseinfo;
LINT_INIT(s_wc); LINT_INIT(s_wc);
LINT_INIT(t_wc);
while ( s < se && t < te ) while ( s < se && t < te )
{ {
...@@ -1385,6 +1386,7 @@ int my_strnncoll_ucs2_bin(CHARSET_INFO *cs, ...@@ -1385,6 +1386,7 @@ int my_strnncoll_ucs2_bin(CHARSET_INFO *cs,
const uchar *se=s+slen; const uchar *se=s+slen;
const uchar *te=t+tlen; const uchar *te=t+tlen;
LINT_INIT(s_wc); LINT_INIT(s_wc);
LINT_INIT(t_wc);
while ( s < se && t < te ) while ( s < se && t < te )
{ {
......
strings/ctype-utf8.c
View file @ 175507b7
...@@ -2313,6 +2313,7 @@ static int my_strnncoll_utf8(CHARSET_INFO *cs, ...@@ -2313,6 +2313,7 @@ static int my_strnncoll_utf8(CHARSET_INFO *cs,
const uchar *te=t+tlen; const uchar *te=t+tlen;
MY_UNICASE_INFO **uni_plane= cs->caseinfo; MY_UNICASE_INFO **uni_plane= cs->caseinfo;
LINT_INIT(s_wc); LINT_INIT(s_wc);
LINT_INIT(t_wc);
while ( s < se && t < te ) while ( s < se && t < te )
{ {
...@@ -2383,6 +2384,7 @@ static int my_strnncollsp_utf8(CHARSET_INFO *cs, ...@@ -2383,6 +2384,7 @@ static int my_strnncollsp_utf8(CHARSET_INFO *cs,
const uchar *se= s+slen, *te= t+tlen; const uchar *se= s+slen, *te= t+tlen;
MY_UNICASE_INFO **uni_plane= cs->caseinfo; MY_UNICASE_INFO **uni_plane= cs->caseinfo;
LINT_INIT(s_wc); LINT_INIT(s_wc);
LINT_INIT(t_wc);
#ifndef VARCHAR_WITH_DIFF_ENDSPACE_ARE_DIFFERENT_FOR_UNIQUE #ifndef VARCHAR_WITH_DIFF_ENDSPACE_ARE_DIFFERENT_FOR_UNIQUE
diff_if_only_endspace_difference= 0; diff_if_only_endspace_difference= 0;
......
support-files/compiler_warnings.supp
View file @ 175507b7
...@@ -33,17 +33,23 @@ db_vrfy.c : .*comparison is always false due to limited range of data type.* ...@@ -33,17 +33,23 @@ db_vrfy.c : .*comparison is always false due to limited range of data type.*
# Ignore all conversion warnings on windows 64 # Ignore all conversion warnings on windows 64
# (Is safe as we are not yet supporting strings >= 2G) # (Is safe as we are not yet supporting strings >= 2G)
# #
.* : conversion from 'size_t' to .*int'.* .* : conversion from '.*size_t' to .*int'.*
.* : conversion from '__int64' to .*int'.* .* : conversion from '__int64' to .*int'.*
.* : conversion from '__int64' to uint8'.*
.* : conversion from '__int64' to uint32'.*
.* : conversion from '.*size_t' to 'TaoCrypt::word32'.*
.* : conversion from '.*size_t' to 'u.*long'.*
# #
# The following should be fixed by the ndb team # The following should be fixed by the ndb team
# #
.*/ndb/.* : .*used uninitialized in this function.* .*/ndb/.* : .*used uninitialized in this function.*
.*/ndb/.* : .*unused variable.*
.*/ndb/.* : .*defined but not used.*
# #
# Unexplanable (?) stuff # Unexplanable (?) stuff
# #
listener.cc : .*conversion from 'SOCKET' to 'int'.* listener.cc : .*conversion from 'SOCKET' to 'int'.*
net_serv.c : .*conversion from 'SOCKET' to 'int'.* net_serv.cc : .*conversion from 'SOCKET' to 'int'.*
mi_packrec.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 567 mi_packrec.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 567
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