diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-23 10:54:56 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-23 10:54:56 +0100 |
| commit | bad70a1836af89ed6ddd0a7428b63a5e1c3a3557 (patch) | |
| tree | fe58999a1385891f00b6ec8729d97d138a81d8e0 /mysql-test/r/mysqltest.result | |
| parent | 43fee9d5f51ce31517bee44acf33d01249853018 (diff) | |
| parent | 95444d9deca4bb5e6343adf82c225a7ea2bdf763 (diff) | |
| download | mariadb-git-bad70a1836af89ed6ddd0a7428b63a5e1c3a3557.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item.cc:
Auto merged
sql/sp_head.cc:
Auto merged
mysql-test/t/mysqldump.test:
Merge with my own merge
mysql-test/t/mysqltest.test:
Merge
Diffstat (limited to 'mysql-test/r/mysqltest.result')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index c3a234875df..432c3dfc9b9 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -223,7 +223,7 @@ mysqltest: At line 1: Missing arguments to let mysqltest: At line 1: Missing variable name in let mysqltest: At line 1: Missing assignment operator in let mysqltest: At line 1: Missing assignment operator in let -mysqltest: At line 1: Missing arguments to let +mysqltest: At line 1: Missing assignment operator in let mysqltest: At line 1: Missing variable name in let mysqltest: At line 1: Missing variable name in let mysqltest: At line 1: Missing assignment operator in let |