diff options
| author | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-11-29 12:15:15 -0500 |
|---|---|---|
| committer | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-11-29 12:15:15 -0500 |
| commit | 0e6675479deee878c5f8d1b6bb367cb30b841af1 (patch) | |
| tree | 5c15adb1bd82a22609ec605ccb755b6ec28fbc5d /mysql-test/t/kill.test | |
| parent | 44f15caec3145adb09020de90aa38e0201e7a63b (diff) | |
| parent | b4aab152723c629fb23322da4988b404ed68986d (diff) | |
| download | mariadb-git-0e6675479deee878c5f8d1b6bb367cb30b841af1.tar.gz | |
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
mysql-test/r/distinct.result:
manual merge
mysql-test/t/distinct.test:
manual merge
sql/sql_class.cc:
manual merge
sql/sql_class.h:
manual merge
Diffstat (limited to 'mysql-test/t/kill.test')
0 files changed, 0 insertions, 0 deletions