Skip to content

M
MariaDB
Commit 03bebc3f authored by Vladislav Vaintroub's avatar Vladislav Vaintroub
Browse files
Options

merge 5.5

parents 062e12a1 8882444f
Hide whitespace changes
Inline Side-by-side
Showing with 543 additions and 25701 deletions
BUILD/compile-solaris-amd64
View file @ 03bebc3f
......@@ -26,7 +26,7 @@ path=`dirname $0`
extra_flags="$amd64_cflags -D__sun -m64 -mtune=athlon64"
extra_configs="$amd64_configs $max_configs --with-libevent"
LDFLAGS="-lmtmalloc -R/usr/sfw/lib/64"
LDFLAGS="-m64 -lmtmalloc -R/usr/sfw/lib/64"
export LDFLAGS
. "$path/FINISH.sh"
cmake/plugin.cmake
View file @ 03bebc3f
......@@ -111,8 +111,27 @@ MACRO(MYSQL_ADD_PLUGIN)
SET(ARG_DEPENDENCIES)
ENDIF()
SET(BUILD_PLUGIN 1)
IF(NOT ARG_MODULE_OUTPUT_NAME)
IF(ARG_STORAGE_ENGINE)
SET(ARG_MODULE_OUTPUT_NAME "ha_${target}")
ELSE()
SET(ARG_MODULE_OUTPUT_NAME "${target}")
ENDIF()
ENDIF()
# Build either static library or module
IF (WITH_${plugin} AND NOT ARG_MODULE_ONLY)
IF(CMAKE_GENERATOR MATCHES "Makefiles")
# If there is a shared library from previous shared build,
# remove it. This is done just for mysql-test-run.pl
# so it does not try to use stale shared lib as plugin
# in test.
FILE(REMOVE
${CMAKE_CURRENT_BINARY_DIR}/${ARG_MODULE_OUTPUT_NAME}${CMAKE_SHARED_MODULE_SUFFIX})
ENDIF()
ADD_LIBRARY(${target} STATIC ${SOURCES})
SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITONS "MYSQL_SERVER")
DTRACE_INSTRUMENT(${target})
......@@ -159,14 +178,7 @@ MACRO(MYSQL_ADD_PLUGIN)
PARENT_SCOPE)
ENDIF()
ELSEIF(NOT WITHOUT_${plugin} AND NOT ARG_STATIC_ONLY AND NOT WITHOUT_DYNAMIC_PLUGINS)
IF(NOT ARG_MODULE_OUTPUT_NAME)
IF(ARG_STORAGE_ENGINE)
SET(ARG_MODULE_OUTPUT_NAME "ha_${target}")
ELSE()
SET(ARG_MODULE_OUTPUT_NAME "${target}")
ENDIF()
ENDIF()
ADD_VERSION_INFO(${target} MODULE SOURCES)
ADD_LIBRARY(${target} MODULE ${SOURCES})
DTRACE_INSTRUMENT(${target})
......
cmd-line-utils/libedit/CMakeLists.txt
View file @ 03bebc3f
......@@ -177,6 +177,6 @@ SET(LIBEDIT_SOURCES
${AHDR}
${LIBEDIT_EXTRA_SOURCES}
)
ADD_LIBRARY(edit ${LIBEDIT_SOURCES})
ADD_LIBRARY(edit STATIC ${LIBEDIT_SOURCES})
TARGET_LINK_LIBRARIES(edit ${CURSES_LIBRARY})
cmd-line-utils/readline/CMakeLists.txt
View file @ 03bebc3f
......@@ -20,7 +20,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H -DNO_KILL_INTR)
INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
ADD_LIBRARY(readline
ADD_LIBRARY(readline STATIC
readline.c
funmap.c
keymaps.c
......
dbug/dbug.c
View file @ 03bebc3f
......@@ -2147,4 +2147,14 @@ const char* _db_get_func_(void)
return cs->func;
}
#else
/*
* Dummy function, workaround for build failure on a platform where linking
* with an empty archive fails.
*/
int i_am_a_dummy_function() {
return 0;
}
#endif /* DBUG_OFF */
mysql-test/include/have_32bit.inc → mysql-test/include/have_32bit_ulong.inc
View file @ 03bebc3f
# Created by Horst Hunger 2008-04-15
# see also have_64bit.inc
# see also have_64bit_ulong.inc
--disable_query_log
--disable_warnings
let $save = `SELECT @@global.sort_buffer_size`;
SET @@global.sort_buffer_size = 4294967296;
let $mach32 = `SELECT @@global.sort_buffer_size <= 4294967295`;
eval SET @@global.sort_buffer_size = $save;
let $save = `SELECT @@pseudo_thread_id`;
SET @@pseudo_thread_id = 4294967296;
let $mach32 = `SELECT @@pseudo_thread_id <= 4294967295`;
eval SET @@pseudo_thread_id = $save;
--enable_warnings
--enable_query_log
if (!$mach32)
{
skip Need a 32 bit machine/binary;
skip Need a 32 bit unsigned long;
}
mysql-test/include/have_64bit.inc deleted 100644 → 0
View file @ 062e12a1
# Created by Horst Hunger 2008-04-15
# see also have_32bit.inc
--disable_query_log
let $save = `SELECT @@session.sort_buffer_size`;
SET @@session.sort_buffer_size = 4294967296;
let $mach64 = `SELECT @@session.sort_buffer_size > 4294967295`;
eval SET @@session.sort_buffer_size = $save;
--enable_query_log
if (!$mach64)
{
skip Need a 64 binary ;
}
mysql-test/include/have_64bit_ulong.inc 0 → 100644
View file @ 03bebc3f
# Created by Horst Hunger 2008-04-15
# see also have_32bit_ulong.inc
--disable_query_log
let $save = `SELECT @@pseudo_thread_id`;
SET @@pseudo_thread_id = 4294967296;
let $mach64 = `SELECT @@pseudo_thread_id > 4294967295`;
eval SET @@pseudo_thread_id = $save;
--enable_query_log
if (!$mach64)
{
skip Need a 64 unsigned long ;
}
mysql-test/include/mtr_warnings.sql
View file @ 03bebc3f
......@@ -159,7 +159,7 @@ INSERT INTO global_suppressions VALUES
/* innodb foreign key tests that fail in ALTER or RENAME produce this */
("InnoDB: Error: in ALTER TABLE `test`.`t[123]`"),
("InnoDB: Error: in RENAME TABLE table `test`.`t1`"),
("InnoDB: Error: table `test`.`t[123]` does not exist in the InnoDB internal"),
("InnoDB: Error: table `test`.`t[123]` .*does not exist in the InnoDB internal"),
/*
BUG#32080 - Excessive warnings on Solaris: setrlimit could not
......
mysql-test/r/func_encrypt_nossl.result
View file @ 03bebc3f
......@@ -2,83 +2,83 @@ select des_encrypt("test", 'akeystr');
des_encrypt("test", 'akeystr')
NULL
Warnings:
Warning 1289 The 'des_encrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select des_encrypt("test", 1);
des_encrypt("test", 1)
NULL
Warnings:
Warning 1289 The 'des_encrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select des_encrypt("test", 9);
des_encrypt("test", 9)
NULL
Warnings:
Warning 1289 The 'des_encrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select des_encrypt("test", 100);
des_encrypt("test", 100)
NULL
Warnings:
Warning 1289 The 'des_encrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select des_encrypt("test", NULL);
des_encrypt("test", NULL)
NULL
Warnings:
Warning 1289 The 'des_encrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select des_encrypt(NULL, NULL);
des_encrypt(NULL, NULL)
NULL
Warnings:
Warning 1289 The 'des_encrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select des_decrypt("test", 'anotherkeystr');
des_decrypt("test", 'anotherkeystr')
NULL
Warnings:
Warning 1289 The 'des_decrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select des_decrypt(1, 1);
des_decrypt(1, 1)
NULL
Warnings:
Warning 1289 The 'des_decrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select des_decrypt(des_encrypt("test", 'thekey'));
des_decrypt(des_encrypt("test", 'thekey'))
NULL
Warnings:
Warning 1289 The 'des_decrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select hex(des_encrypt("hello")),des_decrypt(des_encrypt("hello"));
hex(des_encrypt("hello")) des_decrypt(des_encrypt("hello"))
NULL NULL
Warnings:
Warning 1289 The 'des_encrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_decrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select des_decrypt(des_encrypt("hello",4));
des_decrypt(des_encrypt("hello",4))
NULL
Warnings:
Warning 1289 The 'des_decrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select des_decrypt(des_encrypt("hello",'test'),'test');
des_decrypt(des_encrypt("hello",'test'),'test')
NULL
Warnings:
Warning 1289 The 'des_decrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select hex(des_encrypt("hello")),hex(des_encrypt("hello",5)),hex(des_encrypt("hello",'default_password'));
hex(des_encrypt("hello")) hex(des_encrypt("hello",5)) hex(des_encrypt("hello",'default_password'))
NULL NULL NULL
Warnings:
Warning 1289 The 'des_encrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_encrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_encrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
Warning 1289 The 'des_encrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select des_decrypt(des_encrypt("hello"),'default_password');
des_decrypt(des_encrypt("hello"),'default_password')
NULL
Warnings:
Warning 1289 The 'des_decrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select des_decrypt(des_encrypt("hello",4),'password4');
des_decrypt(des_encrypt("hello",4),'password4')
NULL
Warnings:
Warning 1289 The 'des_decrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
SET @a=des_decrypt(des_encrypt("hello"));
Warnings:
Warning 1289 The 'des_decrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
flush des_key_file;
select @a = des_decrypt(des_encrypt("hello"));
@a = des_decrypt(des_encrypt("hello"))
......@@ -90,9 +90,9 @@ select hex(des_decrypt(des_encrypt("hello",4),'password2'));
hex(des_decrypt(des_encrypt("hello",4),'password2'))
NULL
Warnings:
Warning 1289 The 'des_decrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
select hex(des_decrypt(des_encrypt("hello","hidden")));
hex(des_decrypt(des_encrypt("hello","hidden")))
NULL
Warnings:
Warning 1289 The 'des_decrypt' feature is disabled; you need MySQL built with '--with-ssl' to have it working
Warning 1289 The 'des_decrypt' feature is disabled; you need MariaDB built with '--with-ssl' to have it working
mysql-test/r/information_schema-big.result
View file @ 03bebc3f
......@@ -20,6 +20,7 @@ c2.column_name LIKE '%SCHEMA%'
AND t.table_name NOT LIKE 'innodb%';
table_name column_name
CHARACTER_SETS CHARACTER_SET_NAME
CLIENT_STATISTICS CLIENT
COLLATIONS COLLATION_NAME
COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME
COLUMNS TABLE_SCHEMA
......@@ -29,6 +30,8 @@ EVENTS EVENT_SCHEMA
FILES TABLE_SCHEMA
GLOBAL_STATUS VARIABLE_NAME
GLOBAL_VARIABLES VARIABLE_NAME
INDEX_STATISTICS TABLE_SCHEMA
KEY_CACHES KEY_CACHE_NAME
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
PARAMETERS SPECIFIC_SCHEMA
PARTITIONS TABLE_SCHEMA
......@@ -46,9 +49,13 @@ TABLES TABLE_SCHEMA
TABLESPACES TABLESPACE_NAME
TABLE_CONSTRAINTS CONSTRAINT_SCHEMA
TABLE_PRIVILEGES TABLE_SCHEMA
TABLE_STATISTICS TABLE_SCHEMA
TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
USER_STATISTICS USER
VIEWS TABLE_SCHEMA
PBXT_STATISTICS ID
XTRADB_ADMIN_COMMAND result_message
SELECT t.table_name, c1.column_name
FROM information_schema.tables t
INNER JOIN
......@@ -66,6 +73,7 @@ c2.column_name LIKE '%SCHEMA%'
AND t.table_name NOT LIKE 'innodb%';
table_name column_name
CHARACTER_SETS CHARACTER_SET_NAME
CLIENT_STATISTICS CLIENT
COLLATIONS COLLATION_NAME
COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME
COLUMNS TABLE_SCHEMA
......@@ -75,6 +83,8 @@ EVENTS EVENT_SCHEMA
FILES TABLE_SCHEMA
GLOBAL_STATUS VARIABLE_NAME
GLOBAL_VARIABLES VARIABLE_NAME
INDEX_STATISTICS TABLE_SCHEMA
KEY_CACHES KEY_CACHE_NAME
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
PARAMETERS SPECIFIC_SCHEMA
PARTITIONS TABLE_SCHEMA
......@@ -92,6 +102,10 @@ TABLES TABLE_SCHEMA
TABLESPACES TABLESPACE_NAME
TABLE_CONSTRAINTS CONSTRAINT_SCHEMA
TABLE_PRIVILEGES TABLE_SCHEMA
TABLE_STATISTICS TABLE_SCHEMA
TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
USER_STATISTICS USER
VIEWS TABLE_SCHEMA
PBXT_STATISTICS ID
XTRADB_ADMIN_COMMAND result_message
mysql-test/r/merge-big.result
View file @ 03bebc3f
......@@ -8,7 +8,7 @@ CREATE TABLE t1 (c1 INT) ENGINE= MyISAM;
LOCK TABLE t1 WRITE;
# connection con1
SET @orig_debug=@@debug;
SET GLOBAL debug="+d,sleep_open_and_lock_after_open";
SET GLOBAL debug_dbug="+d,sleep_open_and_lock_after_open";
INSERT INTO t1 VALUES (1);
# connection default
# Let INSERT go into thr_multi_lock().
......@@ -22,6 +22,6 @@ SELECT * FROM t1;
c1
UNLOCK TABLES;
# connection con1
SET GLOBAL debug=@orig_debug;
SET GLOBAL debug_dbug=@orig_debug;
# connection default
DROP TABLE t1;
mysql-test/r/select_jcl6.result
View file @ 03bebc3f
......@@ -4411,7 +4411,7 @@ INSERT INTO t1 VALUES
EXPLAIN SELECT 1 FROM t1 NATURAL LEFT JOIN t1 AS t2;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 2
1 SIMPLE t2 hash_ALL a #hash#$hj 12 test.t1.a 2 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL a #hash#$hj 14 test.t1.a 2 Using where; Using join buffer (flat, BNLH join)
SELECT 1 FROM t1 NATURAL LEFT JOIN t1 AS t2;
1
1
......@@ -4421,7 +4421,7 @@ SELECT 1 FROM t1 NATURAL LEFT JOIN t1 AS t2;
EXPLAIN SELECT 1 FROM t1 NATURAL LEFT JOIN t1 AS t2 FORCE INDEX(a);
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 2
1 SIMPLE t2 hash_ALL a #hash#$hj 12 test.t1.a 2 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL a #hash#$hj 14 test.t1.a 2 Using where; Using join buffer (flat, BNLH join)
SELECT 1 FROM t1 NATURAL LEFT JOIN t1 AS t2 FORCE INDEX(a);
1
1
......
mysql-test/suite/federated/federated_debug-master.opt
View file @ 03bebc3f
--loose-debug=d,simulate_detached_thread_refresh
--loose-debug-dbug=d,simulate_detached_thread_refresh
mysql-test/suite/innodb/r/innodb_bug59641.result
View file @ 03bebc3f
call mtr.add_suppression("Found 3 prepared XA transactions");
FLUSH TABLES;
CREATE TABLE t(a INT PRIMARY KEY, b INT)ENGINE=InnoDB;
INSERT INTO t VALUES(2,2),(4,4),(8,8),(16,16),(32,32);
......@@ -15,7 +16,6 @@ XA START '789';
UPDATE t SET b=4*a WHERE a=32;
XA END '789';
XA PREPARE '789';
call mtr.add_suppression("Found 3 prepared XA transactions");
SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
SELECT * FROM t;
a b
......
mysql-test/suite/innodb/t/innodb_bug59641.test
View file @ 03bebc3f
# Bug #59641 Prepared XA transaction causes shutdown hang after a crash
-- source include/not_embedded.inc
# The server would issue this warning on restart.
call mtr.add_suppression("Found 3 prepared XA transactions");
FLUSH TABLES;
CREATE TABLE t(a INT PRIMARY KEY, b INT)ENGINE=InnoDB;
......@@ -31,8 +32,6 @@ XA PREPARE '789';
CONNECT (con3,localhost,root,,);
CONNECTION con3;
# The server would issue this warning on restart.
call mtr.add_suppression("Found 3 prepared XA transactions");
# Kill the server without sending a shutdown command
-- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
......
mysql-test/suite/maria/r/maria-purge.result
View file @ 03bebc3f
* shut down mysqld, removed logs, restarted it
set global storage_engine=aria;
set session storage_engine=aria;
set global aria_log_file_size=4294967295;
set global aria_log_file_size=4294959104;
drop table if exists t1,t2;
SET SQL_WARNINGS=1;
CREATE TABLE t1 (
......
mysql-test/suite/maria/r/maria-recovery-big.result
View file @ 03bebc3f
set global aria_log_file_size=4294967295;
set global aria_log_file_size=4294959104;
drop database if exists mysqltest;
create database mysqltest;
use mysqltest;
......@@ -60,7 +60,7 @@ select a,length(b) from t1;
a length(b)
1 8
2 5
SET SESSION debug="+d,maria_flush_whole_log,maria_crash";
SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
* crashing mysqld intentionally
set global aria_checkpoint_interval=1;
ERROR HY000: Lost connection to MySQL server during query
......
mysql-test/suite/maria/t/maria-purge.test
View file @ 03bebc3f
......@@ -21,7 +21,7 @@ set session storage_engine=aria;
let $def_logsize=`select @@global.aria_log_file_size`;
let $def_checkinterval=`select @@global.aria_checkpoint_interval`;
set global aria_log_file_size=4294967295;
set global aria_log_file_size=4294959104;
# Initialise
--disable_warnings
drop table if exists t1,t2;
......
mysql-test/suite/maria/t/maria-recovery-big.test
View file @ 03bebc3f
......@@ -9,7 +9,7 @@
--source include/have_maria.inc
--source include/big_test.inc
set global aria_log_file_size=4294967295;
set global aria_log_file_size=4294959104;
--disable_warnings
drop database if exists mysqltest;
......
mysql-test/suite/parts/inc/partition_mgm_crash.inc
View file @ 03bebc3f
......@@ -9,7 +9,7 @@
--echo # after timed out COALESCE PARTITION
--echo # Extended crash recovery testing of fast_alter_partition_table.
call mtr.add_suppression("Attempting backtrace. You can use the following information to find out");
flush tables;
let $create_statement= CREATE TABLE t1 (a INT, b VARCHAR(64))
ENGINE = $engine
PARTITION BY LIST (a)
......
mysql-test/suite/parts/r/partition_alter2_1_maria.result
View file @ 03bebc3f
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/parts/r/partition_alter2_2_maria.result
View file @ 03bebc3f
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/parts/r/partition_debug_innodb.result
View file @ 03bebc3f
......@@ -10,6 +10,7 @@ call mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop table ");
# after timed out COALESCE PARTITION
# Extended crash recovery testing of fast_alter_partition_table.
call mtr.add_suppression("Attempting backtrace. You can use the following information to find out");
flush tables;
# Crash testing ADD PARTITION
SET SESSION debug_dbug="+d,crash_add_partition_1";
CREATE TABLE t1 (a INT, b VARCHAR(64))
......
mysql-test/suite/parts/r/partition_debug_myisam.result
View file @ 03bebc3f
......@@ -7,6 +7,7 @@ DROP TABLE IF EXISTS t1;
# after timed out COALESCE PARTITION
# Extended crash recovery testing of fast_alter_partition_table.
call mtr.add_suppression("Attempting backtrace. You can use the following information to find out");
flush tables;
# Crash testing ADD PARTITION
SET SESSION debug_dbug="+d,crash_add_partition_1";
CREATE TABLE t1 (a INT, b VARCHAR(64))
......
mysql-test/suite/perfschema/t/all_instances.test
View file @ 03bebc3f
......@@ -4,6 +4,7 @@
--source include/have_archive.inc
--source include/have_blackhole.inc
--source include/have_ssl.inc
--source include/not_windows.inc
use performance_schema;
......
mysql-test/suite/rpl/r/rpl_sync.result
View file @ 03bebc3f
......@@ -3,6 +3,7 @@ include/master-slave.inc
[connection master]
call mtr.add_suppression('Attempting backtrace');
call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
flush tables;
CREATE TABLE t1(a INT, PRIMARY KEY(a)) engine=innodb;
insert into t1(a) values(1);
insert into t1(a) values(2);
......
mysql-test/suite/rpl/t/rpl_bug41902.test
View file @ 03bebc3f
......@@ -52,10 +52,10 @@ purge binary logs to 'master-bin.000001';
--disable_query_log
call mtr.add_suppression("Failed to locate old binlog or relay log files");
call mtr.add_suppression("MYSQL_BIN_LOG::purge_logs was called with file ./master-bin.000001 not listed in the index");
call mtr.add_suppression("MYSQL_BIN_LOG::purge_logs was called with file ..master-bin.000001 not listed in the index");
connection slave;
call mtr.add_suppression("Failed to locate old binlog or relay log files");
call mtr.add_suppression("MYSQL_BIN_LOG::purge_logs was called with file ./master-bin.000001 not listed in the index");
call mtr.add_suppression("MYSQL_BIN_LOG::purge_logs was called with file ..master-bin.000001 not listed in the index");
--enable_query_log
--echo ==== clean up ====
......
mysql-test/suite/rpl/t/rpl_sync.test
View file @ 03bebc3f
......@@ -35,6 +35,7 @@
call mtr.add_suppression('Attempting backtrace');
call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
flush tables;
CREATE TABLE t1(a INT, PRIMARY KEY(a)) engine=innodb;
insert into t1(a) values(1);
......
mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result
View file @ 03bebc3f
......@@ -38,9 +38,6 @@ select @@global.aria_repair_threads;
@@global.aria_repair_threads
1
set session aria_repair_threads=cast(-1 as unsigned int);
Warnings:
Note 1105 Cast to unsigned converted negative integer to it's positive complement
Note 1105 Cast to unsigned converted negative integer to it's positive complement
select @@session.aria_repair_threads;
@@session.aria_repair_threads
18446744073709551615
......
mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result
View file @ 03bebc3f
......@@ -38,9 +38,6 @@ select @@global.aria_sort_buffer_size;
@@global.aria_sort_buffer_size
4
set session aria_sort_buffer_size=cast(-1 as unsigned int);
Warnings:
Note 1105 Cast to unsigned converted negative integer to it's positive complement
Note 1105 Cast to unsigned converted negative integer to it's positive complement
select @@session.aria_sort_buffer_size;
@@session.aria_sort_buffer_size
18446744073709551615
......
mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result
View file @ 03bebc3f
......@@ -59,7 +59,7 @@ Warnings:
Warning 1292 Truncated incorrect binlog_cache_size value: '42949672950'
SELECT @@global.binlog_cache_size;
@@global.binlog_cache_size
4294963200
42949668864
'Bug: Errors are not coming on assigning invalid values to variable'
SET @@global.binlog_cache_size = ON;
ERROR 42000: Incorrect argument type to variable 'binlog_cache_size'
......@@ -97,7 +97,7 @@ SELECT @@binlog_cache_size = @@global.binlog_cache_size;
SET binlog_cache_size = 1;
ERROR HY000: Variable 'binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
SET global.binlog_cache_size = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binlog_cache_size = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binlog_cache_size = 1' at line 1
SELECT global.binlog_cache_size;
ERROR 42S02: Unknown table 'global' in field list
SELECT binlog_cache_size = @@session.binlog_cache_size;
......
mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result
View file @ 03bebc3f
......@@ -59,7 +59,7 @@ Warnings:
Warning 1292 Truncated incorrect binlog_stmt_cache_size value: '42949672950'
SELECT @@global.binlog_stmt_cache_size;
@@global.binlog_stmt_cache_size
4294963200
42949668864
'Bug: Errors are not coming on assigning invalid values to variable'
SET @@global.binlog_stmt_cache_size = ON;
ERROR 42000: Incorrect argument type to variable 'binlog_stmt_cache_size'
......@@ -97,7 +97,7 @@ SELECT @@binlog_stmt_cache_size = @@global.binlog_stmt_cache_size;
SET binlog_stmt_cache_size = 1;
ERROR HY000: Variable 'binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
SET global.binlog_stmt_cache_size = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binlog_stmt_cache_size = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binlog_stmt_cache_size = 1' at line 1
SELECT global.binlog_stmt_cache_size;
ERROR 42S02: Unknown table 'global' in field list
SELECT binlog_stmt_cache_size = @@session.binlog_stmt_cache_size;
......
mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result
View file @ 03bebc3f
......@@ -62,11 +62,9 @@ SELECT @@session.bulk_insert_buffer_size;
429496
'#------------------FN_DYNVARS_007_05-----------------------#'
SET @@global.bulk_insert_buffer_size = 42949672950;
Warnings:
Warning 1292 Truncated incorrect bulk_insert_buffer_size value: '42949672950'
SELECT @@global.bulk_insert_buffer_size;
@@global.bulk_insert_buffer_size
4294967295
42949672950
SET @@global.bulk_insert_buffer_size = -1024;
Warnings:
Warning 1292 Truncated incorrect bulk_insert_buffer_size value: '-1024'
......@@ -80,11 +78,9 @@ ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
SET @@global.bulk_insert_buffer_size = 429496.10;
ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
SET @@session.bulk_insert_buffer_size = 42949672950;
Warnings:
Warning 1292 Truncated incorrect bulk_insert_buffer_size value: '42949672950'
SELECT @@session.bulk_insert_buffer_size;
@@session.bulk_insert_buffer_size
4294967295
42949672950
SET @@session.bulk_insert_buffer_size = -2;
Warnings:
Warning 1292 Truncated incorrect bulk_insert_buffer_size value: '-2'
......@@ -138,11 +134,11 @@ SELECT @@bulk_insert_buffer_size;
@@bulk_insert_buffer_size
1
SET local.bulk_insert_buffer_size = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1
SELECT local.bulk_insert_buffer_size;
ERROR 42S02: Unknown table 'local' in field list
SET session.bulk_insert_buffer_size = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1
SELECT session.bulk_insert_buffer_size;
ERROR 42S02: Unknown table 'session' in field list
SELECT bulk_insert_buffer_size = @@session.bulk_insert_buffer_size;
......
mysql-test/suite/sys_vars/r/debug_crc_break_basic.result
View file @ 03bebc3f
......@@ -33,8 +33,6 @@ select @@global.debug_crc_break;
@@global.debug_crc_break
0
set global debug_crc_break=cast(-1 as unsigned int);
Warnings:
Note 1105 Cast to unsigned converted negative integer to it's positive complement
select @@global.debug_crc_break;
@@global.debug_crc_break
18446744073709551615
......
mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result
View file @ 03bebc3f
......@@ -96,11 +96,11 @@ SELECT @@delayed_insert_limit;
@@delayed_insert_limit
1
SET local.delayed_insert_limit = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1
SELECT local.delayed_insert_limit;
ERROR 42S02: Unknown table 'local' in field list
SET global.delayed_insert_limit = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1
SELECT global.delayed_insert_limit;
ERROR 42S02: Unknown table 'global' in field list
SELECT delayed_insert_limit = @@session.delayed_insert_limit;
......
mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result
View file @ 03bebc3f
......@@ -94,11 +94,11 @@ SELECT @@delayed_queue_size;
@@delayed_queue_size
1
SET local.delayed_queue_size = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_queue_size = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_queue_size = 1' at line 1
SELECT local.delayed_queue_size;
ERROR 42S02: Unknown table 'local' in field list
SET global.delayed_queue_size = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_queue_size = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_queue_size = 1' at line 1
SELECT global.delayed_queue_size;
ERROR 42S02: Unknown table 'global' in field list
SELECT delayed_queue_size = @@session.delayed_queue_size;
......
mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
View file @ 03bebc3f
......@@ -73,17 +73,17 @@ Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '42949672951'
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
4294967168
42949672832
SET @@global.join_buffer_size = 65530.34;
ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
4294967168
42949672832
SET @@global.join_buffer_size = test;
ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
4294967168
42949672832
SET @@session.join_buffer_size = 0;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '0'
......@@ -107,17 +107,17 @@ Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '42949672951'
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
4294967168
42949672832
SET @@session.join_buffer_size = 65530.34;
ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
4294967168
42949672832
SET @@session.join_buffer_size = test;
ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
4294967168
42949672832
'#------------------FN_DYNVARS_053_06-----------------------#'
SELECT @@global.join_buffer_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
......
mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result
View file @ 03bebc3f
......@@ -116,11 +116,11 @@ SELECT @@key_cache_age_threshold;
@@key_cache_age_threshold
100
SET local.key_cache_age_threshold = 10;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1
SELECT local.key_cache_age_threshold;
ERROR 42S02: Unknown table 'local' in field list
SET global.key_cache_age_threshold = 10;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1
SELECT global.key_cache_age_threshold;
ERROR 42S02: Unknown table 'global' in field list
SELECT key_cache_age_threshold = @@session.key_cache_age_threshold;
......
mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result
View file @ 03bebc3f
......@@ -119,11 +119,11 @@ SELECT @@max_connect_errors;
@@max_connect_errors
5000
SET local.max_connect_errors = 7000;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_connect_errors = 7000' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_connect_errors = 7000' at line 1
SELECT local.max_connect_errors;
ERROR 42S02: Unknown table 'local' in field list
SET global.max_connect_errors = 8000;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_connect_errors = 8000' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_connect_errors = 8000' at line 1
SELECT global.max_connect_errors;
ERROR 42S02: Unknown table 'global' in field list
SELECT max_connect_errors = @@session.max_connect_errors;
......
mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result
View file @ 03bebc3f
......@@ -8,87 +8,123 @@ SELECT @start_session_value;
256
'#--------------------FN_DYNVARS_090_01-------------------------#'
SET @@global.multi_range_count = 100;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SET @@global.multi_range_count = DEFAULT;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@global.multi_range_count;
@@global.multi_range_count
256
SET @@session.multi_range_count = 200;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SET @@session.multi_range_count = DEFAULT;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@session.multi_range_count;
@@session.multi_range_count
256
'#--------------------FN_DYNVARS_090_02-------------------------#'
SET @@global.multi_range_count = DEFAULT;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@global.multi_range_count = 256;
@@global.multi_range_count = 256
1
SET @@session.multi_range_count = DEFAULT;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@session.multi_range_count = 256;
@@session.multi_range_count = 256
1
'#--------------------FN_DYNVARS_090_03-------------------------#'
SET @@global.multi_range_count = 1;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@global.multi_range_count;
@@global.multi_range_count
1
SET @@global.multi_range_count = 60020;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@global.multi_range_count;
@@global.multi_range_count
60020
SET @@global.multi_range_count = 65535;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@global.multi_range_count;
@@global.multi_range_count
65535
SET @@global.multi_range_count = 4294967295;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@global.multi_range_count;
@@global.multi_range_count
4294967295
SET @@global.multi_range_count = 4294967294;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@global.multi_range_count;
@@global.multi_range_count
4294967294
'#--------------------FN_DYNVARS_090_04-------------------------#'
SET @@session.multi_range_count = 1;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@session.multi_range_count;
@@session.multi_range_count
1
SET @@session.multi_range_count = 50050;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@session.multi_range_count;
@@session.multi_range_count
50050
SET @@session.multi_range_count = 65535;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@session.multi_range_count;
@@session.multi_range_count
65535
SET @@session.multi_range_count = 4294967295;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@session.multi_range_count;
@@session.multi_range_count
4294967295
SET @@session.multi_range_count = 4294967294;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@session.multi_range_count;
@@session.multi_range_count
4294967294
'#------------------FN_DYNVARS_090_05-----------------------#'
SET @@global.multi_range_count = 0;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
Warning 1292 Truncated incorrect multi_range_count value: '0'
SELECT @@global.multi_range_count;
@@global.multi_range_count
1
SET @@global.multi_range_count = 4294967296;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
Warning 1292 Truncated incorrect multi_range_count value: '4294967296'
SELECT @@global.multi_range_count;
@@global.multi_range_count
4294967295
SET @@global.multi_range_count = -1024;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
Warning 1292 Truncated incorrect multi_range_count value: '-1024'
SELECT @@global.multi_range_count;
@@global.multi_range_count
1
SET @@global.multi_range_count = 429496729500;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
Warning 1292 Truncated incorrect multi_range_count value: '429496729500'
SELECT @@global.multi_range_count;
@@global.multi_range_count
......@@ -105,26 +141,30 @@ SELECT @@global.multi_range_count;
4294967295
SET @@session.multi_range_count = 0;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
Warning 1292 Truncated incorrect multi_range_count value: '0'
SELECT @@session.multi_range_count;
@@session.multi_range_count
1
SET @@session.multi_range_count = 4294967296;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
Warning 1292 Truncated incorrect multi_range_count value: '4294967296'
SELECT @@session.multi_range_count;
@@session.multi_range_count
4294967295
SET @@session.multi_range_count = -1;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
Warning 1292 Truncated incorrect multi_range_count value: '-1'
SELECT @@session.multi_range_count;
@@session.multi_range_count
1
SET @@session.multi_range_count = 65530.34.;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.' at line 1
SET @@session.multi_range_count = 4294967295021;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
Warning 1292 Truncated incorrect multi_range_count value: '4294967295021'
SELECT @@session.multi_range_count;
@@session.multi_range_count
......@@ -149,22 +189,29 @@ WHERE VARIABLE_NAME='multi_range_count';
1
'#------------------FN_DYNVARS_090_08-----------------------#'
SET @@global.multi_range_count = TRUE;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@global.multi_range_count;
@@global.multi_range_count
1
SET @@global.multi_range_count = FALSE;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
Warning 1292 Truncated incorrect multi_range_count value: '0'
SELECT @@global.multi_range_count;
@@global.multi_range_count
1
'#---------------------FN_DYNVARS_090_09----------------------#'
SET @@global.multi_range_count = 10;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@multi_range_count = @@global.multi_range_count;
@@multi_range_count = @@global.multi_range_count
0
'#---------------------FN_DYNVARS_090_10----------------------#'
SET @@multi_range_count = 100;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@multi_range_count = @@local.multi_range_count;
@@multi_range_count = @@local.multi_range_count
1
......@@ -173,6 +220,8 @@ SELECT @@local.multi_range_count = @@session.multi_range_count;
1
'#---------------------FN_DYNVARS_090_11----------------------#'
SET multi_range_count = 1;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@multi_range_count;
@@multi_range_count
1
......@@ -183,10 +232,14 @@ ERROR 42S02: Unknown table 'session' in field list
SELECT multi_range_count = @@session.multi_range_count;
ERROR 42S22: Unknown column 'multi_range_count' in 'field list'
SET @@global.multi_range_count = @start_global_value;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@global.multi_range_count;
@@global.multi_range_count
256
SET @@session.multi_range_count = @start_session_value;
Warnings:
Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
SELECT @@session.multi_range_count;
@@session.multi_range_count
256
mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
View file @ 03bebc3f
......@@ -41,18 +41,6 @@ Warning 1292 Truncated incorrect query_alloc_block_size value: '1025'
SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
1024
SET @@global.query_alloc_block_size = 4294967295;
Warnings:
Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967295'
SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
4294966272
SET @@global.query_alloc_block_size = 4294967294;
Warnings:
Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967294'
SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
4294966272
SET @@global.query_alloc_block_size = 65536;
SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
......@@ -68,18 +56,6 @@ Warning 1292 Truncated incorrect query_alloc_block_size value: '1025'
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
1024
SET @@session.query_alloc_block_size = 4294967295;
Warnings:
Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967295'
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
4294966272
SET @@session.query_alloc_block_size = 4294967294;
Warnings:
Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967294'
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
4294966272
SET @@session.query_alloc_block_size = 655536;
Warnings:
Warning 1292 Truncated incorrect query_alloc_block_size value: '655536'
......@@ -105,22 +81,16 @@ Warning 1292 Truncated incorrect query_alloc_block_size value: '1023'
SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
1024
SET @@global.query_alloc_block_size = 4294967296;
Warnings:
Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967296'
SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
4294966272
SET @@global.query_alloc_block_size = 65530.34;
ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size'
SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
4294966272
1024
SET @@global.query_alloc_block_size = test;
ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size'
SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
4294966272
1024
SET @@session.query_alloc_block_size = 64;
Warnings:
Warning 1292 Truncated incorrect query_alloc_block_size value: '64'
......
mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result
View file @ 03bebc3f
......@@ -114,11 +114,11 @@ SELECT @@query_cache_limit;
@@query_cache_limit
1
SET local.query_cache_limit = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_limit = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_limit = 1' at line 1
SELECT local.query_cache_limit;
ERROR 42S02: Unknown table 'local' in field list
SET global.query_cache_limit = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_limit = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_limit = 1' at line 1
SELECT global.query_cache_limit;
ERROR 42S02: Unknown table 'global' in field list
SELECT query_cache_limit = @@session.query_cache_limit;
......
mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result
View file @ 03bebc3f
......@@ -120,11 +120,11 @@ SELECT @@query_cache_min_res_unit;
@@query_cache_min_res_unit
512
SET local.query_cache_min_res_unit = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1
SELECT local.query_cache_min_res_unit;
ERROR 42S02: Unknown table 'local' in field list
SET global.query_cache_min_res_unit = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1
SELECT global.query_cache_min_res_unit;
ERROR 42S02: Unknown table 'global' in field list
SELECT query_cache_min_res_unit = @@session.query_cache_min_res_unit;
......
mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
View file @ 03bebc3f
SET @start_value = @@global.query_cache_size;
'#--------------------FN_DYNVARS_133_01------------------------#'
SET @@global.query_cache_size = 99;
Warnings:
Warning 1292 Truncated incorrect query_cache_size value: '99'
SET @@global.query_cache_size = DEFAULT;
SELECT @@global.query_cache_size;
@@global.query_cache_size
......@@ -16,10 +18,14 @@ SELECT @@global.query_cache_size;
@@global.query_cache_size
0
SET @@global.query_cache_size = 1;
Warnings:
Warning 1292 Truncated incorrect query_cache_size value: '1'
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
SET @@global.query_cache_size = 512;
Warnings:
Warning 1292 Truncated incorrect query_cache_size value: '512'
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
......@@ -29,13 +35,13 @@ Warning 1282 Query cache failed to set size 1024; new query cache size is 0
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
: 'Bug#34880: Warnings are coming on assinging valid values to variable
'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
SET @@global.query_cache_size = 1048576;
SELECT @@global.query_cache_size;
@@global.query_cache_size
1048576
SET @@global.query_cache_size = 1048575;
Warnings:
Warning 1292 Truncated incorrect query_cache_size value: '1048575'
SELECT @@global.query_cache_size;
@@global.query_cache_size
1047552
......@@ -46,14 +52,9 @@ Warning 1292 Truncated incorrect query_cache_size value: '-1'
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
SET @@global.query_cache_size = 4294967296;
Warnings:
Warning 1292 Truncated incorrect query_cache_size value: '4294967296'
Warning 1282 Query cache failed to set size 4294966272; new query cache size is 0
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
SET @@global.query_cache_size = 511;
Warnings:
Warning 1292 Truncated incorrect query_cache_size value: '511'
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
......@@ -68,14 +69,6 @@ Warning 1292 Truncated incorrect query_cache_size value: '-1024'
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
SET @@global.query_cache_size = 42949672950;
Warnings:
Warning 1292 Truncated incorrect query_cache_size value: '42949672950'
Warning 1282 Query cache failed to set size 4294966272; new query cache size is 0
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
'Bug # 34837: Errors are not coming on assigning invalid values to variable';
SET @@global.query_cache_size = ON;
ERROR 42000: Incorrect argument type to variable 'query_cache_size'
SELECT @@global.query_cache_size;
......@@ -105,6 +98,8 @@ WHERE VARIABLE_NAME='query_cache_size';
1
'#---------------------FN_DYNVARS_133_07----------------------#'
SET @@global.query_cache_size = TRUE;
Warnings:
Warning 1292 Truncated incorrect query_cache_size value: '1'
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
......@@ -114,6 +109,8 @@ SELECT @@global.query_cache_size;
0
'#---------------------FN_DYNVARS_133_08----------------------#'
SET @@global.query_cache_size = 1;
Warnings:
Warning 1292 Truncated incorrect query_cache_size value: '1'
SELECT @@query_cache_size = @@global.query_cache_size;
@@query_cache_size = @@global.query_cache_size
1
......@@ -124,11 +121,11 @@ SELECT @@query_cache_size;
@@query_cache_size
0
SET local.query_cache_size = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_size = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_size = 1' at line 1
SELECT local.query_cache_size;
ERROR 42S02: Unknown table 'local' in field list
SET global.query_cache_size = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_size = 1' at line 1
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_size = 1' at line 1
SELECT global.query_cache_size;
ERROR 42S02: Unknown table 'global' in field list
SELECT query_cache_size = @@session.query_cache_size;
......
mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result
View file @ 03bebc3f
......@@ -5,42 +5,42 @@ SELECT @start_global_value;
'#--------------------FN_DYNVARS_142_01-------------------------#'
SET @@global.rpl_recovery_rank = 500000;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
SET @@global.rpl_recovery_rank = DEFAULT;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
0
'#--------------------FN_DYNVARS_142_02-------------------------#'
SET @@global.rpl_recovery_rank = 0;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
0
SET @@global.rpl_recovery_rank = 1024;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
1024
SET @@global.rpl_recovery_rank = 123456789;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
123456789
SET @@global.rpl_recovery_rank = 2147483648*2;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
Warning 1292 Truncated incorrect rpl_recovery_rank value: '4294967296'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
4294967295
SET @@global.rpl_recovery_rank = 2147483648*1024;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
Warning 1292 Truncated incorrect rpl_recovery_rank value: '2199023255552'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
......@@ -50,7 +50,7 @@ SELECT @@global.rpl_recovery_rank;
4294967295
SET @@global.rpl_recovery_rank = 2147483648*2147483648;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
Warning 1292 Truncated incorrect rpl_recovery_rank value: '4611686018427387904'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
......@@ -65,21 +65,21 @@ ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set
'#------------------FN_DYNVARS_142_04-----------------------#'
SET @@global.rpl_recovery_rank = -1;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
Warning 1292 Truncated incorrect rpl_recovery_rank value: '-1'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
0
SET @@global.rpl_recovery_rank = -2147483648;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
Warning 1292 Truncated incorrect rpl_recovery_rank value: '-2147483648'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
0
SET @@global.rpl_recovery_rank = -2147483649;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
Warning 1292 Truncated incorrect rpl_recovery_rank value: '-2147483649'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
......@@ -93,7 +93,7 @@ ERROR 42000: Incorrect argument type to variable 'rpl_recovery_rank'
'#------------------FN_DYNVARS_142_05-----------------------#'
SET @@global.rpl_recovery_rank = 3000;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
SELECT @@global.rpl_recovery_rank = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='rpl_recovery_rank';
......@@ -108,20 +108,20 @@ count(VARIABLE_VALUE)
'#------------------FN_DYNVARS_142_07-----------------------#'
SET @@global.rpl_recovery_rank = TRUE;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
1
SET @@global.rpl_recovery_rank = FALSE;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
0
'#---------------------FN_DYNVARS_001_08----------------------#'
SET @@global.rpl_recovery_rank = 512;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
SELECT @@rpl_recovery_rank = @@global.rpl_recovery_rank;
@@rpl_recovery_rank = @@global.rpl_recovery_rank
1
......@@ -135,10 +135,10 @@ SELECT @@rpl_recovery_rank;
512
SET global rpl_recovery_rank = 64;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
SET @@global.rpl_recovery_rank = @start_global_value;
Warnings:
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
0
mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
View file @ 03bebc3f
......@@ -62,21 +62,21 @@ SELECT @@global.sort_buffer_size;
SET @@global.sort_buffer_size = -1024;
SELECT @@global.sort_buffer_size;
@@global.sort_buffer_size
32768
1024
SET @@global.sort_buffer_size = 4294967296;
SELECT @@global.sort_buffer_size;
@@global.sort_buffer_size
4294967295
4294967296
SET @@global.sort_buffer_size = 65530.34;
ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
SELECT @@global.sort_buffer_size;
@@global.sort_buffer_size
4294967295
4294967296
SET @@global.sort_buffer_size = test;
ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
SELECT @@global.sort_buffer_size;
@@global.sort_buffer_size
4294967295
4294967296
SET @@session.sort_buffer_size = 32775;
SELECT @@session.sort_buffer_size;
@@session.sort_buffer_size
......@@ -84,13 +84,13 @@ SELECT @@session.sort_buffer_size;
SET @@session.sort_buffer_size = -2;
SELECT @@session.sort_buffer_size;
@@session.sort_buffer_size
32768
1024
SET @@session.sort_buffer_size = 65530.34;
ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
SET @@session.sort_buffer_size = 4294967296;
SELECT @@session.sort_buffer_size;
@@session.sort_buffer_size
4294967295
4294967296
SET @@session.sort_buffer_size = test;
ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
'#------------------FN_DYNVARS_151_06-----------------------#'
......@@ -107,11 +107,11 @@ INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
SET @@global.sort_buffer_size = TRUE;
SELECT @@global.sort_buffer_size;
@@global.sort_buffer_size
32768
1024
SET @@global.sort_buffer_size = FALSE;
SELECT @@global.sort_buffer_size;
@@global.sort_buffer_size
32768
1024
'#---------------------FN_DYNVARS_151_09----------------------#'
SET @@global.sort_buffer_size = 9000;
SELECT @@sort_buffer_size = @@global.sort_buffer_size;
......@@ -129,7 +129,7 @@ SELECT @@local.sort_buffer_size = @@session.sort_buffer_size;
SET sort_buffer_size = 9100;
SELECT @@sort_buffer_size;
@@sort_buffer_size
32768
9100
SELECT local.sort_buffer_size;
ERROR 42S02: Unknown table 'local' in field list
SELECT session.sort_buffer_size;
......
mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result
View file @ 03bebc3f
......@@ -6,7 +6,6 @@ SET @start_session_value = @@session.transaction_prealloc_size;
SELECT @start_session_value;
@start_session_value
4096
'Bug# 34876: This variable has invalid default value as compared to documentation';
'#--------------------FN_DYNVARS_005_01-------------------------#'
SET @@global.transaction_prealloc_size = 100;
Warnings:
......@@ -37,23 +36,19 @@ SELECT @@global.transaction_prealloc_size;
@@global.transaction_prealloc_size
1024
SET @@global.transaction_prealloc_size = 60020;
Warnings:
Warning 1292 Truncated incorrect transaction_prealloc_size value: '60020'
SELECT @@global.transaction_prealloc_size;
@@global.transaction_prealloc_size
59392
SET @@global.transaction_prealloc_size = 4294966272;
SELECT @@global.transaction_prealloc_size;
@@global.transaction_prealloc_size
4294966272
'#--------------------FN_DYNVARS_005_04-------------------------#'
SET @@session.transaction_prealloc_size = 1024;
SELECT @@session.transaction_prealloc_size;
@@session.transaction_prealloc_size
1024
SET @@session.transaction_prealloc_size =4294966272;
SELECT @@session.transaction_prealloc_size;
@@session.transaction_prealloc_size
4294966272
SET @@session.transaction_prealloc_size = 65535;
Warnings:
Warning 1292 Truncated incorrect transaction_prealloc_size value: '65535'
SELECT @@session.transaction_prealloc_size;
@@session.transaction_prealloc_size
64512
......@@ -70,7 +65,6 @@ Warning 1292 Truncated incorrect transaction_prealloc_size value: '-1024'
SELECT @@global.transaction_prealloc_size;
@@global.transaction_prealloc_size
1024
'Bug # 34837: Errors are not coming on assigning invalid values to variable';
SET @@global.transaction_prealloc_size = ON;
ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
SET @@global.transaction_prealloc_size = OFF;
......@@ -115,12 +109,6 @@ SELECT @@session.transaction_prealloc_size;
1024
SET @@session.transaction_prealloc_size = "Test";
ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
SET @@session.transaction_prealloc_size = 123456789031;
Warnings:
Warning 1292 Truncated incorrect transaction_prealloc_size value: '123456789031'
SELECT @@session.transaction_prealloc_size;
@@session.transaction_prealloc_size
4294966272
'#------------------FN_DYNVARS_005_06-----------------------#'
SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
......@@ -140,7 +128,7 @@ Warnings:
Warning 1292 Truncated incorrect transaction_prealloc_size value: '10'
SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
@@transaction_prealloc_size = @@global.transaction_prealloc_size
0
1
'#---------------------FN_DYNVARS_001_10----------------------#'
SET @@transaction_prealloc_size = 100;
Warnings:
......@@ -153,6 +141,8 @@ SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size;
1
'#---------------------FN_DYNVARS_001_11----------------------#'
SET transaction_prealloc_size = 1027;
Warnings:
Warning 1292 Truncated incorrect transaction_prealloc_size value: '1027'
SELECT @@transaction_prealloc_size;
@@transaction_prealloc_size
1024
......
mysql-test/suite/sys_vars/t/aria_pagecache_age_threshold_basic.test
View file @ 03bebc3f
......@@ -42,6 +42,7 @@ select @@global.aria_pagecache_age_threshold;
set global aria_pagecache_age_threshold=@@global.aria_pagecache_age_threshold + 100;
select @@global.aria_pagecache_age_threshold;
set global aria_pagecache_age_threshold=cast(-1 as unsigned int);
--replace_result 4294967200 18446744073709551600
select @@global.aria_pagecache_age_threshold;
SET @@global.aria_pagecache_age_threshold = @start_global_value;
mysql-test/suite/sys_vars/t/aria_repair_threads_basic.test
View file @ 03bebc3f
......@@ -36,7 +36,10 @@ set global aria_repair_threads="foo";
#
set global aria_repair_threads=0;
select @@global.aria_repair_threads;
--disable_warnings
set session aria_repair_threads=cast(-1 as unsigned int);
--enable_warnings
--replace_result 4294967295 18446744073709551615
select @@session.aria_repair_threads;
SET @@global.aria_repair_threads = @start_global_value;
......
mysql-test/suite/sys_vars/t/aria_sort_buffer_size_basic.test
View file @ 03bebc3f
......@@ -36,7 +36,10 @@ set global aria_sort_buffer_size="foo";
#
set global aria_sort_buffer_size=0;
select @@global.aria_sort_buffer_size;
--disable_warnings
set session aria_sort_buffer_size=cast(-1 as unsigned int);
--enable_warnings
--replace_result 4294967295 18446744073709551615
select @@session.aria_sort_buffer_size;
SET @@global.aria_sort_buffer_size = @start_global_value;
......
mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/binlog_cache_size_basic.inc
mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/binlog_cache_size_basic.inc
mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test
View file @ 03bebc3f
......@@ -2,6 +2,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc
mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test
View file @ 03bebc3f
......@@ -2,6 +2,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc
mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
mysql-test/suite/sys_vars/t/debug_crc_break_basic.test
View file @ 03bebc3f
......@@ -37,7 +37,10 @@ set global debug_crc_break="foo";
#
set global debug_crc_break=0;
select @@global.debug_crc_break;
--disable_warnings
set global debug_crc_break=cast(-1 as unsigned int);
--enable_warnings
--replace_result 4294967295 18446744073709551615
select @@global.debug_crc_break;
SET @@global.debug_crc_break = @start_global_value;
mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/delayed_insert_limit_basic.inc
mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/delayed_insert_limit_basic.inc
mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/delayed_queue_size_basic.inc
mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/delayed_queue_size_basic.inc
mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/join_buffer_size_basic.inc
mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/join_buffer_size_basic.inc
mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/key_cache_age_threshold_basic.inc
mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/key_cache_age_threshold_basic.inc
mysql-test/suite/sys_vars/t/log_warnings_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/log_warnings_basic.inc
mysql-test/suite/sys_vars/t/log_warnings_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/log_warnings_basic.inc
mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/max_connect_errors_basic.inc
mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/max_connect_errors_basic.inc
mysql-test/suite/sys_vars/t/max_heap_table_size_basic.test
View file @ 03bebc3f
......@@ -111,28 +111,38 @@ SET @@global.max_heap_table_size = 1024;
SELECT @@global.max_heap_table_size;
SET @@global.max_heap_table_size = 16383;
SELECT @@global.max_heap_table_size;
--disable_warnings
SET @@global.max_heap_table_size = 4294967296;
--enable_warnings
--replace_result 4294966272 4294967296
SELECT @@global.max_heap_table_size;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.max_heap_table_size = 65530.34;
--replace_result 4294966272 4294967296
SELECT @@global.max_heap_table_size;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.max_heap_table_size = test;
--replace_result 4294966272 4294967296
SELECT @@global.max_heap_table_size;
SET @@session.max_heap_table_size = -1;
SELECT @@session.max_heap_table_size;
SET @@session.max_heap_table_size = 16383;
SELECT @@session.max_heap_table_size;
--disable_warnings
SET @@session.max_heap_table_size = 4294967296;
--enable_warnings
--replace_result 4294966272 4294967296
SELECT @@session.max_heap_table_size;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@session.max_heap_table_size = 65530.34;
SET @@session.max_heap_table_size = 10737418241;
--replace_result 4294966272 10737418240
SELECT @@session.max_heap_table_size;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@session.max_heap_table_size = test;
--replace_result 4294966272 10737418240
SELECT @@session.max_heap_table_size;
......
mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/max_seeks_for_key_basic.inc
mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/max_seeks_for_key_basic.inc
mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/max_tmp_tables_basic.inc
mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/max_tmp_tables_basic.inc
mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/max_write_lock_count_basic.inc
mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/max_write_lock_count_basic.inc
mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/min_examined_row_limit_basic.inc
mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/min_examined_row_limit_basic.inc
mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/multi_range_count_basic.inc
mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/multi_range_count_basic.inc
mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/myisam_repair_threads_basic.inc
mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/myisam_repair_threads_basic.inc
mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/net_retry_count_basic.inc
mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/net_retry_count_basic.inc
mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/query_alloc_block_size_basic.inc
mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/query_alloc_block_size_basic.inc
mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/query_cache_limit_basic.inc
mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/query_cache_limit_basic.inc
mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/query_cache_size_basic.inc
mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/query_cache_size_basic.inc
mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/range_alloc_block_size_basic.inc
mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/range_alloc_block_size_basic.inc
mysql-test/suite/sys_vars/t/rowid_merge_buff_size_basic.test
View file @ 03bebc3f
......@@ -36,6 +36,7 @@ set global rowid_merge_buff_size="foo";
set global rowid_merge_buff_size=0;
select @@global.rowid_merge_buff_size;
set session rowid_merge_buff_size=cast(-1 as unsigned int);
--replace_result 2147483647 9223372036854775807 4294967295 9223372036854775807
select @@session.rowid_merge_buff_size;
SET @@global.rowid_merge_buff_size = @start_global_value;
......
mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/rpl_recovery_rank_basic.inc
mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/rpl_recovery_rank_basic.inc
mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/slave_transaction_retries_basic.inc
mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/slave_transaction_retries_basic.inc
mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/sort_buffer_size_basic.inc
mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/sort_buffer_size_basic.inc
mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 32 bit machines #
################################################################################
--source include/have_32bit.inc
--source include/have_32bit_ulong.inc
--source suite/sys_vars/inc/transaction_prealloc_size_basic.inc
mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test
View file @ 03bebc3f
......@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
--source include/have_64bit.inc
--source include/have_64bit_ulong.inc
--source suite/sys_vars/inc/transaction_prealloc_size_basic.inc
mysql-test/valgrind.supp
View file @ 03bebc3f
......@@ -1153,6 +1153,15 @@
fun:pthread_create*
}
{
memory "leak" in backtrace() of glibc 2.9 (not present in 2.13)
Memcheck:Leak
fun:malloc
...
fun:pthread_once
fun:backtrace
}
#
# Bug in Glibc 2.9: http://sourceware.org/bugzilla/show_bug.cgi?id=10391
# Fixed in latest Glibc, but suppressed here for running tests on hosts
......
mysys/CMakeLists.txt
View file @ 03bebc3f
......@@ -66,7 +66,7 @@ ENDIF()
ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES})
TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY}
${LIBNSL} ${LIBM} ${LIBRT})
${LIBNSL} ${LIBM} ${LIBRT} ${LIBSOCKET})
DTRACE_INSTRUMENT(mysys)
IF(HAVE_BFD_H)
......
mysys/safemalloc.c
View file @ 03bebc3f
......@@ -280,8 +280,8 @@ static int bad_ptr(const char *where, void *ptr)
magicend[2] != MAGICEND2 ||
magicend[3] != MAGICEND3)
{
warn("Error: %s overrun buffer", where);
fprintf(stderr, ", allocated at ");
warn("Error: %s overrun buffer ", where);
fprintf(stderr, "Allocated at ");
print_stack(irem->frame);
return 1;
}
......
sql/sql_base.cc
View file @ 03bebc3f
......@@ -1454,11 +1454,6 @@ void close_thread_tables(THD *thd)
TABLE *table;
DBUG_ENTER("close_thread_tables");
#ifdef WITH_ARIA_STORAGE_ENGINE
if (!thd->in_sub_stmt)
ha_maria::implicit_commit(thd, FALSE);
#endif
#ifdef EXTRA_DEBUG
DBUG_PRINT("tcache", ("open tables:"));
for (table= thd->open_tables; table; table= table->next)
......
sql/sql_parse.cc
View file @ 03bebc3f
......@@ -1055,10 +1055,14 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
! thd->is_error())
{
/*
Multiple queries exits, execute them individually
Multiple queries exist, execute them individually
*/
char *beginning_of_next_stmt= (char*) parser_state.m_lip.found_semicolon;
#ifdef WITH_ARIA_STORAGE_ENGINE
ha_maria::implicit_commit(thd, FALSE);
#endif
/* Finalize server status flags after executing a statement. */
thd->update_server_status();
thd->protocol->end_statement();
......@@ -4476,6 +4480,9 @@ case SQLCOM_PREPARE:
trans_commit_stmt(thd);
thd->stmt_da->can_overwrite_status= FALSE;
}
#ifdef WITH_ARIA_STORAGE_ENGINE
ha_maria::implicit_commit(thd, FALSE);
#endif
}
lex->unit.cleanup();
......
sql/sql_partition.cc
View file @ 03bebc3f
......@@ -71,9 +71,8 @@
#ifdef WITH_PARTITION_STORAGE_ENGINE
#include "ha_partition.h"
/* TODO: Change abort() to DBUG_SUICIDE() when bug#52002 is pushed */
#define ERROR_INJECT_CRASH(code) \
DBUG_EVALUATE_IF(code, (abort(), 0), 0)
DBUG_EVALUATE_IF(code, (DBUG_SUICIDE(), 0), 0)
#define ERROR_INJECT_ERROR(code) \
DBUG_EVALUATE_IF(code, (my_error(ER_UNKNOWN_ERROR, MYF(0)), TRUE), 0)
......
sql/sys_vars.cc
View file @ 03bebc3f
......@@ -1147,6 +1147,11 @@ static Sys_var_ulonglong Sys_max_heap_table_size(
VALID_RANGE(16384, (ulonglong)~(intptr)0), DEFAULT(16*1024*1024),
BLOCK_SIZE(1024));
/*
"pseudo_thread_id" variable used in the test suite to detect 32/64bit
systems. If you change it to something else then ulong then fix the tests
in mysql-test/include/have_32bit.inc and have_64bit.inc.
*/
static Sys_var_ulong Sys_pseudo_thread_id(
"pseudo_thread_id",
"This variable is for internal server use",
......
sql/table.cc
View file @ 03bebc3f
......@@ -5621,6 +5621,7 @@ void TABLE::create_key_part_by_field(KEY *keyinfo,
keyinfo->key_length+= HA_KEY_NULL_LENGTH;
}
if (field->type() == MYSQL_TYPE_BLOB ||
field->type() == MYSQL_TYPE_GEOMETRY ||
field->real_type() == MYSQL_TYPE_VARCHAR)
{
key_part_info->store_length+= HA_KEY_BLOB_LENGTH;
......
storage/maria/ma_write.c
View file @ 03bebc3f
......@@ -472,10 +472,11 @@ static my_bool _ma_ck_write_btree_with_log(MARIA_HA *info, MARIA_KEY *key,
int error;
my_off_t new_root= *root;
uchar key_buff[MARIA_MAX_KEY_BUFF];
MARIA_KEY org_key;
MARIA_KEY org_key; /* Set/used when now_transactional=TRUE */
my_bool transactional= share->now_transactional;
DBUG_ENTER("_ma_ck_write_btree_with_log");
if (share->now_transactional)
if (transactional)
{
/* Save original value as the key may change */
org_key= *key;
......@@ -483,7 +484,7 @@ static my_bool _ma_ck_write_btree_with_log(MARIA_HA *info, MARIA_KEY *key,
}
error= _ma_ck_real_write_btree(info, key, &new_root, comp_flag);
if (!error && share->now_transactional)
if (!error && transactional)
{
/* Log the original value */
*key= org_key;
......
win/build-vs10.bat deleted 100644 → 0
View file @ 062e12a1
@echo off
REM Copyright (C) 2010 Monty Program AB
REM
REM This program is free software; you can redistribute it and/or modify
REM it under the terms of the GNU General Public License as published by
REM the Free Software Foundation; version 2 of the License.
REM
REM This program is distributed in the hope that it will be useful,
REM but WITHOUT ANY WARRANTY; without even the implied warranty of
REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
REM GNU General Public License for more details.
REM
REM You should have received a copy of the GNU General Public License
REM along with this program; if not, write to the Free Software
REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
cmake -G "Visual Studio 10"
win/build-vs10_x64.bat deleted 100644 → 0
View file @ 062e12a1
@echo off
REM Copyright (C) 2010 Monty Program AB
REM
REM This program is free software; you can redistribute it and/or modify
REM it under the terms of the GNU General Public License as published by
REM the Free Software Foundation; version 2 of the License.
REM
REM This program is distributed in the hope that it will be useful,
REM but WITHOUT ANY WARRANTY; without even the implied warranty of
REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
REM GNU General Public License for more details.
REM
REM You should have received a copy of the GNU General Public License
REM along with this program; if not, write to the Free Software
REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
cmake -G "Visual Studio 10 Win64"
win/build_maria_release.bat deleted 100644 → 0
View file @ 062e12a1
set build_64_bit=
set build_msi=
set generator=
set scriptdir=%~dp0
:: Process all the arguments from the command line
::
:process_arguments
if "%~1"=="" goto :do_work
if "%~1"=="-h" goto :help
if "%~1"=="-msi" set build_msi=1
if "%~1"=="-G" set generator=-G "%~2"
shift
goto :process_arguments
:help
echo "build_maria_release [-h] [-msi] [-G <Generator>]"
:die
echo error occured.
popd
exit /b 1
:do_work
:: We're doing out-of-source build to ensure nobody has broken it:)
pushd %scriptdir%
cd ..
rd /s /q xxx
mkdir xxx
cd xxx
cmake .. -DWITH_EMBEDDED_SERVER=1 %generator%
if %ERRORLEVEL% NEQ 0 goto :die
cmake --build . --config Debug
if %ERRORLEVEL% NEQ 0 goto :die
cmake --build . --config RelWithDebInfo --target package
if %ERRORLEVEL% NEQ 0 goto :die
if "%build_msi%"=="1" (
cmake --build . --config RelWithDebInfo --target win\packaging\msi
if %ERRORLEVEL% NEQ 0 goto :die
)
xcopy /y *.zip ..
xcopy /y *.msi ..
popd
\ No newline at end of file
win/configure-mariadb.bat deleted 100644 → 0
View file @ 062e12a1
cscript win\configure.js ^
WITH_EXAMPLE_STORAGE_ENGINE ^
WITH_FEDERATEDX_STORAGE_ENGINE ^
WITH_MERGE_STORAGE_ENGINE ^
WITH_PARTITION_STORAGE_ENGINE ^
WITH_ARIA_STORAGE_ENGINE ^
WITH_PBXT_STORAGE_ENGINE ^
WITH_XTRADB_STORAGE_ENGINE ^
WITH_FEEDBACK_STORAGE_ENGINE
win/configure-mariadb.sh deleted 100644 → 0
View file @ 062e12a1
#!/bin/sh
#
# This script is the "standard" way to configure MariaDB on Windows. To be
# used by buildbot slaves and release build script.
#
set -e
cscript win/configure.js \
WITH_ARCHIVE_STORAGE_ENGINE \
WITH_BLACKHOLE_STORAGE_ENGINE \
WITH_CSV_STORAGE_ENGINE \
WITH_EXAMPLE_STORAGE_ENGINE \
WITH_FEDERATEDX_STORAGE_ENGINE \
WITH_MERGE_STORAGE_ENGINE \
WITH_PARTITION_STORAGE_ENGINE \
WITH_ARIA_STORAGE_ENGINE \
WITH_PBXT_STORAGE_ENGINE \
WITH_XTRADB_STORAGE_ENGINE \
WITH_FEEDBACK_STORAGE_ENGINE \
WITH_EMBEDDED_SERVER
win/make_mariadb_win_dist deleted 100644 → 0
View file @ 062e12a1
#!/bin/sh
#
# This is a script that one needs to run in the source tarball to build
# a MariaDB release for Windows
#
set -e
usage()
{
cat <<EOF
Usage: $0 [-h] [-64] [-nobuild]
-h, --help Show this help message.
-64 Build a 64 bit distribution.
-nobuild Don't run cmake and devenv, only do the packaging.
The default is to the builds and create 32 bit packages.
EOF
}
if test -f win/build_maria_release.bat
then
cmd /c win\\build_maria_release.bat "$@"
exit $?
fi
# The default settings
CMAKE_GENERATOR="Visual Studio 9 2008"
ARCH="win32"
RUNBUILD="yes"
parse_options()
{
while test $# -gt 0
do
case "$1" in
-64)
CMAKE_GENERATOR="Visual Studio 9 2008 Win64"
ARCH="win64"
;;
-nobuild)
RUNBUILD="no"
;;
-h | --help)
usage
exit 0;;
*)
echo "Unknown option '$1'"
usage
exit 1;;
esac
shift
done
}
########################################################################
if test ! -f sql/mysqld.cc
then
echo "You must run this script from the MySQL top-level directory"
exit 1
fi
if [ ! -d win/data ] ; then
echo This doesnt seem to be source tarball.
echo This script should be run from the top directory of the source tarball
echo that was produced by 'make dist'
exit 1;
fi
parse_options "$@"
set -x
if [ "$RUNBUILD" == "yes" ]; then
sh win/configure-mariadb.sh
cmake -G "$CMAKE_GENERATOR"
devenv.com MySQL.sln /build RelWithDebInfo
devenv.com MySQL.sln /build Debug
fi
VER=`cat configure.in |
perl -e 'while (<>) { if (/^AC_INIT\(\[[a-zA-Z ]*\], *\[([0-9a-zA-Z\.-]+)\]/) { print "$1\n"; exit(0)} } ; exit 1'`
echo Version string: $VER.
# Remove '-mariaDB' from version number
VER_NO_MARIA=${VER/-MariaDB/}
# We want the final zip to be named like this:
# mariadb-noinstall-5.1.38-win32.zip
ZIPNAME=mariadb-noinstall-$VER_NO_MARIA-$ARCH
ZIPFILE=$ZIPNAME.zip
# The top directory inside the zip should be called like this:
# mariadb-5.1-38-$ARCH
ZIPCONTENT=mariadb-$VER_NO_MARIA-$ARCH
# This will make $ZIPCONTENT.zip
sh -x scripts/make_win_bin_dist $ZIPCONTENT
mv $ZIPCONTENT.zip $ZIPFILE
#rm -rf unpack
#mkdir unpack
#cd unpack
#wget -O base.list.gz \
#http://askmonty.org/wiki/images/5/57/Mariadb-5.1-pre-beta-file-list-r2.txt.gz
#gunzip base.list.gz
#unzip ../$ZIPFILE
#(cd $ZIPCONTENT; /bin/find . | sort ) > new.list
#diff -u base.list new.list || true
#RES=$?
#cd ..
#rm -rf unpack
ls -lah $ZIPFILE
echo "$ZIPFILE is the Windows noinstall binary zip"
#if [ $RES ] ; then
# echo "Archive contents differ from the standard file list, check the diff output above"
#else
# echo "Archive contents match the standard list, OK"
#fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7