diff options
| author | unknown <jimw@mysql.com> | 2005-08-01 17:54:57 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-01 17:54:57 -0700 |
| commit | d083e4ac1b1450e99984dcf488cfd95cefaf78cb (patch) | |
| tree | c2a4f1c838bccde279f578e1d54a016a0d377f51 /mysql-test/r/ps_1general.result | |
| parent | 8fc1e27fb7604b93358a15f26a0c849faa21a1ca (diff) | |
| parent | c679cb67bc8958a15dab68febf236ea1edeff5c5 (diff) | |
| download | mariadb-git-d083e4ac1b1450e99984dcf488cfd95cefaf78cb.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/key_cache.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/func_math.result:
Resolve conflicts
mysql-test/r/user_var.result:
Resolve conflicts
mysql-test/t/func_math.test:
Resolve conflicts
mysql-test/t/user_var.test:
Resolve conflicts
sql/item_func.cc:
Resolve conflicts
sql/sql_parse.cc:
Resolve conflicts
Diffstat (limited to 'mysql-test/r/ps_1general.result')
| -rw-r--r-- | mysql-test/r/ps_1general.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index f2d60ac5025..7fb1e1b4df4 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -349,7 +349,7 @@ execute stmt1 ; ERROR 42S02: Unknown table 't5' prepare stmt1 from ' SELECT @@version ' ; execute stmt1 ; -@@VERSION +@@version <version> prepare stmt_do from ' do @var:= (1 in (select a from t1)) ' ; prepare stmt_set from ' set @var= (1 in (select a from t1)) ' ; |