diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-11-11 08:58:24 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-11-11 08:58:24 -0500 |
| commit | 82ad1db0af6ecb9b51dbdbb0779dad0c9840d89c (patch) | |
| tree | 892a49ac008e056d05b19003535d2755d5bd7ef2 /mysql-test/r/kill.result | |
| parent | 75d86b93b5cede2f9ecdf1e9c32017f5fc35eae3 (diff) | |
| parent | 4f4b46456a150880d5d93d77a2f9f0db68d9396c (diff) | |
| download | mariadb-git-82ad1db0af6ecb9b51dbdbb0779dad0c9840d89c.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my51-bug22860
BitKeeper/etc/collapsed:
auto-union
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/kill.result')
0 files changed, 0 insertions, 0 deletions