diff options
author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-07-21 17:22:29 +0300 |
---|---|---|
committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-07-21 17:22:29 +0300 |
commit | 5ba39365176be7042754632489c1e2ec885ba290 (patch) | |
tree | a66f5514fa9172ae7f3906bc68be75d6a9c59d82 /mysql-test/t/strict_autoinc_3heap.test | |
parent | 0802e5da694b3105dd723eacd3d7dc92b24f1f0b (diff) | |
parent | 74d67316829134f04bac656879408d4f7f2de8a4 (diff) | |
download | mariadb-git-5ba39365176be7042754632489c1e2ec885ba290.tar.gz |
Merge mysql-trunk-bugfixing -> mysql-trunk-innodb
(resolving conflicts in mysql-test/suite/rpl/t/rpl_sync-slave.opt and
configure.cmake)
Diffstat (limited to 'mysql-test/t/strict_autoinc_3heap.test')
0 files changed, 0 insertions, 0 deletions