bk commit into 5.1 tree (anozdrin:1.2566)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of anozdrin.  When anozdrin does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-21 12:48:55+03:00, anozdrin@quad. +1 -0
  Fix merge (fix result file)

  mysql-test/r/view.result@stripped, 2008-02-21 12:48:54+03:00, anozdrin@quad. +17 -15
    Fix merge (fix result file)

diff -Nrup a/mysql-test/r/view.result b/mysql-test/r/view.result
--- a/mysql-test/r/view.result	2008-02-21 12:22:23 +03:00
+++ b/mysql-test/r/view.result	2008-02-21 12:48:54 +03:00
@@ -3614,6 +3614,23 @@ set @@sql_mode=@old_mode;
 drop view v1;
 drop table t1;
 # -----------------------------------------------------------------
+# -- Bug#34337: Server crash when Altering a view using a table name.
+# -----------------------------------------------------------------
+
+DROP TABLE IF EXISTS t1;
+
+CREATE TABLE t1(c1 INT);
+
+SELECT * FROM t1;
+c1
+ALTER ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW t1 (c2) AS SELECT (1);
+ERROR HY000: 'test.t1' is not VIEW
+
+DROP TABLE t1;
+
+# -- End of test case for Bug#34337.
+
+# -----------------------------------------------------------------
 # -- End of 5.0 tests.
 # -----------------------------------------------------------------
 DROP DATABASE IF EXISTS `d-1`;
@@ -3731,21 +3748,6 @@ call p();
 call p();
 drop view a;
 drop procedure p;
-# -----------------------------------------------------------------
-# -- Bug#34337: Server crash when Altering a view using a table name.
-# -----------------------------------------------------------------
-
-DROP TABLE IF EXISTS t1;
-
-CREATE TABLE t1(c1 INT);
-
-ALTER ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW t1 (c2) AS SELECT (1);
-ERROR HY000: 'test.t1' is not VIEW
-
-DROP TABLE t1;
-
-# -- End of test case for Bug#34337.
-
 # -----------------------------------------------------------------
 # -- End of 5.1 tests.
 # -----------------------------------------------------------------