diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2008-12-10 10:02:25 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2008-12-10 10:02:25 +0100 |
| commit | 926aaf4635c16f64d46d4fcbbbefb3aefca7a601 (patch) | |
| tree | dca0acd2a01c113582c29effe5312d2ffc0fb398 /mysql-test/t/sync_frm_basic.test | |
| parent | ba816c14a9bc8012759da9d58f858f1e73bec708 (diff) | |
| parent | 7f91cf0861fb4e318b973c0fe1a2e632e9b587ea (diff) | |
| download | mariadb-git-926aaf4635c16f64d46d4fcbbbefb3aefca7a601.tar.gz | |
Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, mysys/mf_keycache.c, mysql-test/t/*myisam*
since previous merge. MARIA_PAGECACHE_READS in maria-preload.test are down a little bit (5%), which must be a good
side-effect of some sql/ change.
Diffstat (limited to 'mysql-test/t/sync_frm_basic.test')
| -rw-r--r-- | mysql-test/t/sync_frm_basic.test | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/sync_frm_basic.test b/mysql-test/t/sync_frm_basic.test index 6c00182a805..af268fd2c44 100644 --- a/mysql-test/t/sync_frm_basic.test +++ b/mysql-test/t/sync_frm_basic.test @@ -34,6 +34,8 @@ ################################################################ SET @start_value = @@global.sync_frm; +# In some cases the server may have been started with --disable-sync-frm +--replace_column 1 VAL SELECT @start_value; @@ -155,9 +157,9 @@ SELECT sync_frm = @@session.sync_frm; ############################## SET @@global.sync_frm = @start_value; +--replace_column 1 VAL SELECT @@global.sync_frm; - ###################################################### # END OF sync_frm TESTS # ###################################################### |