diff options
author | unknown <gshchepa@bk-internal.mysql.com> | 2007-08-23 23:27:30 +0200 |
---|---|---|
committer | unknown <gshchepa@bk-internal.mysql.com> | 2007-08-23 23:27:30 +0200 |
commit | 9723a9365eb775d28c1a8a13fd88c46e19009f48 (patch) | |
tree | a0b303e785424c3fcef2d119a9160f0c463fb6b2 /sql/ha_partition.h | |
parent | 30f5bb9ec855648632f0c39af7f78dc22a24673c (diff) | |
parent | 294a43ec5e8644e197620a18371ca3c920f6bb5b (diff) | |
download | mariadb-git-9723a9365eb775d28c1a8a13fd88c46e19009f48.tar.gz |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
Diffstat (limited to 'sql/ha_partition.h')
0 files changed, 0 insertions, 0 deletions