← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to mysql-test/suite/funcs_1/datadict/tables2.inc

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/suite/funcs_1/datadict/tables2.inc
29
29
let $innodb_pattern = 'InnoDB free';
30
30
let $ndb_pattern    = 'number_of_replicas';
31
31
--vertical_results
 
32
# We do not unify the engine name here, because the rowformat is
 
33
# specific to the engine.
 
34
--replace_result Dynamic DYNAMIC_OR_PAGE Page DYNAMIC_OR_PAGE MyISAM MYISAM_OR_MARIA MARIA MYISAM_OR_MARIA
32
35
--replace_column  8 "#TBLR#" 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "#CRT#" 16 "#UT#" 17 "#CT#" 20 "#CO#" 21 "#TC#"
33
36
eval
34
37
SELECT *,
44
47
$my_where
45
48
ORDER BY table_schema,table_name;
46
49
--horizontal_results
47