diff options
author | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
commit | a8fdaa6f2c5b2e302bffb069be3475772ca20f48 (patch) | |
tree | b5c9560ec7346f7af6a5904ad344fdbb8020849c /mysql-test/r/myisam.result | |
parent | 115efe100dbc1393bce964fa1370e50cfef71d18 (diff) | |
parent | f7a24d72dc7a86341da4634f6d1a71f1ea77000b (diff) | |
download | mariadb-git-a8fdaa6f2c5b2e302bffb069be3475772ca20f48.tar.gz |
Merge with base MySQL 5.1
Contains fixes for test cases
Changed release tag to beta
configure.in:
change release tag to beta
Diffstat (limited to 'mysql-test/r/myisam.result')
-rw-r--r-- | mysql-test/r/myisam.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 241be890952..33c7a203671 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -2215,7 +2215,7 @@ KEY (c1), KEY (c2) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0; -MyISAM file: MYSQLTEST_VARDIR/master-data/test/t1 +MyISAM file: MYSQLD_DATADIR/test/t1 Record format: Packed Character set: utf8_general_ci (33) Data records: 0 Deleted blocks: 0 |