diff options
author | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-27 01:47:38 +0200 |
---|---|---|
committer | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-27 01:47:38 +0200 |
commit | 788ad30f081bc55ff97ceed78ec7ff545e25ed99 (patch) | |
tree | b29f99476834178f395c188e1c4d352dd106fc01 /mysql-test | |
parent | b8fe9fb47f6b30aa72c16642ca51d84650169817 (diff) | |
download | mariadb-git-788ad30f081bc55ff97ceed78ec7ff545e25ed99.tar.gz |
Fixed a LOT of compiler warnings
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
client/mysqldump.c:
Fixed some compiler warnings
Added some missing DBUG_RETURN
Remove copying of 'cluster' database
client/mysqlslap.c:
Fixed compiler warnings
client/mysqltest.c:
After merge fix
extra/yassl/taocrypt/include/algebra.hpp:
Removed compiler warning
mysql-test/include/im_check_env.inc:
Fixed race condition (mysqld1 could report 'starting' or 'online'
mysql-test/mysql-test-run.pl:
After merge fixes
Added missing directory to LD_LIBRARY_PATH
mysql-test/r/ctype_cp1250_ch.result:
After merge fix
mysql-test/r/im_cmd_line.result:
Fixed race condition
mysql-test/r/im_daemon_life_cycle.result:
Fixed race condition
mysql-test/r/im_instance_conf.result:
Fixed race condition
mysql-test/r/im_life_cycle.result:
Fixed race condition
mysql-test/r/im_utils.result:
Fixed race condition
mysql-test/r/log_tables.result:
Fixed wrong result
mysql-test/t/disabled.def:
Disabled ndb_restore_partion, as ndb_restore_compate caused it to fail, becasue of table 'cluster/def/schema' which is stored in ndb_backup50
mysys/my_compress.c:
Removed compiler warnings
mysys/my_getopt.c:
Ensure we always have at least one space between option name and value
plugin/fulltext/plugin_example.c:
Removed compiler warnings
server-tools/instance-manager/mysql_connection.cc:
After merge fix
sql/event_data_objects.cc:
Fixed compiler warnings
Fixed platform compatibility issues (%lld is not portable)
sql/event_data_objects.h:
Fixed compiler warnings
sql/event_db_repository.cc:
Fixed compiler warnings
sql/event_queue.cc:
Fixed compiler warnings
sql/event_scheduler.cc:
Fixed compiler warnings
sql/events.cc:
Fixed compiler warnings
sql/field.cc:
Fixed compiler warnings
sql/ha_ndbcluster.cc:
Fixed compiler warnings
sql/ha_ndbcluster_binlog.cc:
Fixed compiler warnings
sql/ha_partition.cc:
Fixed compiler warnings
sql/handler.cc:
Fixed compiler warnings
sql/item_cmpfunc.cc:
Fixed DBUG_PRINT style
sql/item_func.cc:
Fixed compiler warnings
sql/log.cc:
Fixed compiler warnings
sql/log_event.cc:
Fixed compiler warnings
sql/mysqld.cc:
Fixed compiler warnings
sql/opt_range.cc:
Fixed compiler warnings
sql/repl_failsafe.cc:
Indentation fixes
sql/rpl_rli.cc:
Fixed compiler warnings
sql/rpl_tblmap.cc:
Fixed compiler warnings
sql/set_var.cc:
Fixed compiler warnings
sql/slave.cc:
Fixed compiler warnings
sql/sp_head.cc:
Fixed compiler warnings
sql/sql_base.cc:
Fixed compiler warnings
Fixed indentation
sql/sql_binlog.cc:
Fixed compiler warnings
sql/sql_cache.cc:
Fixed compiler warnings
sql/sql_class.cc:
Fixed compiler warnings
sql/sql_handler.cc:
Fixed compiler warnings
sql/sql_lex.cc:
Fixed compiler warnings
sql/sql_parse.cc:
Fixed compiler warnings
sql/sql_partition.cc:
Fixed compiler warnings
sql/sql_prepare.cc:
Fixed compiler warnings
sql/sql_table.cc:
Fixed compiler warnings
sql/sql_test.cc:
Fixed DBUG_PRINT style
sql/sql_trigger.cc:
Fixed DBUG_PRINT style
sql/table.cc:
Fixed compiler warnings
storage/federated/ha_federated.cc:
Fixed compiler warnings
storage/myisam/mi_rsamepos.c:
Fixed compiler warnings
storage/ndb/include/ndb_global.h.in:
After merge fix
storage/ndb/include/util/NdbOut.hpp:
Inform gcc that ndbout_c takes a printf() string as argument
storage/ndb/include/util/SimpleProperties.hpp:
After merge fixes
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fixed compiler warnings
Fixed usage of uninitialized value (Got help from Jonas with patch)
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/lgman.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/pgman.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/restore.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Fixed compiler warnings
Added missing enum's to switch
storage/ndb/src/kernel/vm/Configuration.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/vm/DLHashTable.hpp:
Fixed compiler warnings
storage/ndb/src/kernel/vm/RWPool.hpp:
Fixed compiler warnings
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
Fixed compiler warnings
storage/ndb/src/kernel/vm/WOPool.hpp:
Fixed compiler warnings
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
Fixed compiler warnings
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Fixed compiler warnings
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Fixed compiler warnings
storage/ndb/src/ndbapi/DictCache.cpp:
Fixed compiler warnings
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Fixed compiler warnings
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Fixed compiler warnings
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
Fixed compiler warnings
storage/ndb/src/ndbapi/NdbIndexStat.cpp:
Initialize possible uninitialized variable
storage/ndb/src/ndbapi/NdbOperationInt.cpp:
Fixed compiler warnings
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
Added missing enum's (To avoid compiler warnings)
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Fixed compiler warnings
storage/ndb/src/ndbapi/ObjectMap.hpp:
Fixed compiler warnings
storage/ndb/tools/desc.cpp:
Fixed compiler warnings
storage/ndb/tools/restore/Restore.cpp:
Fixed compiler warnings
storage/ndb/tools/restore/consumer_restore.cpp:
Fixed compiler warnings
unittest/mytap/t/basic-t.c:
Fixed compiler warnings
unittest/mytap/tap.c:
Fixed compiler warnings
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/include/im_check_env.inc | 1 | ||||
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 12 | ||||
-rw-r--r-- | mysql-test/r/ctype_cp1250_ch.result | 1 | ||||
-rw-r--r-- | mysql-test/r/im_cmd_line.result | 2 | ||||
-rw-r--r-- | mysql-test/r/im_daemon_life_cycle.result | 2 | ||||
-rw-r--r-- | mysql-test/r/im_instance_conf.result | 2 | ||||
-rw-r--r-- | mysql-test/r/im_life_cycle.result | 2 | ||||
-rw-r--r-- | mysql-test/r/im_utils.result | 2 | ||||
-rw-r--r-- | mysql-test/r/log_tables.result | 1 | ||||
-rw-r--r-- | mysql-test/t/disabled.def | 3 |
10 files changed, 16 insertions, 12 deletions
diff --git a/mysql-test/include/im_check_env.inc b/mysql-test/include/im_check_env.inc index 019e0984614..883e5d00fe4 100644 --- a/mysql-test/include/im_check_env.inc +++ b/mysql-test/include/im_check_env.inc @@ -22,4 +22,5 @@ SHOW VARIABLES LIKE 'server_id'; # Check that IM understands that mysqld1 is online, while mysqld2 is # offline. +--replace_result starting XXXXX online XXXXX SHOW INSTANCES; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b7c2d247ca9..809d9d9d168 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1576,7 +1576,8 @@ sub environment_setup () { if ( $opt_source_dist ) { push(@ld_library_paths, "$glob_basedir/libmysql/.libs/", - "$glob_basedir/libmysql_r/.libs/"); + "$glob_basedir/libmysql_r/.libs/", + "$glob_basedir/zlib.libs/"); } else { @@ -2992,10 +2993,6 @@ sub do_after_run_mysqltest($) # Save info from this testcase run to mysqltest.log mtr_appendfile_to_file($path_timefile, $path_mysqltest_log) if -f $path_timefile; - - # Remove the file that mysqltest writes info to - unlink($path_timefile); - } @@ -3183,6 +3180,9 @@ sub run_testcase ($) { } } + # Remove the file that mysqltest writes info to + unlink($path_timefile); + # ---------------------------------------------------------------------- # Stop Instance Manager if we are processing an IM-test case. # ---------------------------------------------------------------------- @@ -4095,7 +4095,6 @@ sub run_testcase_start_servers($) { if ( $clusters->[0]->{'pid'} and ! $master->[1]->{'pid'} ) { - { # Test needs cluster, start an extra mysqld connected to cluster if ( $mysql_version_id >= 50100 ) @@ -4848,4 +4847,3 @@ HERE mtr_exit(1); } - diff --git a/mysql-test/r/ctype_cp1250_ch.result b/mysql-test/r/ctype_cp1250_ch.result index 73f415732cd..4b02fa2182a 100644 --- a/mysql-test/r/ctype_cp1250_ch.result +++ b/mysql-test/r/ctype_cp1250_ch.result @@ -1,3 +1,4 @@ +drop table if exists t1; DROP TABLE IF EXISTS t1; SHOW COLLATION LIKE 'cp1250_czech_cs'; Collation Charset Id Default Compiled Sortlen diff --git a/mysql-test/r/im_cmd_line.result b/mysql-test/r/im_cmd_line.result index a4c21c36415..a862d465904 100644 --- a/mysql-test/r/im_cmd_line.result +++ b/mysql-test/r/im_cmd_line.result @@ -3,7 +3,7 @@ Variable_name Value server_id 1 SHOW INSTANCES; instance_name state -mysqld1 starting +mysqld1 XXXXX mysqld2 offline --> Listing users... im_admin diff --git a/mysql-test/r/im_daemon_life_cycle.result b/mysql-test/r/im_daemon_life_cycle.result index 397f4d5d503..4fe15460ae5 100644 --- a/mysql-test/r/im_daemon_life_cycle.result +++ b/mysql-test/r/im_daemon_life_cycle.result @@ -3,7 +3,7 @@ Variable_name Value server_id 1 SHOW INSTANCES; instance_name state -mysqld1 online +mysqld1 XXXXX mysqld2 offline Killing the process... Sleeping... diff --git a/mysql-test/r/im_instance_conf.result b/mysql-test/r/im_instance_conf.result index 597a1be428e..d04ae0270ab 100644 --- a/mysql-test/r/im_instance_conf.result +++ b/mysql-test/r/im_instance_conf.result @@ -3,7 +3,7 @@ Variable_name Value server_id 1 SHOW INSTANCES; instance_name state -mysqld1 online +mysqld1 XXXXX mysqld2 offline -------------------------------------------------------------------- server_id = 1 diff --git a/mysql-test/r/im_life_cycle.result b/mysql-test/r/im_life_cycle.result index c403411c399..fb25f4a0768 100644 --- a/mysql-test/r/im_life_cycle.result +++ b/mysql-test/r/im_life_cycle.result @@ -3,7 +3,7 @@ Variable_name Value server_id 1 SHOW INSTANCES; instance_name state -mysqld1 online +mysqld1 XXXXX mysqld2 offline -------------------------------------------------------------------- diff --git a/mysql-test/r/im_utils.result b/mysql-test/r/im_utils.result index 6e40c9bb1c0..b7c68965ada 100644 --- a/mysql-test/r/im_utils.result +++ b/mysql-test/r/im_utils.result @@ -3,7 +3,7 @@ Variable_name Value server_id 1 SHOW INSTANCES; instance_name state -mysqld1 online +mysqld1 XXXXX mysqld2 offline SHOW INSTANCE OPTIONS mysqld1; option_name value diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index 2836b96d7b5..d9d754c91e6 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -280,6 +280,7 @@ create table general_log_new like general_log; create table slow_log_new like slow_log; show tables like "%log%"; Tables_in_mysql (%log%) +binlog_index general_log general_log_new slow_log diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 0d3b7cdfdeb..c21f3661667 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -16,6 +16,9 @@ concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random 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_load : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed +ndb_restore_partition : Problem with cluster/def/schema table that is in std_data/ndb_backup51; Pekka will schdule this to someone +rpl_ndb_sync : Problem with cluster/def/schema table that is in std_data/ndb_backup51; Pekka will schdule this to someone + partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table ps_7ndb : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated |