diff options
author | unknown <msvensson@neptunus.(none)> | 2006-12-08 16:53:59 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-12-08 16:53:59 +0100 |
commit | e49488ea0238c4b25d055957a3f84b3b441944cb (patch) | |
tree | 4c80fa843ed9d53e8d1b77da1398879d83562da5 /mysql-test/t/kill.test | |
parent | e54bbaa3fb8793905d37af808b9bee6a49df358a (diff) | |
parent | 47b8d63d4702c0ce4d3f38815fc50d38f03b1519 (diff) | |
download | mariadb-git-e49488ea0238c4b25d055957a3f84b3b441944cb.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'mysql-test/t/kill.test')
0 files changed, 0 insertions, 0 deletions