diff options
| author | unknown <monty@mysql.com> | 2005-08-15 18:35:48 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-08-15 18:35:48 +0300 |
| commit | c5aac211d02ebf672237141fbe767dd9d3af26da (patch) | |
| tree | 613842f6646a144777e4e07d77c2a89dbb659781 /tests | |
| parent | e8b26c090348f2db3e4f33483a9135cd931f5687 (diff) | |
| parent | 3b422187f6829da234914c713e4e8039c97e7291 (diff) | |
| download | mariadb-git-c5aac211d02ebf672237141fbe767dd9d3af26da.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/ha_berkeley.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_class.cc:
Manual merge
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 75b41ebe4d1..5558028bb06 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -11801,8 +11801,8 @@ static void test_bug6046() stmt= mysql_stmt_init(mysql); - stmt_text= "SELECT t1.a FROM t1 NATURAL JOIN t1 as X1 " - "WHERE t1.b > ? ORDER BY t1.a"; + stmt_text= "SELECT a FROM t1 NATURAL JOIN t1 as X1 " + "WHERE b > ? ORDER BY a"; rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); check_execute(stmt, rc); |