summaryrefslogtreecommitdiff
path: root/mysql-test/r/partition_not_windows.result
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2008-10-24 10:50:59 -0200
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2008-10-24 10:50:59 -0200
commite55c12c57b37a728e98cc3968399e6d21a2bfeae (patch)
treef22f6d527d9486dd9fee61ed406841efe147658b /mysql-test/r/partition_not_windows.result
parentd91f6d30dfaca013d99b5e051f37eb9924c8961c (diff)
parentb1192b29abffb012a12a1b1239df1d5a130077b4 (diff)
downloadmariadb-git-e55c12c57b37a728e98cc3968399e6d21a2bfeae.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_not_windows.result')
-rw-r--r--mysql-test/r/partition_not_windows.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/partition_not_windows.result b/mysql-test/r/partition_not_windows.result
index c0247babb50..cf1fec98b07 100644
--- a/mysql-test/r/partition_not_windows.result
+++ b/mysql-test/r/partition_not_windows.result
@@ -24,8 +24,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` (