1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed random failure in test system

Browse Source 
Removed and suppressed compiler warnings


mysql-test/suite/parts/t/rpl_partition.test:
  Mark as big test (as test takes > 5 minutes)
mysql-test/suite/rpl/t/rpl_row_trig003.test:
  Fixed random failure
sql/item_create.cc:
  Renamed create -> create_builder() to avoid compiler warnings about function hidden by others
sql/net_serv.cc:
  Removed compiler warning
support-files/compiler_warnings.supp:
  Supress some warnings
  Remove suppresstion from set_var.cc, as this has already been fixed
  Added missing \ before .c
  Added suppression of warnings that are due to gcc bug (.*discards qualifiers from pointer target type.*)
This commit is contained in:
Michael Widenius 2010-03-29 22:07:45 +03:00
parent 1fec5af772
commit 639bdb2891
5 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/parts/t/rpl_partition.test
View File

@ -1,6 +1,7 @@
--source include/have_partition.inc --source include/have_partition.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/master-slave.inc --source include/master-slave.inc
--source include/big_test.inc
--vertical_results --vertical_results

2
mysql-test/suite/rpl/t/rpl_row_trig003.test
View File

@ -149,6 +149,8 @@ DROP TABLE IF EXISTS test.t2;
DROP TABLE IF EXISTS test.t3; DROP TABLE IF EXISTS test.t3;
--enable_warnings --enable_warnings
sync_slave_with_master;
diff_files $MYSQLTEST_VARDIR/tmp/trg003_master.sql $MYSQLTEST_VARDIR/tmp/trg003_slave.sql; diff_files $MYSQLTEST_VARDIR/tmp/trg003_master.sql $MYSQLTEST_VARDIR/tmp/trg003_slave.sql;
# End of 5.0 test case # End of 5.0 test case

32
sql/item_create.cc
View File

@ -76,7 +76,7 @@ public:
@param thd The current thread @param thd The current thread
@return An item representing the function call @return An item representing the function call
*/ */
virtual Item *create(THD *thd) = 0; virtual Item *create_builder(THD *thd) = 0;
protected: protected:
/** Constructor. */ /** Constructor. */
@ -498,7 +498,7 @@ protected:
class Create_func_connection_id : public Create_func_arg0 class Create_func_connection_id : public Create_func_arg0
{ {
public: public:
virtual Item *create(THD *thd); virtual Item *create_builder(THD *thd);
static Create_func_connection_id s_singleton; static Create_func_connection_id s_singleton;
@ -943,7 +943,7 @@ protected:
class Create_func_found_rows : public Create_func_arg0 class Create_func_found_rows : public Create_func_arg0
{ {
public: public:
virtual Item *create(THD *thd); virtual Item *create_builder(THD *thd);
static Create_func_found_rows s_singleton; static Create_func_found_rows s_singleton;
@ -1647,7 +1647,7 @@ protected:
class Create_func_pi : public Create_func_arg0 class Create_func_pi : public Create_func_arg0
{ {
public: public:
virtual Item *create(THD *thd); virtual Item *create_builder(THD *thd);
static Create_func_pi s_singleton; static Create_func_pi s_singleton;
@ -1766,7 +1766,7 @@ protected:
class Create_func_row_count : public Create_func_arg0 class Create_func_row_count : public Create_func_arg0
{ {
public: public:
virtual Item *create(THD *thd); virtual Item *create_builder(THD *thd);
static Create_func_row_count s_singleton; static Create_func_row_count s_singleton;
@ -2136,7 +2136,7 @@ protected:
class Create_func_uuid : public Create_func_arg0 class Create_func_uuid : public Create_func_arg0
{ {
public: public:
virtual Item *create(THD *thd); virtual Item *create_builder(THD *thd);
static Create_func_uuid s_singleton; static Create_func_uuid s_singleton;
@ -2149,7 +2149,7 @@ protected:
class Create_func_uuid_short : public Create_func_arg0 class Create_func_uuid_short : public Create_func_arg0
{ {
public: public:
virtual Item *create(THD *thd); virtual Item *create_builder(THD *thd);
static Create_func_uuid_short s_singleton; static Create_func_uuid_short s_singleton;
@ -2162,7 +2162,7 @@ protected:
class Create_func_version : public Create_func_arg0 class Create_func_version : public Create_func_arg0
{ {
public: public:
virtual Item *create(THD *thd); virtual Item *create_builder(THD *thd);
static Create_func_version s_singleton; static Create_func_version s_singleton;
@ -2538,7 +2538,7 @@ Create_func_arg0::create(THD *thd, LEX_STRING name, List<Item> *item_list)
return NULL; return NULL;
} }
return create(thd); return create_builder(thd);
} }
@ -2882,7 +2882,7 @@ Create_func_compress::create_1_arg(THD *thd, Item *arg1)
Create_func_connection_id Create_func_connection_id::s_singleton; Create_func_connection_id Create_func_connection_id::s_singleton;
Item* Item*
Create_func_connection_id::create(THD *thd) Create_func_connection_id::create_builder(THD *thd)
{ {
thd->lex->safe_to_cache_query= 0; thd->lex->safe_to_cache_query= 0;
return new (thd->mem_root) Item_func_connection_id(); return new (thd->mem_root) Item_func_connection_id();
@ -3361,7 +3361,7 @@ Create_func_format::create_2_arg(THD *thd, Item *arg1, Item *arg2)
Create_func_found_rows Create_func_found_rows::s_singleton; Create_func_found_rows Create_func_found_rows::s_singleton;
Item* Item*
Create_func_found_rows::create(THD *thd) Create_func_found_rows::create_builder(THD *thd)
{ {
thd->lex->set_stmt_unsafe(); thd->lex->set_stmt_unsafe();
thd->lex->safe_to_cache_query= 0; thd->lex->safe_to_cache_query= 0;
@ -4120,7 +4120,7 @@ Create_func_period_diff::create_2_arg(THD *thd, Item *arg1, Item *arg2)
Create_func_pi Create_func_pi::s_singleton; Create_func_pi Create_func_pi::s_singleton;
Item* Item*
Create_func_pi::create(THD *thd) Create_func_pi::create_builder(THD *thd)
{ {
return new (thd->mem_root) Item_static_float_func("pi()", M_PI, 6, 8); return new (thd->mem_root) Item_static_float_func("pi()", M_PI, 6, 8);
} }
@ -4274,7 +4274,7 @@ Create_func_round::create_native(THD *thd, LEX_STRING name,
Create_func_row_count Create_func_row_count::s_singleton; Create_func_row_count Create_func_row_count::s_singleton;
Item* Item*
Create_func_row_count::create(THD *thd) Create_func_row_count::create_builder(THD *thd)
{ {
thd->lex->set_stmt_unsafe(); thd->lex->set_stmt_unsafe();
thd->lex->safe_to_cache_query= 0; thd->lex->safe_to_cache_query= 0;
@ -4584,7 +4584,7 @@ Create_func_unix_timestamp::create_native(THD *thd, LEX_STRING name,
Create_func_uuid Create_func_uuid::s_singleton; Create_func_uuid Create_func_uuid::s_singleton;
Item* Item*
Create_func_uuid::create(THD *thd) Create_func_uuid::create_builder(THD *thd)
{ {
thd->lex->set_stmt_unsafe(); thd->lex->set_stmt_unsafe();
thd->lex->safe_to_cache_query= 0; thd->lex->safe_to_cache_query= 0;
@ -4595,7 +4595,7 @@ Create_func_uuid::create(THD *thd)
Create_func_uuid_short Create_func_uuid_short::s_singleton; Create_func_uuid_short Create_func_uuid_short::s_singleton;
Item* Item*
Create_func_uuid_short::create(THD *thd) Create_func_uuid_short::create_builder(THD *thd)
{ {
thd->lex->set_stmt_unsafe(); thd->lex->set_stmt_unsafe();
thd->lex->safe_to_cache_query= 0; thd->lex->safe_to_cache_query= 0;
@ -4606,7 +4606,7 @@ Create_func_uuid_short::create(THD *thd)
Create_func_version Create_func_version::s_singleton; Create_func_version Create_func_version::s_singleton;
Item* Item*
Create_func_version::create(THD *thd) Create_func_version::create_builder(THD *thd)
{ {
thd->lex->set_stmt_unsafe(); thd->lex->set_stmt_unsafe();
return new (thd->mem_root) Item_static_string_func("version()", return new (thd->mem_root) Item_static_string_func("version()",

2
sql/net_serv.cc
View File

@ -279,7 +279,7 @@ static int net_data_is_ready(my_socket sd)
@param clear_buffer if <> 0, then clear all data from comm buff @param clear_buffer if <> 0, then clear all data from comm buff
*/ */
void net_clear(NET *net, my_bool clear_buffer) void net_clear(NET *net, my_bool clear_buffer __attribute__((unused)))
{ {
#if !defined(EMBEDDED_LIBRARY) && defined(DBUG_OFF) #if !defined(EMBEDDED_LIBRARY) && defined(DBUG_OFF)
size_t count; size_t count;

13
support-files/compiler_warnings.supp
View File

@ -39,6 +39,7 @@ sync/sync0rw\.c: unused parameter
sync/sync0sync\.c: unused parameter sync/sync0sync\.c: unused parameter
sync/sync0sync\.c: unused variable sync/sync0sync\.c: unused variable
ut/ut0ut\.c: ignoring return value of ut/ut0ut\.c: ignoring return value of
srv/srv0srv\.c: value computed is not used
# #
# bdb is not critical to keep up to date # bdb is not critical to keep up to date
@ -128,18 +129,18 @@ include/runtime.hpp: .*pure_error.*
# #
listener.cc : .*conversion from 'SOCKET' to 'int'.* listener.cc : .*conversion from 'SOCKET' to 'int'.*
net_serv.cc : .*conversion from 'SOCKET' to 'int'.* net_serv.cc : .*conversion from 'SOCKET' to 'int'.*
set_var.cc: right-hand operand of comma has no effect : 1000-1400
# allow a little moving space for the warning below # allow a little moving space for the warning below
mi_packrec.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 560-600 mi_packrec\.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 560-600
ma_packrec.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 550-650 ma_packrec\.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 550-650
# #
# Wrong compiler warnings # Wrong compiler warnings
# #
.* : .*no matching operator delete found; memory will not be freed if initialization throws an exception.* .* : .*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.* ctype-simple\.c : .*unary minus operator applied to unsigned type, result still unsigned.*
# Wrong warning due to GCC bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478 # Wrong warning due to GCC bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478
regexec\.c : .*passing argument 3 of.*matcher.* discards qualifiers from pointer target type.* regexec\.c : passing argument 3 of.*matcher.* discards qualifiers from pointer target type
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