diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-16 22:09:10 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-16 22:09:10 +0400 |
| commit | 793c30612ac1a2736018919649973e6c3d30cfe8 (patch) | |
| tree | 9b40ddfb35af3b50d0b25f3ef372ac695ccb5c61 /README | |
| parent | 0270e811d047d3892d7641724e5ab7ca15b37f65 (diff) | |
| parent | 43b9ff1b21b2d645e5cd52d82878a48b47b01f8d (diff) | |
| download | mariadb-git-793c30612ac1a2736018919649973e6c3d30cfe8.tar.gz | |
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
mysql-test/r/insert_update.result:
Auto merged
mysql-test/t/insert_update.test:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_insert.cc:
merging
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions