bk commit into 5.1 tree (dlenev:1.2536)

[dlenev]

Below is the list of changes that have just been committed into a local
5.1 repository of dlenev. When dlenev 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-05-23 15:55:36+04:00, dlenev@stripped +7 -0
  Merge mockturtle.local:/home/dlenev/src/mysql-5.0-like
  into  mockturtle.local:/home/dlenev/src/mysql-5.1-like-2
  MERGE: 1.1810.2870.49

  mysql-test/r/grant2.result@stripped, 2007-05-23 15:55:30+04:00, dlenev@stripped +1 -24
    Manual merge.
    MERGE: 1.25.2.9

  mysql-test/t/grant2.test@stripped, 2007-05-23 15:55:30+04:00, dlenev@stripped +2 -43
    Manual merge.
    MERGE: 1.31.2.8

  sql/handler.h@stripped, 2007-05-23 15:45:54+04:00, dlenev@stripped +0 -1
    Auto merged
    MERGE: 1.138.2.46

  sql/mysql_priv.h@stripped, 2007-05-23 15:50:01+04:00, dlenev@stripped +0 -2
    5.1 version of mysql_priv.h already contains all necessary changes.
    MERGE: 1.290.1.162

  sql/sql_parse.cc@stripped, 2007-05-23 15:51:38+04:00, dlenev@stripped +0 -26
    5.1 version of sql_parse.cc already contains all necessary changes.
    MERGE: 1.426.1.196

  sql/sql_table.cc@stripped, 2007-05-23 15:52:49+04:00, dlenev@stripped +4 -30
    5.1 version of sql_table.cc already contains all necessary changes.
    MERGE: 1.239.1.105

  sql/sql_yacc.yy@stripped, 2007-05-23 15:54:35+04:00, dlenev@stripped +0 -0
    SCCS merged
    MERGE: 1.371.1.149

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dlenev
# Host:	mockturtle.local
# Root:	/home/dlenev/src/mysql-5.1-like-2/RESYNC

--- 1.35/mysql-test/r/grant2.result	2007-05-23 15:55:51 +04:00
+++ 1.36/mysql-test/r/grant2.result	2007-05-23 15:55:51 +04:00
@@ -404,3 +404,4 @@ use test;
 drop database mysqltest_1;
 drop database mysqltest_2;
 drop user mysqltest_u1@localhost;
+End of 5.0 tests

--- 1.42/mysql-test/t/grant2.test	2007-05-23 15:55:51 +04:00
+++ 1.43/mysql-test/t/grant2.test	2007-05-23 15:55:51 +04:00
@@ -554,3 +554,6 @@ use test;
 drop database mysqltest_1;
 drop database mysqltest_2;
 drop user mysqltest_u1@localhost;
+
+--echo End of 5.0 tests
+