diff options
author | unknown <tsmith@maint1.mysql.com> | 2006-10-24 20:01:01 +0200 |
---|---|---|
committer | unknown <tsmith@maint1.mysql.com> | 2006-10-24 20:01:01 +0200 |
commit | b075786e0a70c05dc4ed9ffac2760a689683d532 (patch) | |
tree | 942339701a7623ad65cdc98db19b566968d5a03b /mysql-test/r/not_partition.require | |
parent | 31959774de006ba846b8206eea8f4df3cb85ad63 (diff) | |
parent | 5154dd662594e7ab0e83e77fe5652bfa0eba92da (diff) | |
download | mariadb-git-b075786e0a70c05dc4ed9ffac2760a689683d532.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into maint1.mysql.com:/data/localhome/tsmith/bk/51
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/t/view.test:
Auto merged
Diffstat (limited to 'mysql-test/r/not_partition.require')
0 files changed, 0 insertions, 0 deletions