diff options
author | unknown <gluh@mysql.com> | 2006-06-28 14:23:33 +0500 |
---|---|---|
committer | unknown <gluh@mysql.com> | 2006-06-28 14:23:33 +0500 |
commit | b5f89708eb9b8ecc8fb74a37875b7880fd535fdc (patch) | |
tree | cea5fe7e7170a2ca68f254c0bcc61161d0d3b233 /sql/sql_acl.cc | |
parent | a4c95a18b83a593a5dbc528179721062c7c8b4cd (diff) | |
parent | e832964174c43c6edb5603ab372223c964145a98 (diff) | |
download | mariadb-git-b5f89708eb9b8ecc8fb74a37875b7880fd535fdc.tar.gz |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
0 files changed, 0 insertions, 0 deletions