mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Automerge with 5.1
This commit is contained in:
Michael Widenius
@@ -7,6 +7,7 @@
|
||||
|
||||
|
||||
# BINLOG statement does not work in embedded mode.
|
||||
source include/have_log_bin.inc;
|
||||
source include/not_embedded.inc;
|
||||
|
||||
disable_warnings;
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
# Related bugs: BUG#27779, BUG#31581, BUG#31582, BUG#31583, BUG#32407
|
||||
|
||||
source include/have_log_bin.inc;
|
||||
source include/not_embedded.inc;
|
||||
|
||||
--disable_warnings
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=2
|
||||
--loose-innodb_lock_wait_timeout=2
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=2
|
||||
--loose-innodb_lock_wait_timeout=2
|
||||
|
||||
30
mysql-test/suite/federated/federated_bug_32426.result
Normal file
30
mysql-test/suite/federated/federated_bug_32426.result
Normal file
@@ -0,0 +1,30 @@
|
||||
CREATE DATABASE federated;
|
||||
CREATE DATABASE federated;
|
||||
#
|
||||
# Bug #32426: FEDERATED query returns corrupt results for ORDER BY
|
||||
# on a TEXT column
|
||||
#
|
||||
CREATE TABLE federated.t1(a TEXT);
|
||||
INSERT INTO federated.t1 VALUES('abc'), ('gh'), ('f'), ('ijk'), ('de');
|
||||
CREATE TABLE federated.t1(a TEXT) ENGINE=FEDERATED
|
||||
CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';
|
||||
SELECT * FROM federated.t1 ORDER BY A;
|
||||
a
|
||||
abc
|
||||
de
|
||||
f
|
||||
gh
|
||||
ijk
|
||||
SELECT * FROM federated.t1 ORDER BY A DESC;
|
||||
a
|
||||
ijk
|
||||
gh
|
||||
f
|
||||
de
|
||||
abc
|
||||
DROP TABLE federated.t1;
|
||||
DROP TABLE federated.t1;
|
||||
DROP TABLE IF EXISTS federated.t1;
|
||||
DROP DATABASE IF EXISTS federated;
|
||||
DROP TABLE IF EXISTS federated.t1;
|
||||
DROP DATABASE IF EXISTS federated;
|
||||
24
mysql-test/suite/federated/federated_bug_32426.test
Normal file
24
mysql-test/suite/federated/federated_bug_32426.test
Normal file
@@ -0,0 +1,24 @@
|
||||
source federated.inc;
|
||||
|
||||
--echo #
|
||||
--echo # Bug #32426: FEDERATED query returns corrupt results for ORDER BY
|
||||
--echo # on a TEXT column
|
||||
--echo #
|
||||
connection slave;
|
||||
CREATE TABLE federated.t1(a TEXT);
|
||||
INSERT INTO federated.t1 VALUES('abc'), ('gh'), ('f'), ('ijk'), ('de');
|
||||
|
||||
connection master;
|
||||
--replace_result $SLAVE_MYPORT SLAVE_PORT
|
||||
eval CREATE TABLE federated.t1(a TEXT) ENGINE=FEDERATED
|
||||
CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
|
||||
SELECT * FROM federated.t1 ORDER BY A;
|
||||
SELECT * FROM federated.t1 ORDER BY A DESC;
|
||||
DROP TABLE federated.t1;
|
||||
|
||||
connection slave;
|
||||
DROP TABLE federated.t1;
|
||||
|
||||
connection default;
|
||||
|
||||
source federated_cleanup.inc;
|
||||
@@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
||||
@@ -213,7 +213,7 @@ id name
|
||||
alter server s1 options (database 'db_bogus');
|
||||
flush tables;
|
||||
select * from federated.t1;
|
||||
ERROR 42000: Got error: 1044 : Access denied for user 'test_fed'@'localhost' to database 'db_bogus'
|
||||
ERROR 42000: Received error: 1044 : Access denied for user 'test_fed'@'localhost' to database 'db_bogus'
|
||||
drop server if exists 's1';
|
||||
ERROR 42000: Access denied; you need the SUPER privilege for this operation
|
||||
create server 's1' foreign data wrapper 'mysql' options
|
||||
|
||||
@@ -3,9 +3,10 @@
|
||||
|
||||
[mysqld.1]
|
||||
log-bin= master-bin
|
||||
loose-federated
|
||||
|
||||
[mysqld.2]
|
||||
|
||||
loose-federated
|
||||
|
||||
[ENV]
|
||||
MASTER_MYPORT= @mysqld.1.port
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
--source include/not_embedded.inc
|
||||
# This test depends on having the PBXT information_schema stuff.
|
||||
--source include/have_pbxt.inc
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_xtradb.inc
|
||||
|
||||
let $my_where = WHERE table_schema = 'information_schema'
|
||||
|
||||
@@ -1 +1 @@
|
||||
--binlog_cache_size=32768 --innodb_lock_wait_timeout=1
|
||||
--binlog_cache_size=32768 --loose-innodb_lock_wait_timeout=1
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=2
|
||||
--loose-innodb_lock_wait_timeout=2
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb-autoinc-lock-mode=0
|
||||
--loose-innodb-autoinc-lock-mode=0
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb --innodb_autoinc_lock_mode=0
|
||||
--loose-innodb --loose-innodb_autoinc_lock_mode=0
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb-file-per-table=1
|
||||
--loose-innodb-file-per-table=1
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=1
|
||||
--loose-innodb_lock_wait_timeout=1
|
||||
|
||||
@@ -1 +1 @@
|
||||
--log-bin --innodb-locks-unsafe-for-binlog --binlog-format=mixed
|
||||
--loose-innodb-locks-unsafe-for-binlog --binlog-format=mixed
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
-- source include/have_innodb.inc
|
||||
-- source include/have_log_bin.inc
|
||||
|
||||
create table bug53674(a int)engine=innodb;
|
||||
insert into bug53674 values (1),(2);
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=1
|
||||
--loose-innodb_lock_wait_timeout=1
|
||||
|
||||
@@ -1 +1 @@
|
||||
--binlog_cache_size=32768 --innodb_lock_wait_timeout=1
|
||||
--binlog_cache_size=32768 --loose-innodb_lock_wait_timeout=1
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb-lock-wait-timeout=2
|
||||
--loose-innodb-lock-wait-timeout=2
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=1 --innodb_rollback_on_timeout=1
|
||||
--loose-innodb_lock_wait_timeout=1 --loose-innodb_rollback_on_timeout=1
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=2 --innodb_rollback_on_timeout
|
||||
--loose-innodb_lock_wait_timeout=2 --loose-innodb_rollback_on_timeout
|
||||
|
||||
12
mysql-test/suite/innodb_plugin/combinations
Normal file
12
mysql-test/suite/innodb_plugin/combinations
Normal file
@@ -0,0 +1,12 @@
|
||||
[innodb_plugin]
|
||||
ignore-builtin-innodb
|
||||
plugin-load=$HA_INNODB_PLUGIN_SO
|
||||
innodb
|
||||
|
||||
[xtradb_plugin]
|
||||
ignore-builtin-innodb
|
||||
plugin-load=$HA_XTRADB_SO
|
||||
innodb
|
||||
|
||||
[xtradb]
|
||||
innodb
|
||||
19
mysql-test/suite/innodb_plugin/suite.pm
Normal file
19
mysql-test/suite/innodb_plugin/suite.pm
Normal file
@@ -0,0 +1,19 @@
|
||||
package My::Suite::InnoDB_plugin;
|
||||
|
||||
@ISA = qw(My::Suite);
|
||||
|
||||
############# initialization ######################
|
||||
my @combinations;
|
||||
|
||||
push @combinations, 'innodb_plugin' if $ENV{HA_INNODB_PLUGIN_SO};
|
||||
push @combinations, 'xtradb_plugin' if $ENV{HA_XTRADB_SO};
|
||||
push @combinations, 'xtradb' if $::mysqld_variables{'innodb'} eq "ON";
|
||||
|
||||
return "Neither innodb_plugin nor xtradb are available" unless @combinations;
|
||||
|
||||
$ENV{INNODB_PLUGIN_COMBINATIONS}=join ':', @combinations
|
||||
unless $ENV{INNODB_PLUGIN_COMBINATIONS};
|
||||
|
||||
############# return an object ######################
|
||||
bless { };
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=2
|
||||
--loose-innodb_lock_wait_timeout=2
|
||||
|
||||
@@ -1 +1 @@
|
||||
--binlog_cache_size=32768 --innodb_lock_wait_timeout=1
|
||||
--binlog_cache_size=32768 --loose-innodb_lock_wait_timeout=1
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=2
|
||||
--loose-innodb_lock_wait_timeout=2
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb-use-sys-malloc=true
|
||||
--loose-innodb-use-sys-malloc=true
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb-autoinc-lock-mode=0
|
||||
--loose-innodb-autoinc-lock-mode=0
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb --innodb_autoinc_lock_mode=0
|
||||
--loose-innodb_autoinc_lock_mode=0
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb-file-per-table=1
|
||||
--loose-innodb-file-per-table=1
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_commit_concurrency=1
|
||||
--loose-innodb_commit_concurrency=1
|
||||
|
||||
@@ -1 +1 @@
|
||||
--log-bin --innodb-locks-unsafe-for-binlog --binlog-format=mixed
|
||||
--log-bin=master-bin --loose-innodb-locks-unsafe-for-binlog --binlog-format=mixed
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=1
|
||||
--loose-innodb_lock_wait_timeout=1
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb-lock-wait-timeout=2
|
||||
--loose-innodb-lock-wait-timeout=2
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=1 --innodb_rollback_on_timeout=1
|
||||
--loose-innodb_lock_wait_timeout=1 --loose-innodb_rollback_on_timeout=1
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=2 --innodb_rollback_on_timeout
|
||||
--loose-innodb_lock_wait_timeout=2 --loose-innodb_rollback_on_timeout
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb --default-storage-engine=innodb
|
||||
--loose-innodb --default-storage-engine=innodb
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_file_per_table=1
|
||||
--loose-innodb_file_per_table=1
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=2
|
||||
--loose-innodb_lock_wait_timeout=2
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
!include include/default_mysqld.cnf
|
||||
|
||||
[mysqld.1]
|
||||
pbxt
|
||||
default-storage-engine=pbxt
|
||||
|
||||
[ENV]
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
--default-storage-engine=pbxt
|
||||
@@ -1 +1 @@
|
||||
--innodb_doublewrite_file=ib_doublewrite
|
||||
--loose-innodb_doublewrite_file=ib_doublewrite
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
||||
@@ -8,8 +8,6 @@
|
||||
|
||||
log-bin= master-bin
|
||||
|
||||
loose-innodb
|
||||
|
||||
[mysqld.2]
|
||||
# Run the slave.sh script before starting this process
|
||||
#!run-slave-sh
|
||||
@@ -18,7 +16,6 @@ loose-innodb
|
||||
# starting the mysqld
|
||||
#!use-slave-opt
|
||||
|
||||
log-bin= slave-bin
|
||||
relay-log= slave-relay-bin
|
||||
|
||||
init-rpl-role= slave
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb --binlog-ignore-db=db2
|
||||
--loose-innodb --binlog-ignore-db=db2
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb --replicate-do-db=db1
|
||||
--loose-innodb --replicate-do-db=db1
|
||||
|
||||
@@ -2,19 +2,19 @@
|
||||
|
||||
[mysqld.1]
|
||||
log-slave-updates
|
||||
innodb
|
||||
loose-innodb
|
||||
|
||||
[mysqld.2]
|
||||
log-slave-updates
|
||||
innodb
|
||||
loose-innodb
|
||||
|
||||
[mysqld.3]
|
||||
log-slave-updates
|
||||
innodb
|
||||
loose-innodb
|
||||
|
||||
[mysqld.4]
|
||||
log-slave-updates
|
||||
innodb
|
||||
loose-innodb
|
||||
|
||||
[ENV]
|
||||
SLAVE_MYPORT1= @mysqld.3.port
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb-lock-wait-timeout=1
|
||||
--loose-innodb-lock-wait-timeout=1
|
||||
|
||||
1
mysql-test/suite/rpl/t/rpl_ddl-slave.opt
Normal file
1
mysql-test/suite/rpl/t/rpl_ddl-slave.opt
Normal file
@@ -0,0 +1 @@
|
||||
--loose-skip-innodb
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096
|
||||
--loose-innodb-lock-wait-timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_autoinc_lock_mode=0
|
||||
--loose-innodb-autoinc-lock-mode=0
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_autoinc_lock_mode=0
|
||||
--loose-innodb-autoinc-lock-mode=0
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_autoinc_lock_mode=0
|
||||
--loose-innodb-autoinc-lock-mode=0
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb_lock_wait_timeout=60
|
||||
--loose-innodb-lock-wait-timeout=60
|
||||
|
||||
@@ -4,6 +4,11 @@
|
||||
# TODO: Remove statement include once 12574 is patched
|
||||
--source include/have_binlog_format_mixed_or_statement.inc
|
||||
--source include/master-slave.inc
|
||||
--source include/have_innodb.inc
|
||||
connection slave;
|
||||
--source include/have_innodb.inc
|
||||
connection master;
|
||||
|
||||
|
||||
CALL mtr.add_suppression("Statement may not be safe to log in statement format.");
|
||||
|
||||
@@ -506,11 +511,9 @@ sync_slave_with_master;
|
||||
|
||||
connection master;
|
||||
source include/master-slave-reset.inc;
|
||||
source include/have_innodb.inc;
|
||||
connection slave;
|
||||
source include/have_innodb.inc;
|
||||
|
||||
connection master;
|
||||
|
||||
create table t1 ( f int ) engine = innodb;
|
||||
create table log ( r int ) engine = myisam;
|
||||
create trigger tr
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb --default-storage-engine=innodb --ndbcluster=0
|
||||
--loose-innodb --default-storage-engine=innodb --ndbcluster=0
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb --loose-ndbcluster=OFF --log-slave-updates=0
|
||||
--loose-innodb --loose-ndbcluster=OFF --log-slave-updates=0
|
||||
|
||||
@@ -2,15 +2,12 @@
|
||||
|
||||
[mysqld.1.1]
|
||||
server-id= 1
|
||||
log-bin
|
||||
|
||||
[mysqld.2.1]
|
||||
server-id= 1
|
||||
log-bin
|
||||
|
||||
[mysqld.1.slave]
|
||||
server-id= 2
|
||||
log-bin
|
||||
skip-slave-start
|
||||
|
||||
[mysqld.2.slave]
|
||||
@@ -21,7 +18,6 @@ master-password= @mysqld.2.1.#password
|
||||
master-user= @mysqld.2.1.#user
|
||||
master-connect-retry= 1
|
||||
init-rpl-role= slave
|
||||
log-bin
|
||||
skip-slave-start
|
||||
ndb_connectstring= @mysql_cluster.slave.ndb_connectstring
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb --ndbcluster
|
||||
--loose-innodb --ndbcluster
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb --ndbcluster --replicate-ignore-table=mysql.ndb_apply_status
|
||||
--loose-innodb --ndbcluster --replicate-ignore-table=mysql.ndb_apply_status
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb --default-storage-engine=innodb
|
||||
--loose-innodb --default-storage-engine=innodb
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
||||
@@ -1 +1 @@
|
||||
--secure-file-priv=$MYSQL_TEST_DIR --innodb
|
||||
--secure-file-priv=$MYSQL_TEST_DIR --loose-innodb
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
--innodb-autoinc-lock-mode=1
|
||||
--loose-innodb-autoinc-lock-mode=1
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
--log-bin
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
||||
@@ -1 +1 @@
|
||||
--innodb
|
||||
--loose-innodb
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
--innodb
|
||||
--innodb_lock_wait_timeout=2
|
||||
--loose-innodb
|
||||
--loose-innodb_lock_wait_timeout=2
|
||||
--binlog-format=row
|
||||
Reference in New Issue
Block a user