database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Monty
2019-09-02 14:06:56 +03:00
parent b0ff5a6a73 9cba6c5aa3
commit a071e0e029
671 changed files with 11116 additions and 14190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/main/variables-notembedded.result
View File

@ -33,12 +33,12 @@ ERROR HY000: Variable 'log_slave_updates' is a read only variable
#
SHOW VARIABLES like 'relay_log';
Variable_name Value
relay_log mysqld-relay-bin
relay_log XXX-relay-bin
SELECT @@session.relay_log;
ERROR HY000: Variable 'relay_log' is a GLOBAL variable
SELECT @@global.relay_log;
@@global.relay_log
mysqld-relay-bin
XXX-relay-bin
SET @@session.relay_log= 'x';
ERROR HY000: Variable 'relay_log' is a read only variable
SET @@global.relay_log= 'x';
@ -46,12 +46,12 @@ ERROR HY000: Variable 'relay_log' is a read only variable
#
SHOW VARIABLES like 'relay_log_basename';
Variable_name Value
relay_log_basename MYSQLTEST_VARDIR/mysqld.1/data/mysqld-relay-bin
relay_log_basename MYSQLTEST_VARDIR/mysqld.1/data/XXX-relay-bin
SELECT @@session.relay_log_basename;
ERROR HY000: Variable 'relay_log_basename' is a GLOBAL variable
SELECT @@global.relay_log_basename;
@@global.relay_log_basename
MYSQLTEST_VARDIR/mysqld.1/data/mysqld-relay-bin
MYSQLTEST_VARDIR/mysqld.1/data/XXX-relay-bin
SET @@session.relay_log_basename= 'x';
ERROR HY000: Variable 'relay_log_basename' is a read only variable
SET @@global.relay_log_basename= 'x';
@ -72,12 +72,12 @@ ERROR HY000: Variable 'log_bin_basename' is a read only variable
#
SHOW VARIABLES like 'relay_log_index';
Variable_name Value
relay_log_index MYSQLTEST_VARDIR/mysqld.1/data/mysqld-relay-bin.index
relay_log_index MYSQLTEST_VARDIR/mysqld.1/data/XXX-relay-bin.index
SELECT @@session.relay_log_index;
ERROR HY000: Variable 'relay_log_index' is a GLOBAL variable
SELECT @@global.relay_log_index;
@@global.relay_log_index
MYSQLTEST_VARDIR/mysqld.1/data/mysqld-relay-bin.index
MYSQLTEST_VARDIR/mysqld.1/data/XXX-relay-bin.index
SET @@session.relay_log_index= 'x';
ERROR HY000: Variable 'relay_log_index' is a read only variable
SET @@global.relay_log_index= 'x';
@ -152,6 +152,7 @@ ERROR HY000: Variable 'slave_skip_errors' is a read only variable
# ARE NOT BEING HONORED
#
CREATE TABLE t1 (a MEDIUMTEXT);
set @save_max_allowed_packet=@@global.max_allowed_packet, @save_net_buffer_length=@@net_buffer_length;
SET GLOBAL max_allowed_packet=2048;
Warnings:
Warning 1708 The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
@ -170,7 +171,7 @@ connection default;
disconnect con1;
SELECT LENGTH(a) FROM t1;
LENGTH(a)
SET GLOBAL max_allowed_packet=default;
SET GLOBAL net_buffer_length=default;
SET GLOBAL max_allowed_packet=@save_max_allowed_packet;
SET GLOBAL net_buffer_length=@save_net_buffer_length;
DROP TABLE t1;
End of 5.1 tests