diff options
author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-04-24 14:08:03 +0500 |
---|---|---|
committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-04-24 14:08:03 +0500 |
commit | 842cbb01fd88924ee4818452265bde0a0e7d77b0 (patch) | |
tree | f4598d76f6c5d538034a6b379671cf8a7e2fa3db /mysys/my_new.cc | |
parent | 6b2685b664e44d3e3812bd01f724f19af444b7a0 (diff) | |
parent | 3aea34b4528f0089348b2b9f17c6cf2bef512df8 (diff) | |
download | mariadb-git-842cbb01fd88924ee4818452265bde0a0e7d77b0.tar.gz |
Merge mysql.com:/home/ram/work/mysql-5.0-maint
into mysql.com:/home/ram/work/b27515/b27515.5.0
mysql-test/r/grant.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysys/my_new.cc')
0 files changed, 0 insertions, 0 deletions