mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge with MySQL 5.1.55
- Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria" - Fixed wrong assert in Aria Now need to merge with latest xtradb before pushing sql/ha_partition.cc: Ensure that m_ordered_rec_buffer is not freed before close. sql/mysqld.cc: Changed to use opt_stack_trace instead of opt_pstack. Removed references to pstack sql/partition_element.h: Ensure that connect_string is initialized storage/maria/ma_key_recover.c: Fixed wrong assert
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
-- source include/master-slave.inc
|
||||
|
||||
# Test need anonymous user when connection are made as "zedjzlcsjhd"
|
||||
# But we only need it on the master, not the slave.
|
||||
SET sql_log_bin = 0;
|
||||
source include/add_anonymous_users.inc;
|
||||
SET sql_log_bin = 1;
|
||||
|
||||
-- source include/master-slave.inc
|
||||
|
||||
# Clean up old slave's binlogs.
|
||||
# The slave is started with --log-slave-updates
|
||||
# and this test does SHOW BINLOG EVENTS on the slave's
|
||||
@@ -292,11 +292,15 @@ connection master;
|
||||
drop table t1;
|
||||
--remove_file $MYSQLTEST_VARDIR/tmp/bug14157.sql
|
||||
|
||||
# Delete the anonymous users
|
||||
SET sql_log_bin = 0;
|
||||
source include/delete_anonymous_users.inc;
|
||||
SET sql_log_bin = 1;
|
||||
--sync_slave_with_master
|
||||
|
||||
# Delete the anonymous users.
|
||||
--source include/stop_slave.inc
|
||||
source include/delete_anonymous_users.inc;
|
||||
--connection master
|
||||
source include/delete_anonymous_users.inc;
|
||||
--let $rpl_only_running_threads= 1
|
||||
--source include/rpl_reset.inc
|
||||
|
||||
|
||||
#
|
||||
@@ -328,9 +332,7 @@ connection slave;
|
||||
|
||||
DROP USER user43748@127.0.0.1;
|
||||
|
||||
--echo -- done. back to master.
|
||||
connection master;
|
||||
|
||||
|
||||
|
||||
--echo End of 5.1 tests
|
||||
--let $rpl_only_running_threads= 1
|
||||
--source include/rpl_end.inc
|
||||
|
Reference in New Issue
Block a user