diff options
| author | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-09-04 18:45:48 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-09-04 18:45:48 +0300 |
| commit | 18ed9144bb38b0d9936cf8537a42e56f4af6b939 (patch) | |
| tree | 8a2db1f4c86eeb87afa5bee8f3be3722a9e263dc /mysql-test/r/delete.result | |
| parent | efa8e33075d13f4a96f8d4659134f905e71a9f1a (diff) | |
| parent | 1431966d029ffd710c678080bee9e1d884205127 (diff) | |
| download | mariadb-git-18ed9144bb38b0d9936cf8537a42e56f4af6b939.tar.gz | |
Merge macbook.gmz:/Users/kgeorge/mysql/work/B21392-4.1-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B21392-5.0-opt
mysql-test/t/delete.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/delete.result:
merge 4.1->5.0
sql/sql_parse.cc:
merge 4.1->5.0
Diffstat (limited to 'mysql-test/r/delete.result')
| -rw-r--r-- | mysql-test/r/delete.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result index 0946dc8f809..9d337a1ed34 100644 --- a/mysql-test/r/delete.result +++ b/mysql-test/r/delete.result @@ -172,6 +172,10 @@ a 0 2 DROP TABLE t1; +create table t1 (a int); +delete `4.t1` from t1 as `4.t1` where `4.t1`.a = 5; +delete FROM `4.t1` USING t1 as `4.t1` where `4.t1`.a = 5; +drop table t1; CREATE TABLE t1 (a int not null,b int not null); CREATE TABLE t2 (a int not null, b int not null, primary key (a,b)); CREATE TABLE t3 (a int not null, b int not null, primary key (a,b)); |