diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-12-20 14:35:52 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-12-20 14:35:52 +0100 |
| commit | fe397a33c1158b6d3fbc9f87d60dd7dbba746e56 (patch) | |
| tree | aa832257b89784fa27958d375d8f02a994f4d8c4 /mysql-test/r/ps_3innodb.result | |
| parent | f78594c028dbb33b740c7bb3d9b310568b64508e (diff) | |
| parent | 58de4d7e28c782341bc2160bd93fcaeb8f9dfd01 (diff) | |
| download | mariadb-git-fe397a33c1158b6d3fbc9f87d60dd7dbba746e56.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/t/mysqltest.test:
Check with test ! -e that no out file exists
Diffstat (limited to 'mysql-test/r/ps_3innodb.result')
| -rw-r--r-- | mysql-test/r/ps_3innodb.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result index 469d22d1c8b..5f979a124e1 100644 --- a/mysql-test/r/ps_3innodb.result +++ b/mysql-test/r/ps_3innodb.result @@ -85,6 +85,8 @@ c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c 1 1 1 1 1 1 1 1 1 1 1.0000 1.0000 2004-02-29 2004-02-29 11:11:11 2004-02-29 11:11:11 11:11:11 2004 1 1 a 123456789a 123456789a123456789b123456789c tinyblob tinytext blob text mediumblob mediumtext longblob longtext one monday 9 9 9 9 9 9 9 9 9 9 9.0000 9.0000 2004-02-29 2004-02-29 11:11:11 2004-02-29 11:11:11 11:11:11 2004 1 0 a 123456789a 123456789a123456789b123456789c tinyblob tinytext blob text mediumblob mediumtext longblob longtext two tuesday set @arg00='SELECT' ; +@arg00 a from t1 where a=1; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@arg00 a from t1 where a=1' at line 1 prepare stmt1 from ' ? a from t1 where a=1 '; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '? a from t1 where a=1' at line 1 set @arg00=1 ; |