1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Commit Graph

112 Commits

Author SHA1 Message Date
Nirbhay Choubey
9d911608f1 Fixes for some test failures. 2014-04-09 12:25:47 -04:00
Nirbhay Choubey
a500865c13 Merged revision 3471, 3472 & 3473 from maria-5.5-galera. 2014-03-27 16:22:57 -04:00
Nirbhay Choubey
43c6c2ac77 Merged r3468 from maria-5.5-galera. 2014-03-27 08:22:29 -04:00
Nirbhay Choubey
7fd382f117 Merged r3466 from maria-5.5-galera. 2014-03-27 08:17:24 -04:00
Nirbhay Choubey
653ef22336 MDEV#5687: Maria doesn't shutdown following upgrade
to 5.5.35-galera

Restored patch for MDEV#4136 and added a test.
2014-03-06 18:44:16 -05:00
Nirbhay Choubey
27c09524eb MDEV#5790 : SHOW GLOBAL STATUS LIKE does not show
the correct list of variables when using "_"

Fixed the type for offending "wsrep", wrongly
set to SHOW_SIMPLE_FUNC.

Added a test case.
2014-03-04 22:10:28 -05:00
Nirbhay Choubey
c3a2394641 * Merged revisions 3945, 3946..3950, 3951..3961
from codership-mysql/5.5.
* Merged changes in innobase to xtradb.
* Updated WSREP_PATCH_REVNO.
2014-02-28 13:56:08 -05:00
Nirbhay Choubey
e36fe045c0 Added MTR support for galera.
* include/galera_cluster.inc : Configures galera cluster with 2 nodes.
* include/galera_init.inc : Opens named connection with all the nodes.
* include/galera_end.inc : Closes all the connections.
* include/galera_connect.inc : Opens a named connection with a single
  node.
* include/galera_diff.inc : Runs a specified SQL query on all the nodes
  and diffs the output.
2014-02-25 13:13:39 -05:00
Nirbhay Choubey
8e476e6cbe MDEV#5534: mysql_tzinfo_to_sql generates wrong query
mysql_tzinfo_to_sql tries to set wsrep_replicate_myisam
as SESSION variable, while its a GLOBAL-only system variable,
and thus the resulting sql would fail to load.

Fixed by changing the scope to GLOBAL in the SET command.

Also added following include files to facilitate testing :
* include/have_wsrep.inc
* include/not_wsrep.inc
* include/have_wsrep_enabled.inc
2014-02-14 11:38:46 -05:00
Nirbhay Choubey
4a6be51f78 * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.
* Fixed Debian/Ubuntu dist files.
* Fixed some compiler warnings.
2014-01-30 12:45:38 -05:00
Jan Lindström
9379edb63d MDEV-4227: Galera server should stop crashing on setting binlog_format STATEMENT
Analysis: Currently you can set binlog_format to STATEMENT or MIXED 
even when they are not really supported by galera.

Fix: Produce an error message if binlog_format is set to STATEMENT
or MIXED and wsrep_on = ON. Added a test case for this.
2013-12-02 08:58:06 +02:00
Nirbhay Choubey
6271c06a73 MDEV-4222: Assertion `( ((global_system_variables.wsrep_on) &&
(thd && thd->variables.wsrep_on)) && wsrep_emulate_bin_log) ||
  mysql_bin_log .is_open()' fails on SAVEPOINT with disabled
  wsrep_provider

As wsrep_on system variable is ON by default the binlog handlerton
is implicitly enabled during the server initialization phase. Later,
while wsrep plugin is getting initialized, wsrep_on in corrected &
turned OFF in case wsrep provider is not specified (leaving binlog
in ON state!). This leads to the reported assertion.

Fixed by adding another check for wsrep provider before binlog
is enabled.

Added a test case.
2013-11-29 12:50:31 -05:00