Navigation Menu

Skip to content

Commit

Permalink
* Fixed debian dist file names.
Browse files Browse the repository at this point in the history
* Fixed failing test results.
* Updated tztime.cc (lp:1161432).
  • Loading branch information
Nirbhay Choubey committed Jan 31, 2014
1 parent 4a6be51 commit 4d254ef
Show file tree
Hide file tree
Showing 14 changed files with 6 additions and 1 deletion.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions mysql-test/suite/parts/r/partition_exch_qa_10.result
Expand Up @@ -26,6 +26,7 @@ SET @@autocommit= OFF;
SHOW VARIABLES LIKE '%autocommit%';
Variable_name Value
autocommit OFF
wsrep_retry_autocommit 1
CREATE TRIGGER test_trg_1 BEFORE UPDATE ON tp FOR EACH ROW
BEGIN
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
Expand Down
3 changes: 2 additions & 1 deletion mysql-test/t/mysqld--help.test
Expand Up @@ -20,7 +20,8 @@ perl;
# their paths may vary:
@skipvars=qw/basedir open-files-limit general-log-file log plugin-dir
log-slow-queries pid-file slow-query-log-file log-basename
datadir slave-load-tmpdir tmpdir socket thread-pool-size/;
datadir slave-load-tmpdir tmpdir socket thread-pool-size
wsrep-node-name/;

# Plugins which may or may not be there:
@plugins=qw/innodb ndb archive blackhole federated partition ndbcluster
Expand Down
3 changes: 3 additions & 0 deletions sql/tztime.cc
Expand Up @@ -2590,6 +2590,9 @@ main(int argc, char **argv)
return 1;
}

// Replicate MyISAM DDL for this session, cf. lp:1161432
printf("SET SESSION wsrep_replicate_myisam=ON;\n");

if (argc == 2)
{
root_name_end= strmake_buf(fullname, argv[1]);
Expand Down

0 comments on commit 4d254ef

Please sign in to comment.