diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-10-24 10:50:59 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-10-24 10:50:59 -0200 |
| commit | 463c837c3aaa5c85e8024463bf247a926932de5d (patch) | |
| tree | f22f6d527d9486dd9fee61ed406841efe147658b /mysql-test/r/partition_symlink.result | |
| parent | 03300dc1a44f37e33b4c93c1a82babe90ccf28a8 (diff) | |
| parent | d5202ddd314385374a0afcf61343b7de7f53b192 (diff) | |
| download | mariadb-git-463c837c3aaa5c85e8024463bf247a926932de5d.tar.gz | |
Merge from mysql-5.0-bugteam into mysql-5.1-bugteam
mysql-test/r/partition_not_windows.result:
Update warning number due to new errors appearing earlier
in the list.
mysql-test/r/partition_symlink.result:
Update warning number due to new errors appearing earlier
in the list.
mysql-test/r/symlink.result:
Update warning number due to new errors appearing earlier
in the list.
Diffstat (limited to 'mysql-test/r/partition_symlink.result')
| -rw-r--r-- | mysql-test/r/partition_symlink.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/partition_symlink.result b/mysql-test/r/partition_symlink.result index 00c9f5b3f01..894966f6c53 100644 --- a/mysql-test/r/partition_symlink.result +++ b/mysql-test/r/partition_symlink.result @@ -101,8 +101,8 @@ data directory='/not/existing' index directory='/not/existing' ); Warnings: -Warning 1616 <DATA DIRECTORY> option ignored -Warning 1616 <INDEX DIRECTORY> option ignored +Warning 1618 <DATA DIRECTORY> option ignored +Warning 1618 <INDEX DIRECTORY> option ignored show create table t2; Table Create Table t2 CREATE TABLE `t2` ( |