diff options
author | unknown <kostja@vajra.(none)> | 2007-05-24 21:12:03 +0400 |
---|---|---|
committer | unknown <kostja@vajra.(none)> | 2007-05-24 21:12:03 +0400 |
commit | 16de4981e1c88e76f014896354e59f4a74b256d7 (patch) | |
tree | fcdcafa8ae22694ad6f37c0e0ec20f4fe015f220 | |
parent | ee7088e730fecce07091e6a3a1282d1f5aa5fb01 (diff) | |
parent | c8236f564c3e7fc5e12efb108e8b378a455290aa (diff) | |
download | mariadb-git-16de4981e1c88e76f014896354e59f4a74b256d7.tar.gz |
Merge vajra.(none):/opt/local/work/mysql-5.0-runtime
into vajra.(none):/opt/local/work/mysql-5.1-runtime
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
0 files changed, 0 insertions, 0 deletions