diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-11-23 15:30:16 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-11-23 15:30:16 +0200 |
| commit | 10c1aa796a32829cdf30c084a575be3a7c1f5abf (patch) | |
| tree | 2ae3f96dbf2ade659458d01f2b75842c918893bc /tests | |
| parent | a197c4e95ddd69cf9ebe3a6b2796a68f420c009a (diff) | |
| parent | 870d46819e517ec9dcd7b0e077147c69dbafa929 (diff) | |
| download | mariadb-git-10c1aa796a32829cdf30c084a575be3a7c1f5abf.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B32400-5.0-opt
tests/mysql_client_test.c:
Auto merged
mysql-test/r/subselect.result:
SCCS merged
mysql-test/t/subselect.test:
SCCS merged
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 29935a4924d..b2ac73d8a71 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -9283,7 +9283,7 @@ static void test_subqueries_ref() { MYSQL_STMT *stmt; int rc, i; - const char *query= "SELECT a as ccc from t1 where a+1=(SELECT 1+ccc from t1 where ccc+1=a+1 and a=1)"; + const char *query= "SELECT a as ccc from t1 outr where a+1=(SELECT 1+outr.a from t1 where outr.a+1=a+1 and a=1)"; myheader("test_subqueries_ref"); |