Commit 6c3babe5 authored by unknown's avatar unknown
Browse files

After merge fixes 

Remove compiler warnings


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Fixed regex to get rid of xid= in output
mysql-test/r/mysqlcheck.result:
  Drop client_test_db if mysql_client_test fails
mysql-test/t/mysqlcheck.test:
  Drop client_test_db if mysql_client_test fails
mysql-test/t/mysqldump.test:
  Use --defaults-file instead of --defaults-extra-file to avoid reading my.cnf files
sql/event_scheduler.cc:
  Remove compiler warnings
sql/ha_partition.cc:
  Don't divide with 0 when checking current auto_increment value
sql/handler.cc:
  After merge fix
sql/mysqld.cc:
  Remove comiler warning
sql/partition_info.cc:
  After merge fix
  Fixed memory reference overrun for some wrong partition definitions
sql/sql_base.cc:
  After merge fix
  Always set *leaves in setup_tables_and_check_access() (assume argument is always given).
sql/sql_select.cc:
  Simple optimization
sql/sql_show.cc:
  Remove compiler warning
sql/sql_table.cc:
  After merge fix
storage/csv/ha_tina.cc:
  Ensure table maps are restored properly
storage/ndb/include/ndbapi/Ndb.hpp:
  Remove compiler warning
parent 555eb848

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * 
ROLLBACK;

SELECT * from t2;

DROP TABLE t1,t2;

--replace_regex /table_id: [0-9]+/table_id: #/

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;



# Test for BUG#16559 (ROLLBACK should always have a zero error code in

mysql-test/r/mysqlcheck.result

+1 −0
Original line number Diff line number Diff line 
drop database if exists client_test_db;

DROP SCHEMA test;

CREATE SCHEMA test;

cluster.binlog_index                               OK

mysql-test/t/mysqlcheck.test

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 
# depends on the presence of the log tables (which are CSV-based).

--source include/have_csv.inc



--disable_warnings

drop database if exists client_test_db;

--enable_warnings



DROP SCHEMA test;

CREATE SCHEMA test;

#

mysql-test/t/mysqldump.test

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ drop database db1; 
# BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence

#



--exec $MYSQL_MY_PRINT_DEFAULTS --defaults-extra-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump

--exec $MYSQL_MY_PRINT_DEFAULTS --defaults-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump





#

sql/event_scheduler.cc

+7 −1
Original line number Diff line number Diff line
@@ -873,13 +873,19 @@ Event_scheduler::drop_event(THD *thd, Event_timed *et) 
*/



enum Event_scheduler::enum_error_code

Event_scheduler::replace_event(THD *thd, Event_timed *et, LEX_STRING *new_schema,

Event_scheduler::replace_event(THD *thd, Event_timed *et,

                               LEX_STRING *new_schema,

                               LEX_STRING *new_name)

{

  enum enum_error_code res;

  Event_timed *et_old, *et_new= NULL;

  LEX_STRING old_schema, old_name;



  LINT_INIT(old_schema.str);

  LINT_INIT(old_schema.length);

  LINT_INIT(old_name.str);

  LINT_INIT(old_name.length);



  DBUG_ENTER("Event_scheduler::replace_event");

  DBUG_PRINT("enter", ("thd=%p et=%p et=[%s.%s] lock=%p",

             thd, et, et->dbname.str, et->name.str, &LOCK_scheduler_data));