diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/t/disabled.def | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysql-test/t/disabled.def')
| -rw-r--r-- | mysql-test/t/disabled.def | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 52b23e62dcb..0bbb6bc29d3 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -9,8 +9,8 @@ # Do not use any TAB characters for whitespace. # ############################################################################## -main.events_time_zone : Test is not predictable as it depends on precise timing. -table_elim : sergeyp to reapply 2643.26.4 in Item_sum::update_used_tables +events_time_zone : Test is not predictable as it depends on precise timing. +table_elim : sergeyp to reapply 2643.26.4 in Item_sum::update_used_tables lowercase_table3 : Bug#11762269 2010-06-30 alik main.lowercase_table3 on Mac OSX read_many_rows_innodb : Bug#11748886 2010-11-15 mattiasj report already exists sum_distinct-big : Bug#11764126 2010-11-15 mattiasj was not tested @@ -19,4 +19,10 @@ create-big : Bug#11748731 2010-11-15 mattiasj was not tested archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists mysql_embedded : Bug#12561297 2011-06-15 New test failing on all platforms -tablespace : disabled in MariaDB +tablespace : disabled in MariaDB (no TABLESPACE table attribute) +derived_view : SergeyP +subselect4 : SergeyP +subselect_mat : SergeyP +subselect_sj_mat : SergeyP +subselect_sj2_mat : SergeyP +subselect_sj_nonmerged : SergeyP |