diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2005-02-23 20:22:51 +0300 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2005-02-23 20:22:51 +0300 |
| commit | e09a6c1a203e986b4c4d34cf8a8b72b39e4c573d (patch) | |
| tree | d3e1cd2714c25ffbee749ae053b0f1cbfc11186c /mysql-test/r/bdb-deadlock.result | |
| parent | 272f78b533f98cd611d0be62538399e6f0839355 (diff) | |
| parent | 262dadccf112eae2381def6e6e144da2ffa9036f (diff) | |
| download | mariadb-git-e09a6c1a203e986b4c4d34cf8a8b72b39e4c573d.tar.gz | |
Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/warnings.test:
Auto merged
sql/protocol.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/bdb-deadlock.result')
0 files changed, 0 insertions, 0 deletions