diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-31 15:14:13 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-31 15:14:13 +0200 |
| commit | bea9525a38b7e2ab6968e4d76d5c88dc10bc8431 (patch) | |
| tree | 22d35c4605e659ab8b11623f1444f2bfe85a310b /mysql-test/r/kill.result | |
| parent | d49d3d0b3ac663e08603afe819d814079adc801e (diff) | |
| parent | ff979b76ca7c0e74b7fd7e8d9af78235b48d4339 (diff) | |
| download | mariadb-git-bea9525a38b7e2ab6968e4d76d5c88dc10bc8431.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/mysqlbinlog.test:
Merge 5.0->5.1
Diffstat (limited to 'mysql-test/r/kill.result')
0 files changed, 0 insertions, 0 deletions