diff options
author | unknown <hf@deer.(none)> | 2003-11-26 13:39:18 +0400 |
---|---|---|
committer | unknown <hf@deer.(none)> | 2003-11-26 13:39:18 +0400 |
commit | 7d784b20aee7b58adaa26817af897612fc331bd0 (patch) | |
tree | 8bc889a23db1d39670ffc9aa128b61a9c859a084 /extra | |
parent | 6943b3236b516ee9cb1c66c42aa1f3c3ffbbcbef (diff) | |
parent | ceb0ce5002edf0824ce01f156cd8343a047e6b7a (diff) | |
download | mariadb-git-7d784b20aee7b58adaa26817af897612fc331bd0.tar.gz |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1-w1284
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'extra')
0 files changed, 0 insertions, 0 deletions