diff options
author | unknown <monty@mysql.com> | 2005-01-13 20:09:41 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-01-13 20:09:41 +0200 |
commit | c0af1e3c67c707477f2cdc1dd776fb6d6df8cdb8 (patch) | |
tree | 85d91b9c0e7251f1430d8e304c566c23ebb4e747 /sql/mysql_priv.h | |
parent | 28b783eada4a151935118f3760e0a8a4d217bce8 (diff) | |
parent | 85a6647fb98cabe01b15b7e732e00285aaf331a5 (diff) | |
download | mariadb-git-c0af1e3c67c707477f2cdc1dd776fb6d6df8cdb8.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
0 files changed, 0 insertions, 0 deletions