3414 jonas oreland 2011-07-01 [merge]
ndb merge 71 to 55
added:
mysql-test/suite/ndb/bug12712109.ini
modified:
mysql-test/suite/ndb/r/ndb_config.result
mysql-test/suite/ndb/t/ndb_config.test
sql/ha_ndb_index_stat.cc
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.h
sql/ha_ndbcluster_binlog.cc
storage/ndb/src/mgmsrv/ConfigInfo.cpp
storage/ndb/src/ndbapi/NdbQueryOperation.cpp
3413 jonas oreland 2011-07-01
ndb add valgrind suppression for packfrm
modified:
mysql-test/valgrind.supp
3412 jonas oreland 2011-07-01
ndb - 55 compiler warnings
modified:
sql/ndb_global_schema_lock.cc
sql/ndb_local_connection.cc
3411 jonas oreland 2011-07-01
ndb - add new compiler suppressions for mainline 5.5
modified:
support-files/compiler_warnings.supp
3410 jonas oreland 2011-07-01 [merge]
ndb - merge 70-spj to 55
modified:
sql/abstract_query_plan.cc
=== added file 'mysql-test/suite/ndb/bug12712109.ini'
--- a/mysql-test/suite/ndb/bug12712109.ini 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/bug12712109.ini 2011-07-01 09:16:46 +0000
@@ -0,0 +1,8 @@
+[TCP DEFAULT]
+OverloadLimit=10M
+
+[ndb_mgmd]
+Hostname=localhost
+[ndbd]
+[ndbd]
+[mysqld]
=== modified file 'mysql-test/suite/ndb/r/ndb_config.result'
--- a/mysql-test/suite/ndb/r/ndb_config.result 2010-10-13 15:05:36 +0000
+++ b/mysql-test/suite/ndb/r/ndb_config.result 2011-07-01 09:20:02 +0000
@@ -37,3 +37,5 @@ tcp,3,4,55,3 tcp,3,5,55,3 tcp,3,6,55,3 t
== 18 == bug56185
0,0-65535
2,37-48 1,1-2
+== 19 == bug12712109
+10485760 10485760 10485760 10485760 10485760
=== modified file 'mysql-test/suite/ndb/t/ndb_config.test'
--- a/mysql-test/suite/ndb/t/ndb_config.test 2010-08-27 12:12:51 +0000
+++ b/mysql-test/suite/ndb/t/ndb_config.test 2011-07-01 09:16:46 +0000
@@ -61,3 +61,6 @@ echo == 18 == bug56185;
# Read bitmask value and enum from config.ini
--exec $NDB_CONFIG --config-file=$MYSQL_TEST_DIR/suite/ndb/bug56185.ini --query=Arbitration,LockExecuteThreadToCPU --type=ndbd
+echo == 19 == bug12712109;
+--exec $NDB_CONFIG --config-file=$MYSQL_TEST_DIR/suite/ndb/bug12712109.ini --query=OverloadLimit --connections 2>&1
+
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp 2011-05-10 09:48:14 +0000
+++ b/mysql-test/valgrind.supp 2011-07-01 10:29:45 +0000
@@ -876,3 +876,18 @@
fun:buf_buddy_free_low
fun:buf_buddy_free
}
+
+#
+# NDB packfrm vs deflate
+#
+{
+ NDB packfrm case 1
+ Memcheck:Cond
+ fun:deflate_slow
+ fun:deflate
+ fun:compress
+ fun:my_compress_alloc
+ fun:my_compress
+ fun:packfrm
+}
+
=== modified file 'sql/ha_ndb_index_stat.cc'
--- a/sql/ha_ndb_index_stat.cc 2011-06-28 17:02:13 +0000
+++ b/sql/ha_ndb_index_stat.cc 2011-07-01 10:35:04 +0000
@@ -486,7 +486,7 @@ ndb_index_stat_option_update(MYSQL_THD,
DBUG_PRINT("index_stat", ("str: %s", str));
Ndb_index_stat_opt& opt= ndb_index_stat_opt;
int ret= ndb_index_stat_str2opt(str, opt);
- assert(ret == 0);
+ assert(ret == 0); NDB_IGNORE_VALUE(ret);
*(const char**)var_ptr= ndb_index_stat_opt.option;
DBUG_VOID_RETURN;
}
@@ -701,7 +701,7 @@ ndb_index_stat_list_to_error(Ndb_index_s
Ndb_index_stat_glob &glob= ndb_index_stat_glob;
assert(st != 0);
- const int lt= st->lt;
+ const int lt= st->lt; NDB_IGNORE_VALUE(lt);
assert(1 <= lt && lt < Ndb_index_stat::LT_Count);
assert(lt != Ndb_index_stat::LT_Error);
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc 2011-06-30 12:19:14 +0000
+++ b/sql/ha_ndbcluster.cc 2011-07-01 10:35:04 +0000
@@ -640,8 +640,8 @@ static int check_slave_state(THD* thd)
const Uint32 server_id_col_num = 0;
const Uint32 epoch_col_num = 1;
- NdbRecAttr* server_id_ra;
- NdbRecAttr* epoch_ra;
+ NdbRecAttr* server_id_ra = 0;
+ NdbRecAttr* epoch_ra = 0;
if (unlikely((sop->readTuples(NdbOperation::LM_CommittedRead) != 0) ||
((server_id_ra = sop->getValue(server_id_col_num)) == NULL) ||
@@ -5955,7 +5955,7 @@ void ha_ndbcluster::unpack_record(uchar
my_bitmap_map *old_map=
dbug_tmp_use_all_columns(table, table->write_set);
int res = field_bit->store(value, true);
- assert(res == 0);
+ assert(res == 0); NDB_IGNORE_VALUE(res);
dbug_tmp_restore_column_map(table->write_set, old_map);
field->move_field_offset(-dst_offset);
}
@@ -9873,7 +9873,7 @@ int ha_ndbcluster::rename_table(const ch
share->key, share->use_count));
ndbcluster_prepare_rename_share(share, to);
int ret = ndbcluster_rename_share(thd, share);
- assert(ret == 0);
+ assert(ret == 0); NDB_IGNORE_VALUE(ret);
}
NdbDictionary::Table new_tab= *orig_tab;
@@ -9884,7 +9884,7 @@ int ha_ndbcluster::rename_table(const ch
if (share)
{
int ret = ndbcluster_undo_rename_share(thd, share);
- assert(ret == 0);
+ assert(ret == 0); NDB_IGNORE_VALUE(ret);
/* ndb_share reference temporary free */
DBUG_PRINT("NDB_SHARE", ("%s temporary free use_count: %u",
share->key, share->use_count));
=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h 2011-06-30 12:19:14 +0000
+++ b/sql/ha_ndbcluster.h 2011-07-01 10:35:04 +0000
@@ -27,6 +27,8 @@
#include <ndbapi/ndbapi_limits.h>
#include <kernel/ndb_limits.h>
+#define NDB_IGNORE_VALUE(x) (void)x
+
#define NDB_HIDDEN_PRIMARY_KEY_LENGTH 8
class Ndb; // Forward declaration
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc 2011-06-30 11:01:43 +0000
+++ b/sql/ha_ndbcluster_binlog.cc 2011-07-01 10:35:04 +0000
@@ -4973,7 +4973,7 @@ ndbcluster_create_event_ops(THD *thd, ND
{
// set injector_ndb database/schema from table internal name
int ret= ndb->setDatabaseAndSchemaName(ndbtab);
- assert(ret == 0);
+ assert(ret == 0); NDB_IGNORE_VALUE(ret);
op= ndb->createEventOperation(event_name);
// reset to catch errors
ndb->setDatabaseName("");
@@ -6283,7 +6283,7 @@ restart_cluster_failure:
};
int ret = inj->record_incident(thd, INCIDENT_LOST_EVENTS,
msg[incident_id]);
- assert(ret == 0);
+ assert(ret == 0); NDB_IGNORE_VALUE(ret);
do_incident = false; // Don't report incident again, unless we get started
break;
}
@@ -6726,7 +6726,7 @@ restart_cluster_failure:
table->s->fields));
injector::transaction::table tbl(table, true);
int ret = trans.use_table(::server_id, tbl);
- assert(ret == 0);
+ assert(ret == 0); NDB_IGNORE_VALUE(ret);
}
}
if (trans.good())
@@ -6740,7 +6740,7 @@ restart_cluster_failure:
#endif
injector::transaction::table tbl(apply_status_table, true);
int ret = trans.use_table(::server_id, tbl);
- assert(ret == 0);
+ assert(ret == 0); NDB_IGNORE_VALUE(ret);
/* add the gci to the record */
Field *field= apply_status_table->field[1];
=== modified file 'sql/ndb_global_schema_lock.cc'
--- a/sql/ndb_global_schema_lock.cc 2011-03-24 14:32:29 +0000
+++ b/sql/ndb_global_schema_lock.cc 2011-07-01 09:56:57 +0000
@@ -396,7 +396,7 @@ Thd_ndb::has_required_global_schema_lock
LEX_STRING* query= thd_query_string(m_thd);
sql_print_error("NDB: programming error, no lock taken while running "
"query '%*s' in function '%s'",
- query->length, query->str, func);
+ (int)query->length, query->str, func);
abort();
return false;
}
=== modified file 'sql/ndb_local_connection.cc'
--- a/sql/ndb_local_connection.cc 2011-02-09 11:26:45 +0000
+++ b/sql/ndb_local_connection.cc 2011-07-01 09:56:57 +0000
@@ -57,6 +57,7 @@ should_ignore_error(const uint* ignore_e
class Suppressor {
public:
+ virtual ~Suppressor() {}
virtual bool should_ignore_error(Ed_connection& con) const = 0;
};
@@ -275,6 +276,7 @@ Ndb_local_connection::delete_rows(const
class Create_sys_table_suppressor : public Suppressor
{
public:
+ virtual ~Create_sys_table_suppressor() {}
virtual bool should_ignore_error(Ed_connection& con) const
{
const uint last_errno = con.get_last_errno();
=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp 2011-06-15 10:55:06 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp 2011-07-01 09:16:46 +0000
@@ -2747,7 +2747,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
ConfigInfo::CI_INT,
"0",
"0",
- "0"
+ STR_VALUE(MAX_INT_RNIL)
},
/****************************************************************************
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp 2011-06-30 12:19:14 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp 2011-07-01 10:35:04 +0000
@@ -507,7 +507,7 @@ void NdbBulkAllocator::reset(){
// Overwrite with 0xff bytes to detect accidental use of released memory.
assert(m_buffer == NULL ||
memset(m_buffer, 0xff, m_maxObjs * m_objSize) != NULL);
- delete m_buffer;
+ delete [] m_buffer;
m_buffer = NULL;
m_nextObjNo = 0;
m_maxObjs = 0;
=== modified file 'support-files/compiler_warnings.supp'
--- a/support-files/compiler_warnings.supp 2011-04-14 15:40:04 +0000
+++ b/support-files/compiler_warnings.supp 2011-07-01 08:28:51 +0000
@@ -98,3 +98,12 @@ mi_packrec.c : .*result of 32-bit shift
#
.* : .*no matching operator delete found; memory will not be freed if initialization throws an exception.*
ctype-simple.c : .*unary minus operator applied to unsigned type, result still unsigned.*
+
+#
+# 5.5-mainline
+#
+extra/perror.c : .*strerror.*
+plugin/semisync/semisync_master.cc : .*may be used uninitialized in this function.*
+storage/innobase/.* : .*
+client/mysqldump.c : .*may be used uninitialized in this function.*
+
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster branch (jonas.oreland:3410 to 3414) | jonas oreland | 4 Jul |
