Commit 76b4ccbd authored by unknown's avatar unknown
Browse files

Fixed portablity problem 

Removed warnings from mysqltest scripts


cmd-line-utils/readline/undo.c:
  Fixed portability problem
mysql-test/include/mix2.inc:
  Removed mysqltest warnings
mysql-test/include/query_cache.inc:
  Removed mysqltest warnings
mysql-test/r/ndb_binlog_ddl_multi.result:
  Update tests after fixing wrong connection command in test
mysql-test/t/greedy_optimizer.test:
  Removed mysqltest warnings
mysql-test/t/join.test:
  Removed mysqltest warnings
mysql-test/t/ndb_binlog_ddl_multi.test:
  Removed mysqltest warnings
mysql-test/t/ndb_blob_partition.test:
  Removed mysqltest warnings
mysql-test/t/ndb_index_ordered.test:
  Removed mysqltest warnings
storage/ndb/src/kernel/vm/Rope.cpp:
  Removed compiler warning
parent 13bb3fa8

cmd-line-utils/readline/undo.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ _rl_fix_last_undo_of_type (type, start, end) 


  for (rl = rl_undo_list; rl; rl = rl->next)

    {

      if (rl->what == (uint) type)

      if (rl->what == (unsigned int) type)

	{

	  rl->start = start;

	  rl->end = end;

mysql-test/include/mix2.inc

+1 −1
Original line number Diff line number Diff line
@@ -1588,7 +1588,7 @@ INSERT INTO t1 (id) VALUES (NULL); 
SELECT * FROM t1;

DROP TABLE t2, t1;



-- Test that foreign keys in temporary tables are not accepted (bug #12084)

# Test that foreign keys in temporary tables are not accepted (bug #12084)

eval CREATE TABLE t1

(

 id INT PRIMARY KEY

mysql-test/include/query_cache.inc

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ SET @@autocommit=1; 


connection default;

--echo connection default

-- This should be 'YES'.

# This should be 'YES'.

SHOW VARIABLES LIKE 'have_query_cache';



SET GLOBAL query_cache_size = 200000;

mysql-test/r/ndb_binlog_ddl_multi.result

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ reset master; 
alter table t2 add column (b int);

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin1.000001	#	Query	#	#	use `test`; alter table t2 add column (b int)

master-bin.000001	#	Query	#	#	use `test`; alter table t2 add column (b int)

reset master;

reset master;

ALTER DATABASE mysqltest CHARACTER SET latin1;

mysql-test/t/greedy_optimizer.test

+2 −2
Original line number Diff line number Diff line
@@ -145,11 +145,11 @@ select @@optimizer_prune_level; 
#

# These are the values for the parameters that control the greedy optimizer

# (total 6 combinations - 3 for optimizer_search_depth, 2 for optimizer_prune_level):

--

#

# set optimizer_search_depth=0;  - automatic

# set optimizer_search_depth=1;  - min

# set optimizer_search_depth=62; - max (default)

--

#

# set optimizer_prune_level=0 - exhaustive;

# set optimizer_prune_level=1 - heuristic; # default