diff options
author | unknown <evgen@sunlight.local> | 2006-07-29 23:54:55 +0400 |
---|---|---|
committer | unknown <evgen@sunlight.local> | 2006-07-29 23:54:55 +0400 |
commit | fc466665b74a8b50af586c2c56777409b9214826 (patch) | |
tree | 994c44f0506354afa0f3a7ada5c686497b506b44 /storage | |
parent | b230225b459bdcbf0cf82c60e62b894453411a14 (diff) | |
parent | ba718a45fc0360a1ec7c612d2fb6f74b348950c3 (diff) | |
download | mariadb-git-fc466665b74a8b50af586c2c56777409b9214826.tar.gz |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
mysql-test/r/partition_pruning.result:
Auto merged
mysql-test/t/partition_pruning.test:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'storage')
0 files changed, 0 insertions, 0 deletions