diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2006-12-20 20:01:31 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2006-12-20 20:01:31 +0400 |
| commit | 2efb6576008acd580680849e1e618da021b57c7e (patch) | |
| tree | 07b49f1420b38586b00555274fbede619a469630 /support-files | |
| parent | 76da582ca5f8a93ae5ff7e7fdea1991d47658196 (diff) | |
| parent | 9d094c56bc6f15d16f51d4b0bcf9de3cd4674d7f (diff) | |
| download | mariadb-git-2efb6576008acd580680849e1e618da021b57c7e.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
sql/lock.cc:
Use local.
mysql-test/r/myisam.result:
Manual merge.
mysql-test/t/myisam.test:
Manual merge.
sql/sql_update.cc:
Manual merge.
Diffstat (limited to 'support-files')
0 files changed, 0 insertions, 0 deletions