diff options
| author | unknown <pem@mysql.com> | 2003-02-18 15:05:35 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-02-18 15:05:35 +0100 |
| commit | 3de0f8d38a0af9311ea970fa032b502341195704 (patch) | |
| tree | 921e4017c320c9b487bd10d94256dc6227c157f3 /mysql-test/r/connect.result | |
| parent | 49e6a2d0e443f5ba788026a6f9218db12ad23cc4 (diff) | |
| parent | d6303970e91fbb072909bdf6d5affc19b2ed4786 (diff) | |
| download | mariadb-git-3de0f8d38a0af9311ea970fa032b502341195704.tar.gz | |
Merging 4.1 into 5.0
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
configure.in:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/r/connect.result:
Auto merged
mysql-test/r/insert.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/insert.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/Makefile.am:
Auto merged
sql/item.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
Diffstat (limited to 'mysql-test/r/connect.result')
| -rw-r--r-- | mysql-test/r/connect.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result index b7243ac5d0b..8c2e2d1def7 100644 --- a/mysql-test/r/connect.result +++ b/mysql-test/r/connect.result @@ -7,6 +7,7 @@ help_category help_relation help_topic host +proc tables_priv user show tables; @@ -22,6 +23,7 @@ help_category help_relation help_topic host +proc tables_priv user show tables; @@ -37,6 +39,7 @@ help_category help_relation help_topic host +proc tables_priv user show tables; |