diff options
| author | unknown <dlenev@mockturtle.local> | 2007-05-23 15:55:36 +0400 |
|---|---|---|
| committer | unknown <dlenev@mockturtle.local> | 2007-05-23 15:55:36 +0400 |
| commit | b24c1b04ed2618c9b2d5755f92ee791a42c99fbf (patch) | |
| tree | 7bb860cfec586d8c48bd0052ef4f7a002a9ff937 /mysql-test/r/grant2.result | |
| parent | 4b9b1edae7a726d8956a849d12406142a29539c1 (diff) | |
| parent | f9d7642e7b46d911cda5512ac0bcb55dd85dcd95 (diff) | |
| download | mariadb-git-b24c1b04ed2618c9b2d5755f92ee791a42c99fbf.tar.gz | |
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-like
into mockturtle.local:/home/dlenev/src/mysql-5.1-like-2
sql/handler.h:
Auto merged
sql/mysql_priv.h:
5.1 version of mysql_priv.h already contains all necessary changes.
sql/sql_parse.cc:
5.1 version of sql_parse.cc already contains all necessary changes.
sql/sql_table.cc:
5.1 version of sql_table.cc already contains all necessary changes.
sql/sql_yacc.yy:
SCCS merged
mysql-test/r/grant2.result:
Manual merge.
mysql-test/t/grant2.test:
Manual merge.
Diffstat (limited to 'mysql-test/r/grant2.result')
| -rw-r--r-- | mysql-test/r/grant2.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result index f2722ee052e..8f3c8605cdd 100644 --- a/mysql-test/r/grant2.result +++ b/mysql-test/r/grant2.result @@ -404,3 +404,4 @@ use test; drop database mysqltest_1; drop database mysqltest_2; drop user mysqltest_u1@localhost; +End of 5.0 tests |