mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Manual merge from mysql-trunk.
Conflicts: - mysql-test/r/partition.result - mysql-test/r/variables_debug.result - mysql-test/t/partition.test - mysql-test/t/variables_debug.test
This commit is contained in:
@ -16,4 +16,11 @@ SET @old_general_log= @@global.general_log;
|
||||
# End of 4.1 tests
|
||||
echo ok;
|
||||
|
||||
--echo
|
||||
--echo # cat MYSQL_TMP_DIR/test_wl4435.out.log
|
||||
--echo # ------------------------------------
|
||||
--cat_file $MYSQL_TMP_DIR/test_wl4435.out.log
|
||||
--echo # ------------------------------------
|
||||
--echo
|
||||
|
||||
SET @@global.general_log= @old_general_log;
|
||||
|
@ -399,4 +399,12 @@ delimiter ;$$
|
||||
|
||||
drop procedure p_37228;
|
||||
|
||||
#
|
||||
# Bug#27863 (excessive memory usage for many small queries in a multiquery
|
||||
# packet).
|
||||
#
|
||||
|
||||
let $i=`select repeat("set @a=1;", 65535)`;
|
||||
--disable_query_log
|
||||
eval $i;
|
||||
--enable_query_log
|
||||
|
@ -2119,6 +2119,50 @@ SET SESSION SQL_MODE=DEFAULT;
|
||||
#
|
||||
#DROP TABLE t1;
|
||||
|
||||
--echo #
|
||||
--echo # Bug#46198: Hang after failed ALTER TABLE on partitioned table.
|
||||
--echo #
|
||||
|
||||
--disable_warnings
|
||||
DROP TABLE IF EXISTS t1;
|
||||
--enable_warnings
|
||||
|
||||
#
|
||||
# Case 1.
|
||||
#
|
||||
|
||||
CREATE TABLE t1 (s1 INT PRIMARY KEY) PARTITION BY HASH(s1);
|
||||
|
||||
LOCK TABLES t1 WRITE, t1 b READ;
|
||||
|
||||
UNLOCK TABLES;
|
||||
|
||||
--error ER_ONLY_ON_RANGE_LIST_PARTITION
|
||||
ALTER TABLE t1 DROP PARTITION p1;
|
||||
|
||||
# The SELECT below used to hang in tdc_wait_for_old_versions().
|
||||
SELECT * FROM t1;
|
||||
|
||||
DROP TABLE t1;
|
||||
|
||||
#
|
||||
# Case 2.
|
||||
#
|
||||
|
||||
CREATE TABLE t1 (s1 VARCHAR(5) PRIMARY KEY) PARTITION BY KEY(s1);
|
||||
|
||||
LOCK TABLES t1 WRITE, t1 b READ;
|
||||
|
||||
UNLOCK TABLES;
|
||||
|
||||
--error ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF
|
||||
ALTER TABLE t1 ADD COLUMN (s3 VARCHAR(5) UNIQUE);
|
||||
|
||||
# The SELECT below used to hang in tdc_wait_for_old_versions().
|
||||
SELECT * FROM t1;
|
||||
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo #
|
||||
--echo # BUG#51868 - crash with myisam_use_mmap and partitioned myisam tables
|
||||
--echo #
|
||||
|
@ -11,6 +11,16 @@ select @@debug;
|
||||
set debug= '-P';
|
||||
select @@debug;
|
||||
|
||||
#
|
||||
# Bug#38054: "SET SESSION debug" modifies @@global.debug variable
|
||||
#
|
||||
|
||||
SELECT @@session.debug, @@global.debug;
|
||||
|
||||
SET SESSION debug = '';
|
||||
|
||||
SELECT @@session.debug, @@global.debug;
|
||||
|
||||
--echo #
|
||||
--echo # Bug #52629: memory leak from sys_var_thd_dbug in
|
||||
--echo # binlog.binlog_write_error
|
||||
|
Reference in New Issue
Block a user