diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-19 17:15:49 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-19 17:15:49 +0200 |
| commit | 83196ad86082cb584066d438b25357e5ac3efb34 (patch) | |
| tree | 2fa7b7347e7acd1b279349e6552736fa1ac0a6a8 /mysql-test/r/mysqltest.result | |
| parent | 32b3846c9c5b112d99f16b165935622a26233eaf (diff) | |
| parent | cd06481d658d77567cbf6223a118e0102b93be51 (diff) | |
| download | mariadb-git-83196ad86082cb584066d438b25357e5ac3efb34.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
Diffstat (limited to 'mysql-test/r/mysqltest.result')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index a0fce5f483f..1cfc482416e 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -518,4 +518,6 @@ hello mysqltest: At line 1: Max delimiter length(16) exceeded hello hello +mysqltest: At line 1: test of die +Some output End of tests |