diff options
author | Monty <monty@mariadb.org> | 2015-12-10 12:39:54 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2015-12-10 12:39:54 +0200 |
commit | 44b107da90a106c128dca278d04c68d804e51497 (patch) | |
tree | 023c5e15cd3fad5392377859de5a5655cb44c1cc /mysql-test/suite/galera/r/galera_many_tables_pk.result | |
parent | 33f0cf71196d3d2869ccfcbf1c41a0a6709fe8df (diff) | |
download | mariadb-git-44b107da90a106c128dca278d04c68d804e51497.tar.gz |
Fixed a bug in galera + some failing galera tests
- Added missning setting of table->rpl_write_set in record_gtid(), required by galera
- Removed output of WSREP_PATCH_VERSION from galera_defaults, as this can change over time
- Limit galera_many_tables_pk and galera_many_tables_nopk to 900, as
on many systems the default open table limit is 1024
Diffstat (limited to 'mysql-test/suite/galera/r/galera_many_tables_pk.result')
-rw-r--r-- | mysql-test/suite/galera/r/galera_many_tables_pk.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/suite/galera/r/galera_many_tables_pk.result b/mysql-test/suite/galera/r/galera_many_tables_pk.result index 6b6899d979d..d0aa1694e85 100644 --- a/mysql-test/suite/galera/r/galera_many_tables_pk.result +++ b/mysql-test/suite/galera/r/galera_many_tables_pk.result @@ -1,18 +1,18 @@ -SELECT COUNT(*) = 1000 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME LIKE 't%'; -COUNT(*) = 1000 +SELECT COUNT(*) = 900 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME LIKE 't%'; +COUNT(*) = 900 1 SET AUTOCOMMIT=OFF; START TRANSACTION; COMMIT; CREATE TABLE sum_table (f1 INTEGER); -SELECT SUM(f1) = 1000 FROM sum_table; -SUM(f1) = 1000 +SELECT SUM(f1) = 900 FROM sum_table; +SUM(f1) = 900 1 SET AUTOCOMMIT=OFF; START TRANSACTION; SET AUTOCOMMIT=OFF; START TRANSACTION; -UPDATE t1000 SET f1 = 3; +UPDATE t900 SET f1 = 3; COMMIT; COMMIT; ERROR 40001: Deadlock found when trying to get lock; try restarting transaction |