diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-04-01 11:34:52 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-04-01 11:34:52 +0200 |
| commit | c71aae73f6f864c97cf17b3e872346666b871c3f (patch) | |
| tree | 4895816aee1a0fcef08daa0f68bf1b1fe9aa2b5a /mysql-test/suite/maria | |
| parent | 3c59ba32ab9cca29e01bd8dd2130af83ead8bde0 (diff) | |
| parent | 7ca1ebd83a1a7d291593be7a94f5a37298dfc863 (diff) | |
| download | mariadb-git-c71aae73f6f864c97cf17b3e872346666b871c3f.tar.gz | |
merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except
those of davi.arnaut@sun.com-20090219210935-9vilvcisyyieffxl (TODO).
Diffstat (limited to 'mysql-test/suite/maria')
| -rw-r--r-- | mysql-test/suite/maria/r/maria-preload.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/maria/r/maria-preload.result b/mysql-test/suite/maria/r/maria-preload.result index 1fa4222416b..b7c65ba8bb4 100644 --- a/mysql-test/suite/maria/r/maria-preload.result +++ b/mysql-test/suite/maria/r/maria-preload.result @@ -136,7 +136,7 @@ MARIA_PAGECACHE_READS 274 load index into cache t3, t2 key (primary,b) ; Table Op Msg_type Msg_text test.t3 preload_keys Error Table 'test.t3' doesn't exist -test.t3 preload_keys error Corrupt +test.t3 preload_keys status Operation failed test.t2 preload_keys status OK select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; variable_name g.variable_value-i.variable_value @@ -149,7 +149,7 @@ MARIA_PAGECACHE_READS 317 load index into cache t3 key (b), t2 key (c) ; Table Op Msg_type Msg_text test.t3 preload_keys Error Table 'test.t3' doesn't exist -test.t3 preload_keys error Corrupt +test.t3 preload_keys status Operation failed test.t2 preload_keys Error Key 'c' doesn't exist in table 't2' test.t2 preload_keys status Operation failed select g.variable_name,g.variable_value-i.variable_value from information_schema.global_status as g,initial as i where g.variable_name like "Maria_pagecache_read%" and g.variable_name=i.variable_name order by g.variable_name desc; |