diff options
| author | unknown <aelkin@dl145h.mysql.com> | 2006-06-01 22:32:33 +0200 |
|---|---|---|
| committer | unknown <aelkin@dl145h.mysql.com> | 2006-06-01 22:32:33 +0200 |
| commit | e195d46fc6fea299d5dc504e7c006b9a7a183ef0 (patch) | |
| tree | 4c7055e62b092afe69e6c58df3181380c28886b4 /mysql-test/t/sp-prelocking.test | |
| parent | 33b00ea51d2fed717cf8c528871d71e9ead4470b (diff) | |
| parent | 4aef3b224085bbcf01d9d2233a14fc886474f47b (diff) | |
| download | mariadb-git-e195d46fc6fea299d5dc504e7c006b9a7a183ef0.tar.gz | |
Merge dl145h.mysql.com:/tmp/andrei/MERGE/5.0_my
into dl145h.mysql.com:/tmp/andrei/MERGE/5.1
mysql-test/t/mysqlbinlog.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/sp-prelocking.test')
0 files changed, 0 insertions, 0 deletions