1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-30 05:23:50 +03:00
Commit Graph

4784 Commits

Author SHA1 Message Date
unknown
35b2883643 merge 5.5 -> 10.0-base 2013-08-20 14:48:29 +03:00
Igor Babaev
4eddb2c221 Merge 5.3->5.5.
In particular:
Merged the patch for bug mdev-4418 from 5.3 into 5.5.
Fixed a bug in the patch that should be backported to 5.3.
2013-08-18 19:58:51 -07:00
Andrew McDonnell
6686a4eb51 Tests for bug #1213120 2013-08-17 00:13:18 +09:30
Andrew McDonnell
007ff24cd4 Another variant of 796647 2013-08-16 23:56:19 +09:30
Andrew McDonnell
da87bf53c7 Regression tests for 796647 2013-08-16 23:51:27 +09:30
unknown
f0deff867a MDEV-4820: Empty master does not give error for slave GTID position that does not exist in the binlog
The main bug here was the following situation:

Suppose we set up a completely new master2 as an extra multi-master to an
existing slave that already has a different master1 for domain_id=0. When the
slave tries to connect to master2, master2 will not have anything that slave
requests in domain_id=0, but that is fine as master2 is supposedly meant to
serve eg. domain_id=1. (This is MDEV-4485).

But suppose that master2 then actually starts sending events from
domain_id=0. In this case, the fix for MDEV-4485 was incomplete, and the code
would fail to give the error that the position requested by the slave in
domain_id=0 was missing from the binlogs of master2. This could lead to lost
events or completely wrong replication.

The patch for this bug fixes this issue.

In addition, it cleans up the code a bit, getting rid of the fake_gtid_hash in
the code. And the error message when slave and master have diverged due to
alternate future is clarified, as requested in the bug description.
2013-08-16 15:10:25 +02:00
Igor Babaev
960720b10d Merge 5.2->5.3 2013-08-15 14:04:20 -07:00
Andrew McDonnell
6e97d93c13 Test case for lp:1133093 order by seq crash 2013-08-15 23:25:56 +09:30
Andrew McDonnell
3723b5bfb7 Test results for 1134355 2013-08-15 23:25:17 +09:30
Andrew McDonnell
f69f62741a Disable ALTER for oqgraph. Fixes crash. 2013-08-15 22:54:14 +09:30
Sergei Golubchik
3462b6d3d2 fix tests that were relying on @@have_partitioning
sql/sql_partition_admin.cc:
  compilation failures w/o partitioning
2013-08-15 10:47:18 +02:00
Sergei Golubchik
51e2806661 raise a version 2013-08-14 18:56:41 +02:00
Sergey Vojtovich
b7f9c89423 MDEV-4702 - Reduce usage of LOCK_open
Following variables do not require LOCK_open protection anymore:
- table_def_cache (renamed to tdc_hash) is protected by rw-lock
  LOCK_tdc_hash;
- table_def_shutdown_in_progress doesn't need LOCK_open protection;
- last_table_id use atomics;
- TABLE_SHARE::ref_count (renamed to TABLE_SHARE::tdc.ref_count)
  is protected by TABLE_SHARE::tdc.LOCK_table_share;
- TABLE_SHARE::next, ::prev (renamed to tdc.next and tdc.prev),
  oldest_unused_share, end_of_unused_share are protected by
  LOCK_unused_shares;
- TABLE_SHARE::m_flush_tickets (renamed to tdc.m_flush_tickets)
  is protected by TABLE_SHARE::tdc.LOCK_table_share;
- refresh_version (renamed to tdc_version) use atomics.
2013-08-14 12:48:50 +04:00
Sergei Golubchik
b882a3e83e MDEV-4492 InnoDB generates non-existing link to manual based on the server version 2013-08-13 16:02:10 +02:00
Sergei Golubchik
fcf87600a2 MDEV-4865 Change related to --log option/variable was merged partially
Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk
(WL#5185 Remove deprecated 5.1 features)
2013-08-13 13:35:36 +02:00
Andrew McDonnell
8fceadc73b Updated regression test to force repeat of 1134355. A 'fix' in sql_table, causes assertion in ha_oqgraph 2013-08-11 00:30:55 +09:30
Andrew McDonnell
a4ab3fc633 Test cleanup 2013-08-10 20:49:50 +09:30
Andrew McDonnell
56d3c792af Deal with properly 2013-08-10 20:34:20 +09:30
Andrew McDonnell
653659fa98 test harness for isnull behaviour 2013-08-10 18:55:04 +09:30
Andrew McDonnell
3408a6c5f1 Clean up test case 2013-08-09 22:31:25 +09:30
Andrew McDonnell
54e60bcb46 Add latch='0' test for completeness' 2013-08-09 21:15:12 +09:30
Andrew McDonnell
db048e7855 Updated unit test results arising from prior bugs 2013-08-09 20:59:58 +09:30
Andrew McDonnell
55d9cfc848 Regression test for 1196036 dijkstra weights 2013-08-09 20:57:23 +09:30
Andrew McDonnell
f26fce0925 Regression test for #1196027 2013-08-09 20:25:24 +09:30
Andrew McDonnell
863cfb7e7c Regression test for #1196020 2013-08-09 20:22:05 +09:30
Igor Babaev
5d20f7b346 Added missing tests for innodb persistent statistics (from mysql-5.6.10)
Made sure that innodb tables for persistent statistics would not
considered by the server as system tables.
2013-08-07 17:08:51 -07:00
Igor Babaev
1b6e66fa20 Added missing tests for GET DIAGNOSTICS. 2013-08-07 13:18:26 -07:00
Sergey Vojtovich
45f8bcb282 Attempt to fix sproadic failures of rpl.rpl_err_ignoredtable.
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
  Wait until thread is killed.
2013-08-07 15:55:17 +04:00
Sergey Vojtovich
5997156b9b MDEV-4801 - Server crashes in my_strdup on setting
innodb_ft_user_stopword_table to DEFAULT

Setting plugin string variable with PLUGIN_VAR_MEMALLOC flag
to NULL causes server crash.

mysql-test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result:
  Reset innodb_ft_user_stopword_table. Also tests MDEV-4801.
mysql-test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test:
  Reset innodb_ft_user_stopword_table. Also tests MDEV-4801.
sql/sql_plugin.cc:
  When we got NULL value, do not strdup(NULL).
2013-08-06 14:02:07 +04:00
Sergey Petrunya
96340a405a Automatic merge 2013-08-05 20:59:15 +04:00
Sergey Petrunya
c98cd2c816 Update test results after fix for MDEV-4687 2013-08-05 20:57:48 +04:00
Elena Stepanova
32e56e7e14 The test was non-deterministic while choosing an alternative storage
engine
2013-08-05 18:42:22 +04:00
Elena Stepanova
f596d28df6 Deliberate change in behavior introduced along with the fix for MDEV-4310 2013-08-05 18:30:12 +04:00
Sergey Vojtovich
d845bcc3dc MDEV-4786 - merge 10.0-monty - 10.0
Fixed perfschema.relaylog failure.

mysql-test/suite/perfschema/r/relaylog.result:
  Failed file opens are not shown in P_S. Relevant revision:
  marc.alff@oracle.com-20120807154151-cwuazxu341rvrnmg
2013-08-02 19:52:26 +04:00
Andrew McDonnell
73c19f8473 Update test case regression test comment for lp:1196027 2013-08-02 20:36:45 +09:30
Andrew McDonnell
e87960d346 Fix for spurious result when searching for non-existing vertex 2013-08-02 20:36:04 +09:30
Sergey Vojtovich
3a1e8226e7 MDEV-4786 - merge 10.0-monty - 10.0
Fixed parts.partition_mgm_lc2_innodb, parts.partition_mgm_lc2_archive,
parts.partition_mgm_lc2_memory, parts.partition_mgm_lc2_myisam failures.

Applied lost changes from revision
mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t

mysql-test/suite/parts/r/partition_mgm_lc2_archive.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
mysql-test/suite/parts/r/partition_mgm_lc2_memory.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
2013-08-01 22:13:06 +04:00
Sergey Vojtovich
d89b19d432 MDEV-4786 - merge 10.0-monty - 10.0
Fixed funcs_1.is_statistics_mysql_embedded, funcs_1.is_columns_mysql_embedded,
funcs_1.is_table_constraints_mysql_embedded, funcs_1.is_tables_mysql_embedded
failures.

mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result:
  Applied same changes as to non-embedded counterpart.
mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result:
  Applied same changes as to non-embedded counterpart.
mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result:
  Applied same changes as to non-embedded counterpart.
mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result:
  Applied same changes as to non-embedded counterpart.
2013-08-01 16:04:13 +04:00
unknown
edcae48734 MDEV-4823: Server crashes in Item_func_not::fix_fields on creating a table with a virtual column using NOT
fix_field() call protocol was brocken (zero pointer passed as link to item which is possible only if you are sure that there can not be Items which transforms).
2013-08-01 09:25:50 +03:00
Sergey Vojtovich
bdb7af8dd9 MDEV-4786 - merge 10.0-monty - 10.0
Fixed parts.partition_alter1_1_2_innodb, parts.partition_alter1_2_innodb,
parts.partition_alter2_1_1_innodb, parts.partition_alter2_1_2_innodb,
parts.partition_alter2_2_1_innodb, parts.partition_alter2_2_2_innodb,
parts.partition_alter4_innodb failures.

mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
mysql-test/suite/parts/r/partition_alter1_2_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
mysql-test/suite/parts/r/partition_alter4_innodb.result:
  Reverted some changes to test case as InnoDB doesn't support
  REPAIR TABLE and we didn't merge the following revision, which
  implements REPAIR TABLE for partitioning:
  mattias.jonsson@oracle.com-20130130165152-o4tivhs5ty6n6nqa
2013-07-30 17:54:40 +04:00
Sergey Vojtovich
bdbdbb82f4 MDEV-4786 - merge 10.0-monty - 10.0
Fixed parts.partition_alter1_1_innodb failure.

mysql-test/suite/parts/t/partition_alter1_1_innodb.test:
  Applied hunk from 5.6 test: test takes long time, so only run it with
  the --big-test mtr-flag.
2013-07-30 17:50:48 +04:00
Sergey Vojtovich
9fff3f5b5c MDEV-4786 - merge 10.0-monty - 10.0
Fixed innodb.innodb_mysql failure.

mysql-test/include/mix1.inc:
  Applied hunk from 5.6 test: error text has changed during merge.
2013-07-30 17:47:53 +04:00
Sergey Vojtovich
0f985c6407 MDEV-4786 - merge 10.0-monty - 10.0
Fixed archive.archive failure.

Applied remnants of two revisions, which were partially merged.

Rev. 3225.1.1 (5.0 compatibility):

  BUG#11756687 - 48633: ARCHIVE TABLES ARE NOT UPGRADEABLE

  Archive table created by 5.0 were not accessible.

  This patch adds various fixes so that 5.0 archive tables
  are readable and writable. Though it is strongly recommended
  to avoid binary upgrade of archive tables whenever it is
  possible.

Rev. 3710 (due to valgrind warnings):

  Bug#13907676: HA_ARCHIVE::INFO
  In WL#4305 the refactoring of the archive writer,
  it could flush the writer when it was not yet open.

  This was due to if bulk insert was used but no
  rows was actually inserted (write_row was never called),
  the writer was marked dirty even if it was not open.

  Fix was to only mark it as dirty if it was opened.

mysql-test/std_data/bug48633.ARM:
  A test case for BUG#11756687: archive table created by 5.0.95.
mysql-test/std_data/bug48633.ARZ:
  A test case for BUG#11756687: archive table created by 5.0.95.
mysql-test/std_data/bug48633.frm:
  A test case for BUG#11756687: archive table created by 5.0.95.
mysql-test/suite/archive/archive.result:
  Modified a test case for BUG#47012 according to fix for
  BUG#11756687.
  Added a test case for BUG#11756687.
mysql-test/suite/archive/archive.test:
  Modified a test case for BUG#47012 according to fix for
  BUG#11756687.
  Added a test case for BUG#11756687.
  
  No need to remove .ARM files anymore: DROP TABLE will take
  care of them.
storage/archive/azio.c:
  Do not write AZIO (v.3) header to GZIO file (v.1).
  
  Added initialization of various azio_stream members
  to read_header() so it can proceed with v.1 format.
  
  Update data start position only when reading first
  GZIO header. That is only on azopen(), but never on
  azread().
storage/archive/ha_archive.cc:
  Removed guardians that were rejecting to open v.1 archive
  tables.
  
  Reload .frm when repairing v.1 tables - they didn't have
  storage for .frm.
  
  Do not flush write stream when it is not open.
  
  Let DROP TABLE remove 5.0 .ARM files.
2013-07-29 18:08:49 +04:00
Venkatesh Duggirala
eb152f86af BUG#16290902 DROP TEMP TABLE IF EXISTS CAN CAUSE POINT
IN TIME RECOVERY FAILURE ON SLAVES

Problem:
DROP TEMP TABLE IF EXISTS commands can cause point
in time recovery (re-applying binlog) failures.

Analyses:
In RBR, 'DROP TEMPORARY TABLE' commands are
always binlogged by adding 'IF EXISTS' clauses.
Also, the slave SQL thread will not check replicate.* filter
rules for "DROP TEMPORARY TABLE IF EXISTS" queries.
If log-slave-updates is enabled on slave, these queries
will be binlogged in the format of "USE `db`;
DROP TEMPORARY TABLE IF EXISTS `t1`;" irrespective
of filtering rules and irrespective of the `db` existence.
When users try to recover slave from it's own binlog,
use `db` command might fail if `db` is not present on slave.

Fix:
At the time of writing the 'DROP TEMPORARY TABLE
IF EXISTS' query into the binlog, 'use `db`' will not be
present and the table name in the query will be a fully
qualified table name.
Eg:
'USE `db`; DROP TEMPORARY TABLE IF EXISTS `t1`;'
will be logged as
'DROP TEMPORARY TABLE IF EXISTS `db`.`t1`;'.
2013-07-27 17:35:02 +05:30
Sergey Vojtovich
50aaf5ceb1 MDEV-4786 - merge 10.0-monty - 10.0
Fixed innodb.help_url failure.

mysql-test/suite/innodb/r/help_url.result:
  Accessing discarded tablespace doesn't cause loud error message anymore.
  Use different way to retrieve refman link.
mysql-test/suite/innodb/t/help_url.test:
  Accessing discarded tablespace doesn't cause loud error message anymore.
  Use different way to retrieve refman link.
2013-07-24 16:48:23 +04:00
Astha Pareek
b5071f8229 BUG#12535301- SYS_VARS.RPL_INIT_SLAVE_FUNC MISMATCHES IN DAILY-5.5
Problem:
sys_vars.rpl_init_slave_func test was failing sporadically 
on 5.5+.

Fix:
Added assert condition after wait for checks.
Recorded test and enabled it.
2013-07-23 18:18:19 +05:30
Astha Pareek
c38ddd971e BUG#16295518 - SYS_VARS.RPL_INIT_SLAVE_FUNC IS FAILING ON MYSQL-5.1
BUG#12535301- SYS_VARS.RPL_INIT_SLAVE_FUNC MISMATCHES IN DAILY-5.5 

Problem:
sys_vars.rpl_init_slave_func test was not recorded after
the last edit. It was disabled on 5.1 after seeing failures
due to the above reason.
No old failures as this suite never ran with pb2 on 5.1

Fix:
Added assert condition after wait for checks.
Recorded test and enabled it.
2013-07-23 18:13:43 +05:30
Sergei Golubchik
13dca0125a more post-merge fixes:
* update results
* don't force HA_CREATE_DELAY_KEY_WRITE on all temp tables,
  (bad for CREATE ... LIKE) instead imply it in myisam/aria
* restore HA_ERR_TABLE_DEF_CHANGED in archive
* increase the default number of rwlock classes in P_S to fit all our rwlocks
2013-07-21 19:24:20 +02:00
Sergei Golubchik
b7b5f6f1ab 10.0-monty merge
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
2013-07-21 16:39:19 +02:00
Sergei Golubchik
5f6380adde 10.0-base merge 2013-07-18 16:46:57 +02:00