bk commit into 6.0 tree (hakank:1.2598)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakan. When hakan 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, 2007-09-25 12:31:34+02:00, hakank@stripped +2 -0
  After merge fix for version 6.

  mysql-test/r/comments.result@stripped, 2007-09-25 12:31:32+02:00, hakank@stripped +1 -1
    After merge fix for version 6.

  mysql-test/t/comments.test@stripped, 2007-09-25 12:31:32+02:00, hakank@stripped +1 -1
    After merge fix for version 6.

diff -Nrup a/mysql-test/r/comments.result b/mysql-test/r/comments.result
--- a/mysql-test/r/comments.result	2007-08-30 20:57:00 +02:00
+++ b/mysql-test/r/comments.result	2007-09-25 12:31:32 +02:00
@@ -10,7 +10,7 @@ ERROR 42000: Query was empty
 select 1 /*!32301 +1 */;
 1  +1
 2
-select 1 /*!52301 +1 */;
+select 1 /*!62301 +1 */;
 1
 1
 select 1--1;
diff -Nrup a/mysql-test/t/comments.test b/mysql-test/t/comments.test
--- a/mysql-test/t/comments.test	2007-08-30 20:57:00 +02:00
+++ b/mysql-test/t/comments.test	2007-09-25 12:31:32 +02:00
@@ -8,7 +8,7 @@ multi line comment */;
 --error 1065
  ;
 select 1 /*!32301 +1 */;
-select 1 /*!52301 +1 */;
+select 1 /*!62301 +1 */;
 select 1--1;
 # Note that the following returns 4 while it should return 2
 # This is because the mysqld server doesn't parse -- comments