diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-10-20 10:57:38 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-10-20 10:57:38 +0200 |
| commit | 0153d67e59c3049b94d7a28fa96cd963c202027d (patch) | |
| tree | cf51611706126ce58f38d153ac2385b0a17a8b93 /mysql-test/t/innodb-deadlock.test | |
| parent | 2576c4c0c90d00348c1bb17fa1a6f76e6e3988f3 (diff) | |
| parent | 9bfaab57fa991d46844b5e56cb30880c8391c55d (diff) | |
| download | mariadb-git-0153d67e59c3049b94d7a28fa96cd963c202027d.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/innodb-deadlock.test')
0 files changed, 0 insertions, 0 deletions