diff options
author | unknown <serg@serg.mylan> | 2005-02-16 18:28:08 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-02-16 18:28:08 +0100 |
commit | 98db5e571fd01f063ae56aa2492f8d01a418815a (patch) | |
tree | 035ac3e99dc2b1a103e3b2fd04896b2e3ef10421 /sql/mysql_priv.h | |
parent | de1dcee97e34f43b810a9329479e7e68b120eb55 (diff) | |
parent | 2981a284362862b556035c7b16dcb5b3b29fd14a (diff) | |
download | mariadb-git-98db5e571fd01f063ae56aa2492f8d01a418815a.tar.gz |
Merge bk-internal:/home/bk/mysql-5.0-xa
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
0 files changed, 0 insertions, 0 deletions