| List: | Commits | « Previous MessageNext Message » | |
| From: | Alexey Botchkov | Date: | June 25 2009 1:18pm |
| Subject: | bzr commit into mysql-5.4 branch (holyfoot:3356) | ||
| View as plain text | |||
#At file:///home/hf/work/mysql_common/wl4991/ based on revid:holyfoot@strippedx2awucpm7628c9z
3356 Alexey Botchkov 2009-06-25 [merge]
merging
modified:
mysql-test/include/gis_generic.inc
mysql-test/include/master-slave.inc
mysql-test/r/archive_gis.result
mysql-test/r/gis.result
mysql-test/r/innodb_gis.result
mysql-test/suite/backup/r/backup_no_engine.result
mysql-test/suite/backup/t/backup_db_grants.test
mysql-test/suite/backup/t/backup_no_engine.test
mysql-test/suite/backup/t/backup_objects_dependency.test
mysql-test/suite/backup/t/disabled.def
mysql-test/suite/backup_engines/t/backup_partitioning.test
mysql-test/suite/funcs_1/r/storedproc.result
mysql-test/suite/funcs_1/t/storedproc.test
mysql-test/suite/ndb/r/ndb_gis.result
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/ndb/t/ndb_basic.test
mysql-test/suite/ndb/t/ndb_index.test
mysql-test/suite/ndb/t/ndb_index_ordered.test
mysql-test/suite/ndb_binlog/t/ndb_binlog_basic.test
mysql-test/suite/ndb_team/t/ndb_autodiscover.test
mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc
mysql-test/suite/parts/inc/partition_decimal.inc
mysql-test/suite/parts/inc/partition_double.inc
mysql-test/suite/parts/inc/partition_float.inc
mysql-test/suite/parts/t/disabled.def
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_backup_multi.test
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
mysql-test/suite/rpl/t/rpl_cross_version.test
mysql-test/suite/rpl/t/rpl_extraCol_innodb.test
mysql-test/suite/rpl/t/rpl_extraCol_myisam.test
mysql-test/suite/rpl/t/rpl_killed_ddl.test
mysql-test/suite/rpl/t/rpl_row_colSize.test
mysql-test/suite/rpl/t/rpl_row_create_table.test
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
mysql-test/suite/rpl/t/rpl_stm_log.test
mysql-test/suite/rpl/t/rpl_temporary.test
mysql-test/suite/rpl/t/rpl_truncate_3innodb.test
mysql-test/suite/sys_vars/inc/timestamp_basic.inc
mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test
mysql-test/suite/sys_vars/t/disabled.def
mysql-test/suite/sys_vars/t/foreign_key_checks_func.test
mysql-test/t/csv_not_null.test
mysql-test/t/ctype_ldml.test
mysql-test/t/ctype_utf8.test
mysql-test/t/disabled.def
mysql-test/t/gis.test
mysql-test/t/index_merge_innodb.test
mysql-test/t/information_schema_db.test
mysql-test/t/innodb_ctype_ldml.test
mysql-test/t/mysqlbinlog-cp932.test
mysql-test/t/mysqldump.test
mysql-test/t/partition_mgm_err2.test
mysql-test/t/partition_not_windows.test
mysql-test/t/ps.test
mysql-test/t/query_cache.test
mysql-test/t/show_check.test
mysql-test/t/sp.test
mysql-test/t/symlink.test
mysql-test/t/trigger.test
sql/opt_range.cc
=== modified file 'mysql-test/include/gis_generic.inc'
--- a/mysql-test/include/gis_generic.inc 2007-03-29 10:00:32 +0000
+++ b/mysql-test/include/gis_generic.inc 2009-06-24 19:39:33 +0000
@@ -108,7 +108,8 @@ explain extended select AsText(Centroid(
SELECT fid, IsClosed(g) FROM gis_multi_line ORDER by fid;
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid;
+# -- [DISABLED Bug#38092]
+# SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid;
SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid;
SELECT fid, NumGeometries(g) from gis_multi_point ORDER by fid;
=== modified file 'mysql-test/include/master-slave.inc'
--- a/mysql-test/include/master-slave.inc 2008-09-09 05:23:11 +0000
+++ b/mysql-test/include/master-slave.inc 2009-06-25 12:33:12 +0000
@@ -1,5 +1,9 @@
# Replication tests need binlog
#
+
+# -- [DISABLED Bug#45238]
+--source include/not_windows.inc
+
# $skip_slave_start If true, the slave will not be started
source include/have_log_bin.inc;
=== modified file 'mysql-test/r/archive_gis.result'
--- a/mysql-test/r/archive_gis.result 2009-02-10 14:51:18 +0000
+++ b/mysql-test/r/archive_gis.result 2009-06-24 19:39:33 +0000
@@ -324,11 +324,6 @@ fid IsClosed(g)
114 0
115 0
116 0
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid;
-fid AsText(Centroid(g))
-117 POINT(55.58852775304245 17.426536064113982)
-118 POINT(55.58852775304245 17.426536064113982)
-119 POINT(2 2)
SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid;
fid Area(g)
117 1684.5
=== modified file 'mysql-test/r/gis.result'
--- a/mysql-test/r/gis.result 2009-04-29 03:50:14 +0000
+++ b/mysql-test/r/gis.result 2009-06-25 11:45:53 +0000
@@ -316,11 +316,6 @@ fid IsClosed(g)
114 0
115 0
116 0
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
-fid AsText(Centroid(g))
-117 POINT(55.58852775304245 17.426536064113982)
-118 POINT(55.58852775304245 17.426536064113982)
-119 POINT(2 2)
SELECT fid, Area(g) FROM gis_multi_polygon;
fid Area(g)
117 1684.5
@@ -652,10 +647,6 @@ select object_id, geometrytype(geo), ISS
t1 where object_id=85998;
object_id geometrytype(geo) ISSIMPLE(GEO) ASTEXT(centroid(geo))
85998 MULTIPOLYGON 0 POINT(115.31877315203187 -36.23747282102153)
-select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from
-t1 where object_id=85984;
-object_id geometrytype(geo) ISSIMPLE(GEO) ASTEXT(centroid(geo))
-85984 MULTIPOLYGON 0 POINT(-114.87787186923313 36.33101763469049)
drop table t1;
create table t1 (fl geometry not null);
insert into t1 values (1);
=== modified file 'mysql-test/r/innodb_gis.result'
--- a/mysql-test/r/innodb_gis.result 2009-02-10 14:51:18 +0000
+++ b/mysql-test/r/innodb_gis.result 2009-06-24 19:39:33 +0000
@@ -324,11 +324,6 @@ fid IsClosed(g)
114 0
115 0
116 0
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid;
-fid AsText(Centroid(g))
-117 POINT(55.58852775304245 17.426536064113982)
-118 POINT(55.58852775304245 17.426536064113982)
-119 POINT(2 2)
SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid;
fid Area(g)
117 1684.5
=== modified file 'mysql-test/suite/backup/r/backup_no_engine.result'
--- a/mysql-test/suite/backup/r/backup_no_engine.result 2008-10-07 17:15:44 +0000
+++ b/mysql-test/suite/backup/r/backup_no_engine.result 2009-06-18 11:28:01 +0000
@@ -1,12 +1,14 @@
DROP DATABASE IF EXISTS db;
CREATE DATABASE db;
-CREATE TABLE db.t1 (a int, b char(32))
-ENGINE=MYISAM;
+CREATE TABLE db.t1 (a int, b char(32));
+SHOW TABLES IN db;
+Tables_in_db
+t1
+t2
BACKUP DATABASE db TO "db.backup";
backup_id
#
DROP DATABASE db;
-CREATE DATABASE db;
RESTORE FROM "db.backup";
backup_id
#
=== modified file 'mysql-test/suite/backup/t/backup_db_grants.test'
--- a/mysql-test/suite/backup/t/backup_db_grants.test 2009-03-04 10:20:21 +0000
+++ b/mysql-test/suite/backup/t/backup_db_grants.test 2009-06-24 19:39:33 +0000
@@ -110,7 +110,7 @@ SHOW GRANTS FOR 'bup_user3'@'%';
--error ER_NONEXISTING_GRANT
SHOW GRANTS FOR 'no_user'@'%';
-#
+# -- [DISABLED Bug#39016]
# Section of test disabled due to errors in PB. See BUG#39016
#
#--echo Now demonstrate what happens when grants are altered in backup image.
=== modified file 'mysql-test/suite/backup/t/backup_no_engine.test'
--- a/mysql-test/suite/backup/t/backup_no_engine.test 2009-02-24 20:57:21 +0000
+++ b/mysql-test/suite/backup/t/backup_no_engine.test 2009-06-18 11:28:01 +0000
@@ -13,19 +13,19 @@ DROP DATABASE IF EXISTS db;
--enable_warnings
CREATE DATABASE db;
-CREATE TABLE db.t1 (a int, b char(32))
-;
+CREATE TABLE db.t1 (a int, b char(32));
# copy description of a table using non-existent storage engine
copy_file $table_def $MYSQLD_DATADIR/db/t2.frm;
+SHOW TABLES IN db;
+
# backup test database, the table with no storage engine will be ignored
--replace_column 1 #
BACKUP DATABASE db TO "db.backup";
# wipe-out backed-up database
DROP DATABASE db;
-CREATE DATABASE db;
--replace_column 1 #
RESTORE FROM "db.backup";
=== modified file 'mysql-test/suite/backup/t/backup_objects_dependency.test'
--- a/mysql-test/suite/backup/t/backup_objects_dependency.test 2009-03-11 01:14:44 +0000
+++ b/mysql-test/suite/backup/t/backup_objects_dependency.test 2009-06-24 19:39:33 +0000
@@ -432,7 +432,7 @@ SHOW CREATE TABLE ob3.tp;
SHOW CREATE TABLE ob2.t23;
SHOW CREATE TABLE ob3.tp;
-#
+# -- [DISABLED Bug#43549]
# BUG#43549 This portion disabled because the firing of the event is
# non-deterministic.
#
@@ -528,7 +528,7 @@ SHOW CREATE TABLE ob3.tp;
SHOW CREATE TABLE ob2.t23;
SHOW CREATE TABLE ob3.tp;
-#
+# -- [DISABLED Bug#43549]
# BUG#43549 This portion disabled because the firing of the event is
# non-deterministic.
#
@@ -646,7 +646,7 @@ INSERT INTO ob3.t32 VALUES(97);
SELECT * FROM ob3.t32;
SELECT * FROM ob1.t14;
-#
+# -- [DISABLED Bug#43549]
# BUG#43549 This portion disabled because the firing of the event is
# non-deterministic.
#
@@ -739,7 +739,7 @@ Let $db=ob3;
--error ER_NO_SUCH_TABLE
CALL ob3.fire('user3 created');
-#
+# -- [DISABLED Bug#43549]
# BUG#43549 This portion disabled because the firing of the event is
# non-deterministic.
#
=== modified file 'mysql-test/suite/backup/t/disabled.def'
--- a/mysql-test/suite/backup/t/disabled.def 2009-04-03 17:58:04 +0000
+++ b/mysql-test/suite/backup/t/disabled.def 2009-06-25 09:29:53 +0000
@@ -1,4 +1,4 @@
-|##############################################################################
+##############################################################################
#
# List the test cases that are to be disabled temporarily.
#
@@ -9,5 +9,4 @@
# Do not use any TAB characters for whitespace.
#
##############################################################################
-backup_no_engine : Bug#36021 2008-04-13 rsomla server crashes when openning table with unknown storage engine
backup_no_data : Bug#42756 2009-02-11 jorgen Test db state not preserved
=== modified file 'mysql-test/suite/backup_engines/t/backup_partitioning.test'
--- a/mysql-test/suite/backup_engines/t/backup_partitioning.test 2009-03-12 19:50:43 +0000
+++ b/mysql-test/suite/backup_engines/t/backup_partitioning.test 2009-06-24 19:39:33 +0000
@@ -193,6 +193,7 @@ ALTER TABLE `ê` PARTITION BY KEY(DOB) P
#Bug#20129
#We can include these operations in the test case once this bug is fixed.
+# -- [DISABLED Bug#45712]
#Bug#38784 Mysql server crash if table is altered with partition changes.
#This happens only in Windows OS. The # can be removed once the bug#38784
#is fixed.
=== modified file 'mysql-test/suite/funcs_1/r/storedproc.result'
--- a/mysql-test/suite/funcs_1/r/storedproc.result 2009-06-12 09:37:59 +0000
+++ b/mysql-test/suite/funcs_1/r/storedproc.result 2009-06-24 19:39:33 +0000
@@ -16797,18 +16797,12 @@ BEGIN
set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
return f1;
END//
-SELECT fn50(4.29e+09);
-fn50(4.29e+09)
-4290000000
DROP FUNCTION IF EXISTS fn51;
CREATE FUNCTION fn51( f1 int unsigned zerofill) returns int unsigned zerofill
BEGIN
set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
return f1;
END//
-SELECT fn51(4.29e+09);
-fn51(4.29e+09)
-4290000000
DROP FUNCTION IF EXISTS fn52;
CREATE FUNCTION fn52( f1 int zerofill) returns int zerofill
BEGIN
@@ -17928,18 +17922,12 @@ BEGIN
set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
SELECT f1;
END//
-CALL sp50(4.29e+09);
-f1
-4290000000
DROP PROCEDURE IF EXISTS sp51;
CREATE PROCEDURE sp51( f1 int unsigned zerofill)
BEGIN
set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
SELECT f1;
END//
-CALL sp51(4.29e+09);
-f1
-4290000000
DROP PROCEDURE IF EXISTS sp52;
CREATE PROCEDURE sp52( f1 int zerofill)
BEGIN
@@ -21390,11 +21378,6 @@ set var7 = -9.22e+18;
CALL sp81(4.29e+09, var1, var2, -9.22e+18, var3, var4, -9.22e+18, var5, var6, -9.22e+18, var7, var8);
SELECT var1, var2, var3, var4, var5, var6, var7, var8;
END//
-CALL spexecute81();
-f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12
-4290000000 4290000000 4290000010 -9220000000000000000 6744073709551616 6744073709551616 -9220000000000000000 6744073709551616 6744073709551616 -9220000000000000000 6744073709551616 6744073709551616
-var1 var2 var3 var4 var5 var6 var7 var8
-4290000000 4290000010 6744073709551616 6744073709551616 6744073709551616 6744073709551616 6744073709551616 6744073709551616
DROP PROCEDURE spexecute81;
DROP PROCEDURE sp81;
DROP PROCEDURE IF EXISTS sp82;
@@ -21424,11 +21407,6 @@ set var7 = -9.22e+18;
CALL sp82(4.29e+09, var1, var2, -9.22e+18, var3, var4, -9.22e+18, var5, var6, -9.22e+18, var7, var8);
SELECT var1, var2, var3, var4, var5, var6, var7, var8;
END//
-CALL spexecute82();
-f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12
-4290000000 4290000000 4290000010 -9220000000000000000 6744073709551616 6744073709551616 -9220000000000000000 6744073709551616 6744073709551616 -9220000000000000000 6744073709551616 6744073709551616
-var1 var2 var3 var4 var5 var6 var7 var8
-4290000000 4290000010 6744073709551616 6744073709551616 6744073709551616 6744073709551616 6744073709551616 6744073709551616
DROP PROCEDURE spexecute82;
DROP PROCEDURE sp82;
DROP PROCEDURE IF EXISTS sp83;
=== modified file 'mysql-test/suite/funcs_1/t/storedproc.test'
--- a/mysql-test/suite/funcs_1/t/storedproc.test 2009-06-09 16:22:40 +0000
+++ b/mysql-test/suite/funcs_1/t/storedproc.test 2009-06-24 19:39:33 +0000
@@ -444,6 +444,7 @@ BEGIN
END//
delimiter ;//
+# -- [DISABLED Bug#33396]
# warnings for this select disabled due to diffs with/without --ps-protocol:
# without ps-protocol the following warning is shown:
# +Note 1291 Column '' has duplicated value 'value1' in SET
@@ -468,6 +469,7 @@ BEGIN
END//
delimiter ;//
+# -- [DISABLED Bug#33396]
# warnings for this select disabled due to diffs with/without --ps-protocol:
# without ps-protocol the following warning is shown:
# +Note 1291 Column '' has duplicated value 'value1' in SET
@@ -20541,7 +20543,8 @@ BEGIN
END//
delimiter ;//
-SELECT fn50(4.29e+09);
+# -- [DISABLED Bug#45293]
+# SELECT fn50(4.29e+09);
--disable_warnings
@@ -20556,7 +20559,8 @@ BEGIN
END//
delimiter ;//
-SELECT fn51(4.29e+09);
+# -- [DISABLED Bug#45293]
+# SELECT fn51(4.29e+09);
--disable_warnings
@@ -22139,7 +22143,8 @@ BEGIN
END//
delimiter ;//
-CALL sp50(4.29e+09);
+# -- [DISABLED Bug#45293]
+# CALL sp50(4.29e+09);
--disable_warnings
DROP PROCEDURE IF EXISTS sp51;
@@ -22153,7 +22158,8 @@ BEGIN
END//
delimiter ;//
-CALL sp51(4.29e+09);
+# -- [DISABLED Bug#45293]
+# CALL sp51(4.29e+09);
--disable_warnings
DROP PROCEDURE IF EXISTS sp52;
@@ -26122,7 +26128,8 @@ BEGIN
END//
delimiter ;//
-CALL spexecute81();
+# -- [DISABLED Bug#45293]
+# CALL spexecute81();
DROP PROCEDURE spexecute81;
DROP PROCEDURE sp81;
@@ -26160,7 +26167,8 @@ BEGIN
END//
delimiter ;//
-CALL spexecute82();
+# -- [DISABLED Bug#45293]
+# CALL spexecute82();
DROP PROCEDURE spexecute82;
DROP PROCEDURE sp82;
=== modified file 'mysql-test/suite/ndb/r/ndb_gis.result'
--- a/mysql-test/suite/ndb/r/ndb_gis.result 2009-02-14 16:10:30 +0000
+++ b/mysql-test/suite/ndb/r/ndb_gis.result 2009-06-25 12:11:17 +0000
@@ -324,11 +324,6 @@ fid IsClosed(g)
114 0
115 0
116 0
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid;
-fid AsText(Centroid(g))
-117 POINT(55.58852775304245 17.426536064113982)
-118 POINT(55.58852775304245 17.426536064113982)
-119 POINT(2 2)
SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid;
fid Area(g)
117 1684.5
@@ -876,11 +871,6 @@ fid IsClosed(g)
114 0
115 0
116 0
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid;
-fid AsText(Centroid(g))
-117 POINT(55.58852775304245 17.426536064113982)
-118 POINT(55.58852775304245 17.426536064113982)
-119 POINT(2 2)
SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid;
fid Area(g)
117 1684.5
=== modified file 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def 2009-03-06 22:17:00 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def 2009-06-24 19:39:33 +0000
@@ -14,5 +14,5 @@ ndb_partition_error2 : Bug#40989 msven
# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
#ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events
ndb_cache_trans : Bug#42565 ndb_cache_trans failure since SERVER_STATUS_IN_TRANS added to hash key
-ndb_alter_table_online : WL#4284: Needs to be reworked, tries to alter table used by a pending transaction.
-ndb_alter_table3 : WL#4284: Needs to be reworked, tries to alter table used by a pending transaction.
+ndb_alter_table_online : Bug#45621 2009-06-19 alik A few test files are disabled due to WL#4284
+ndb_alter_table3 : Bug#45621 2009-06-10 alik A few test files are disabled due to WL#4284
=== modified file 'mysql-test/suite/ndb/t/ndb_basic.test'
--- a/mysql-test/suite/ndb/t/ndb_basic.test 2008-10-15 12:14:27 +0000
+++ b/mysql-test/suite/ndb/t/ndb_basic.test 2009-06-24 19:39:33 +0000
@@ -6,6 +6,7 @@ DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t
drop database if exists mysqltest;
--enable_warnings
+# -- [DISABLED Bug#45709]
# workaround for bug#16445
# remove to reproduce bug and run tests from ndb start
# and with ndb_autodiscover disabled. Fails on Linux 50 % of the times
=== modified file 'mysql-test/suite/ndb/t/ndb_index.test'
--- a/mysql-test/suite/ndb/t/ndb_index.test 2007-07-04 20:38:53 +0000
+++ b/mysql-test/suite/ndb/t/ndb_index.test 2009-06-24 19:39:33 +0000
@@ -43,6 +43,8 @@ select port, accessnode, pop, accesstype
select port, accessnode, pop, accesstype from t1 where pop='pop98';
select port, accessnode, pop, accesstype from t1 where pop='pop98';
select port, accessnode, pop, accesstype from t1 where pop='pop98' order by accesstype;
+
+# -- [DISABLED Bug#45720]
# The following two querys will not return any rows since
# the index used for access is case sensitive
# They are thus disabled for now
=== modified file 'mysql-test/suite/ndb/t/ndb_index_ordered.test'
--- a/mysql-test/suite/ndb/t/ndb_index_ordered.test 2009-03-06 22:17:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_index_ordered.test 2009-06-24 19:39:33 +0000
@@ -334,6 +334,7 @@ select count(*)- 4 from t1 use index (v)
drop table t1;
#
+# -- [DISABLED Bug#45721]
# Disabled due to WL#4284
#
# Needs to be reworked. It's not possible anymore to do a non-fast alter table
=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_basic.test'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_basic.test 2009-01-29 12:44:41 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_basic.test 2009-06-24 19:39:33 +0000
@@ -48,6 +48,7 @@ select inserts,updates,deletes from
mysql.ndb_binlog_index where epoch > @max_epoch and updates > 0;
#
+# -- [DISABLED Bug#45722]
# check that purge clears the ndb_binlog_index
#
# TODO: make this deterministic
=== modified file 'mysql-test/suite/ndb_team/t/ndb_autodiscover.test'
--- a/mysql-test/suite/ndb_team/t/ndb_autodiscover.test 2009-02-20 13:35:24 +0000
+++ b/mysql-test/suite/ndb_team/t/ndb_autodiscover.test 2009-06-24 19:39:33 +0000
@@ -1,6 +1,7 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
+# -- [DISABLED Bug#41308]
# Bug#41308: Test main.ndb_autodiscover.test doesn't work on Windows due
# to 'grep' calls
# Test is currently disabled on Windows via the next line until this bug
@@ -510,6 +511,7 @@ drop database test_only_ndb_tables;
# a table with tha same name as a table that can't be
# discovered( for example a table created via NDBAPI)
+# -- [DISABLED Bug#45725]
# Test disabled since it doesn't work on case insensitive systems
#--error ER_TABLE_EXISTS_ERROR
#CREATE TABLE sys.SYSTAB_0 (a int);
=== modified file 'mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc'
--- a/mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc 2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc 2009-06-24 19:39:33 +0000
@@ -48,6 +48,7 @@ let $val1 = 5.1230;
let $val2 = 13.345;
let $val3 = 17.987;
let $val4 = 15.654 ;
+# -- [DISABLED Bug#45717]
# DISABLED due to bug 30577
#--source suite/parts/inc/partition_supported_sql_funcs.inc
@@ -59,6 +60,7 @@ let $val1 = 5.1230;
let $val2 = 13.345;
let $val3 = 17.987;
let $val4 = 15.654 ;
+# -- [DISABLED Bug#45717]
# DISABLED due to bug 30577
#--source suite/parts/inc/partition_supported_sql_funcs.inc
=== modified file 'mysql-test/suite/parts/inc/partition_decimal.inc'
--- a/mysql-test/suite/parts/inc/partition_decimal.inc 2008-02-06 14:13:56 +0000
+++ b/mysql-test/suite/parts/inc/partition_decimal.inc 2009-06-24 19:39:33 +0000
@@ -35,6 +35,7 @@ dec $count;
select count(*) from t2;
drop table t2;
+# -- [DISABLED Bug#45717]
# Bug 30577: FLOOR() and CEILING() not usable as partition functions
# Partition functions are required to return INT_RESULT; FLOOR() and
# CEILING() do not, unless they have an INT argument. Disable this
=== modified file 'mysql-test/suite/parts/inc/partition_double.inc'
--- a/mysql-test/suite/parts/inc/partition_double.inc 2008-02-06 14:13:56 +0000
+++ b/mysql-test/suite/parts/inc/partition_double.inc 2009-06-24 19:39:33 +0000
@@ -36,6 +36,7 @@ select count(*) from t2;
drop table t2;
+# -- [DISABLED Bug#45717]
# Bug 30577: FLOOR() and CEILING() not usable as partition functions
# Partition functions are required to return INT_RESULT; FLOOR() and
# CEILING() do not, unless they have an INT argument. Disable this
=== modified file 'mysql-test/suite/parts/inc/partition_float.inc'
--- a/mysql-test/suite/parts/inc/partition_float.inc 2008-02-06 14:13:56 +0000
+++ b/mysql-test/suite/parts/inc/partition_float.inc 2009-06-24 19:39:33 +0000
@@ -39,6 +39,7 @@ dec $count;
select count(*) from t2;
drop table t2;
+# -- [DISABLED Bug#45717]
# Bug 30577: FLOOR() and CEILING() not usable as partition functions
# Partition functions are required to return INT_RESULT; FLOOR() and
# CEILING() do not, unless they have an INT argument. Disable this
=== modified file 'mysql-test/suite/parts/t/disabled.def'
--- a/mysql-test/suite/parts/t/disabled.def 2009-06-11 03:59:25 +0000
+++ b/mysql-test/suite/parts/t/disabled.def 2009-06-24 19:39:33 +0000
@@ -1,4 +1,4 @@
-partition_basic_ndb : Bug#19899 Crashing the server (cannot create t1)
+partition_basic_ndb : Bug#45710
# http://dev.mysql.com/doc/refman/5.1/en/mysql-cluster-limitations-syntax.html
partition_syntax_ndb : Bug#36735 Not supported
ndb_dd_backuprestore : Bug#32659 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def 2009-06-11 14:24:28 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def 2009-06-24 19:39:33 +0000
@@ -15,6 +15,6 @@ rpl_extraColmaster_myisam : BUG#40796 2
rpl_cross_version : BUG#42311 2009-03-27 joro rpl_cross_version fails on macosx
rpl_heartbeat_basic : Bug#43828 Sporadic failures (Serge.Kozlov@sun.com)
rpl_heartbeat_2slaves : Bug#43828 Sporadic failures (Serge.Kozlov@stripped)
-rpl_failed_optimize : WL#4284: Can't optimize table used by a pending transaction (there is metadata lock on the table).
-rpl_read_only : WL#4284: Setting Read only won't succeed until all metadata locks are released.
-rpl_init_slave : Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows
+rpl_failed_optimize : Bug#44938 Replication fails when optimizing a table used by pending transaction.
+rpl_read_only : Bug#44958 Setting read_only won't succeed if tx is already started in different connection
+rpl_init_slave : Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_multi.test'
--- a/mysql-test/suite/rpl/t/rpl_backup_multi.test 2009-05-26 22:21:34 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_multi.test 2009-06-24 19:39:33 +0000
@@ -9,6 +9,9 @@
--source include/not_embedded.inc
--source include/have_innodb.inc
+# -- [DISABLED Bug#45238]
+--source include/not_windows.inc
+
# Set up multi master-slave configuration
--source suite/rpl/include/rpl_backup_multi.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test'
--- a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test 2008-10-29 17:40:17 +0000
+++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test 2009-06-24 19:39:33 +0000
@@ -6,6 +6,10 @@
# AUTO_INCREMENT_OFFSET variables and failover
#############################################################
--source include/have_innodb.inc
+
+# -- [DISABLED Bug#45238]
+--source include/not_windows.inc
+
# Use wait_for_slave_to_(start|stop) for current connections
let $keep_connection= 1;
=== modified file 'mysql-test/suite/rpl/t/rpl_cross_version.test'
--- a/mysql-test/suite/rpl/t/rpl_cross_version.test 2009-02-16 12:51:39 +0000
+++ b/mysql-test/suite/rpl/t/rpl_cross_version.test 2009-06-24 19:39:33 +0000
@@ -12,6 +12,7 @@
--source include/have_log_bin.inc
+# -- [DISABLED Bug#42879]
# The test is disabled for windows due to
# Bug #42879 CHANGE MASTER RELAY_LOG_FILE=path fails on windows
# Todo: release it from not_windows
=== modified file 'mysql-test/suite/rpl/t/rpl_extraCol_innodb.test'
--- a/mysql-test/suite/rpl/t/rpl_extraCol_innodb.test 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_extraCol_innodb.test 2009-06-25 12:33:12 +0000
@@ -9,5 +9,3 @@
-- source include/master-slave.inc
let $engine_type = 'InnoDB';
-- source extra/rpl_tests/rpl_extraSlave_Col.test
-
-
=== modified file 'mysql-test/suite/rpl/t/rpl_extraCol_myisam.test'
--- a/mysql-test/suite/rpl/t/rpl_extraCol_myisam.test 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_extraCol_myisam.test 2009-06-25 12:33:12 +0000
@@ -4,9 +4,8 @@
# Purpose: Wapper for rpl_extraSlave_Col.test
# Using MyISAM
###########################################
+
-- source include/have_binlog_format_row.inc
-- source include/master-slave.inc
let $engine_type = 'MyISAM';
-- source extra/rpl_tests/rpl_extraSlave_Col.test
-
-
=== modified file 'mysql-test/suite/rpl/t/rpl_killed_ddl.test'
--- a/mysql-test/suite/rpl/t/rpl_killed_ddl.test 2009-04-08 23:42:51 +0000
+++ b/mysql-test/suite/rpl/t/rpl_killed_ddl.test 2009-06-24 19:39:33 +0000
@@ -144,6 +144,7 @@ let $diff_statement= SHOW DATABASES LIKE
send CREATE DATABASE d2;
source include/kill_query_and_diff_master_slave.inc;
+# -- [DISABLED Bug#44041]
# Temporarily disabled, see BUG#44041, the ALTER DATABASE can affect the
# collation of other database on slave
#send ALTER DATABASE d1
@@ -166,6 +167,7 @@ send CREATE EVENT e2
DO INSERT INTO test.t1 VALUES (2);
source include/kill_query_and_diff_master_slave.inc;
+# -- [DISABLED Bug#44171]
# Temporarily disabled because of BUG#44171, killing ALTER EVENT can
# crash the server
#send ALTER EVENT e1
@@ -197,6 +199,7 @@ source include/kill_query_and_diff_maste
# function f2 probably does not exist because the CREATE query was
# killed
#
+# -- [DISABLED Bug#43353]
# Temporarily disabled. Because of BUG#43353, KILL the query may
# result in function not found, and for 5.1, DROP statements will be
# logged if the function is not found on master, so the following DROP
@@ -256,6 +259,7 @@ source include/kill_query_and_diff_maste
######## SERVER ########
+# -- [DISABLED Bug#25705]
# Tempoarily disabled, see bug#25705
# let $diff_statement= SELECT * FROM mysql.server WHERE name like 's%';
=== modified file 'mysql-test/suite/rpl/t/rpl_row_colSize.test'
--- a/mysql-test/suite/rpl/t/rpl_row_colSize.test 2007-08-10 16:48:01 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_colSize.test 2009-06-24 19:39:33 +0000
@@ -6,6 +6,9 @@
# having columns that are smaller (shorter) than the slave. #
##################################################################
+# -- [DISABLED Bug#45238]
+--source include/not_windows.inc
+
-- source include/master-slave.inc
-- source include/have_binlog_format_row.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_row_create_table.test'
--- a/mysql-test/suite/rpl/t/rpl_row_create_table.test 2009-02-02 15:58:48 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_create_table.test 2009-06-24 19:39:33 +0000
@@ -1,6 +1,9 @@
# Testing table creations for row-based replication.
-
--source include/have_binlog_format_row.inc
+
+# -- [DISABLED Bug#45238]
+--source include/not_windows.inc
+
--source include/master-slave.inc
--source include/have_innodb.inc
connection slave;
=== modified file 'mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test'
--- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test 2009-04-28 22:19:38 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test 2009-06-24 19:39:33 +0000
@@ -181,8 +181,6 @@ select "--- Test 3 First Remote test --"
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --stop-position=569 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
-# This part is disabled due to bug #17654
-
--disable_query_log
select "--- Test 4 Second Remote test --" as "";
--enable_query_log
=== modified file 'mysql-test/suite/rpl/t/rpl_stm_log.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_log.test 2007-06-27 12:29:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_log.test 2009-06-24 19:39:33 +0000
@@ -1,5 +1,10 @@
# Requires statement logging
+
-- source include/have_binlog_format_mixed_or_statement.inc
+
+# -- [DISABLED Bug#45238]
+--source include/not_windows.inc
+
-- source include/master-slave.inc
let $engine_type=MyISAM;
-- source extra/rpl_tests/rpl_log.test
=== modified file 'mysql-test/suite/rpl/t/rpl_temporary.test'
--- a/mysql-test/suite/rpl/t/rpl_temporary.test 2009-05-22 23:44:08 +0000
+++ b/mysql-test/suite/rpl/t/rpl_temporary.test 2009-06-24 19:39:33 +0000
@@ -1,6 +1,9 @@
# Test need anonymous user when connection are made as "zedjzlcsjhd"
source include/add_anonymous_users.inc;
+# -- [DISABLED Bug#45238]
+--source include/not_windows.inc
+
-- source include/master-slave.inc
# Clean up old slave's binlogs.
=== modified file 'mysql-test/suite/rpl/t/rpl_truncate_3innodb.test'
--- a/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test 2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test 2009-06-24 19:39:33 +0000
@@ -2,5 +2,9 @@
--source include/have_innodb.inc
--source include/not_ndb_default.inc
+# -- [DISABLED Bug#45238]
+--source include/not_windows.inc
+
+
let $engine=InnoDB;
--source extra/rpl_tests/rpl_truncate.test
=== modified file 'mysql-test/suite/sys_vars/inc/timestamp_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/timestamp_basic.inc 2009-02-03 09:16:53 +0000
+++ b/mysql-test/suite/sys_vars/inc/timestamp_basic.inc 2009-06-24 19:39:33 +0000
@@ -102,6 +102,7 @@ SET @@timestamp = 9999999999999999999999
# Check if the value in SESSION Table matches value in variable #
#########################################################################
+# -- [DISABLED Bug#41584]
# disabled due to bug#41584
#SELECT @@timestamp = VARIABLE_VALUE
#FROM INFORMATION_SCHEMA.SESSION_VARIABLES
=== modified file 'mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test'
--- a/mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test 2009-06-24 19:39:33 +0000
@@ -127,6 +127,7 @@ disconnect conUser1;
SET GLOBAL automatic_sp_privileges = @global_automatic_sp_privileges;
+# -- [DISABLED Bug#35384]
# Disabled due to differences in results: Bug#35384
#SHOW GRANTS FOR 'userTest'@'localhost';
=== modified file 'mysql-test/suite/sys_vars/t/disabled.def'
--- a/mysql-test/suite/sys_vars/t/disabled.def 2009-04-03 09:30:07 +0000
+++ b/mysql-test/suite/sys_vars/t/disabled.def 2009-06-25 10:58:03 +0000
@@ -11,7 +11,6 @@
##############################################################################
query_cache_size_basic_32 : Bug#36747: Allocating a large query cache is not deterministic
query_cache_size_basic_64 : Bug#36747: Allocating a large query cache is not deterministic
-max_heap_table_size_basic_32 : Bug#36877: main.max_heap_table_size_basic_32 fails on some systems
#thread_cache_size_func : Bug#40575: 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads
log_output_basic : Bug#40988: log_output_basic.test succeeded though syntactically false.
=== modified file 'mysql-test/suite/sys_vars/t/foreign_key_checks_func.test'
--- a/mysql-test/suite/sys_vars/t/foreign_key_checks_func.test 2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/t/foreign_key_checks_func.test 2009-06-24 19:39:33 +0000
@@ -112,6 +112,7 @@ ALTER TABLE t2 DROP FOREIGN KEY fk;
SET @@session.foreign_key_checks = 1;
+# -- [DISABLED Bug#45726]
# Test disabled as error description is different. The resulting description has
# difference in code #sql-xxx_2 where xxx is different for each run.
#--Error ER_NO_REFERENCED_ROW_2
=== modified file 'mysql-test/t/csv_not_null.test'
--- a/mysql-test/t/csv_not_null.test 2009-02-05 09:49:32 +0000
+++ b/mysql-test/t/csv_not_null.test 2009-06-24 19:39:33 +0000
@@ -55,6 +55,7 @@ INSERT INTO t1 VALUES();
SELECT * FROM t1;
-- disable_warnings
+# -- [DISABLED Bug#33717]
# NOTE - Test disabled due to enum crash for this INSERT
# See Bug#33717 - INSERT...(default) fails for enum.
# Crashes CSV tables, loads spaces for MyISAM
=== modified file 'mysql-test/t/ctype_ldml.test'
--- a/mysql-test/t/ctype_ldml.test 2009-06-08 14:58:33 +0000
+++ b/mysql-test/t/ctype_ldml.test 2009-06-24 19:39:33 +0000
@@ -1,12 +1,5 @@
--source include/have_ucs2.inc
-#
-# Disabled due to WL#1213 removal
-#
-# --source include/have_utf16.inc
-# --source include/have_utf32.inc
-
-
--disable_warnings
drop table if exists t1;
--enable_warnings
=== modified file 'mysql-test/t/ctype_utf8.test'
--- a/mysql-test/t/ctype_utf8.test 2009-06-11 09:13:52 +0000
+++ b/mysql-test/t/ctype_utf8.test 2009-06-24 19:39:33 +0000
@@ -1449,33 +1449,6 @@ DROP TABLE t1;
--echo End of 5.0 tests
#
-# Disabled due to removal of WL#1213.
-#
-# #
-# # Bug#32914 Character sets: illegal characters in utf8 and utf32 columns
-# #
-# create table t1 (utf8 char(1) character set utf8);
-# --echo Testing [F0][90..BF][80..BF][80..BF]
-# insert into t1 values (0xF0908080);
-# insert into t1 values (0xF0BFBFBF);
-# insert into t1 values (0xF08F8080);
-# select hex(utf8) from t1;
-# delete from t1;
-
-# --echo Testing [F2..F3][80..BF][80..BF][80..BF]
-# insert into t1 values (0xF2808080);
-# insert into t1 values (0xF2BFBFBF);
-# select hex(utf8) from t1;
-# delete from t1;
-
-# --echo Testing [F4][80..8F][80..BF][80..BF]
-# insert into t1 values (0xF4808080);
-# insert into t1 values (0xF48F8080);
-# insert into t1 values (0xF4908080);
-# select hex(utf8) from t1;
-# drop table t1;
-
-#
# Bug#26474: Add Sinhala script (Sri Lanka) collation to MySQL
#
--disable_warnings
@@ -1541,19 +1514,4 @@ INSERT INTO t1 VALUES (19, x'E0B696'), (
SELECT predicted_order, hex(utf8_encoding) FROM t1 ORDER BY utf8_encoding COLLATE utf8_sinhala_ci;
DROP TABLE t1;
-#
-# Disabled due to removal of WL#1213.
-#
-# #
-# # Check that supplementary characters are not allowed in identifiers
-# #
-# --error 1300
-# CREATE DATABASE `𐀀`;
-# --error 1300
-# CREATE TABLE `𐀀` (a int);
-# --error 1166
-# CREATE TABLE test.t1 SELECT '𐀀';
-# --error 1300
-# CREATE USER `𐀀`;
-
--echo End of tests
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def 2009-06-11 14:24:28 +0000
+++ b/mysql-test/t/disabled.def 2009-06-25 11:50:39 +0000
@@ -15,3 +15,4 @@ innodb_bug39438 : Bug#42383 2009-01
query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
information_schema : Bug#42893 2009-03-26 alik main.information_schema times out sporadically
init_connect : Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows
+skip_name_resolve : Bug#43006 2009-06-25 alik main.skip_name_resolve fails on Windows in PB2
=== modified file 'mysql-test/t/gis.test'
--- a/mysql-test/t/gis.test 2009-04-29 03:50:14 +0000
+++ b/mysql-test/t/gis.test 2009-06-25 11:45:53 +0000
@@ -108,7 +108,8 @@ explain extended select AsText(Centroid(
SELECT fid, IsClosed(g) FROM gis_multi_line;
-SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
+# -- [DISABLED Bug#38092]
+# SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
SELECT fid, Area(g) FROM gis_multi_polygon;
SELECT fid, NumGeometries(g) from gis_multi_point;
@@ -359,12 +360,13 @@ insert into t1 values ('85984',GeomFromT
select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from
t1 where object_id=85998;
+# -- [DISABLED Bug#38092]
# Expected results are -114.87787186923313 and 36.33101763469049, but IA64
# returns -114.87787186923326 and 36.33101763469043 due to fused multiply-add
# instructions.
---replace_result -114.87787186923326 -114.87787186923313 36.33101763469043 36.33101763469049
-select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from
-t1 where object_id=85984;
+# --replace_result -114.87787186923326 -114.87787186923313 36.33101763469043 36.33101763469049
+# select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from
+# t1 where object_id=85984;
drop table t1;
=== modified file 'mysql-test/t/index_merge_innodb.test'
--- a/mysql-test/t/index_merge_innodb.test 2006-09-18 14:55:56 +0000
+++ b/mysql-test/t/index_merge_innodb.test 2009-06-24 19:39:33 +0000
@@ -15,6 +15,7 @@ let $engine_type= InnoDB;
# InnoDB does not support Merge tables (affects include/index_merge1.inc)
let $merge_table_support= 0;
+# -- [DISABLED Bug#45727]
# The first two tests are disabled because of non deterministic explain output.
# If include/index_merge1.inc can be enabled for InnoDB and all other
# storage engines, please remove the subtest for Bug#21277 from
=== modified file 'mysql-test/t/information_schema_db.test'
--- a/mysql-test/t/information_schema_db.test 2009-05-15 15:59:57 +0000
+++ b/mysql-test/t/information_schema_db.test 2009-06-24 19:39:33 +0000
@@ -1,5 +1,5 @@
# this test mostly test privilege control (what doesn't work
-# in the embedded server by default). So disabled in embedded-server mode
+# in the embedded server by default). So skip the test in embedded-server mode.
-- source include/not_embedded.inc
-- source include/testdb_only.inc
=== modified file 'mysql-test/t/innodb_ctype_ldml.test'
--- a/mysql-test/t/innodb_ctype_ldml.test 2009-06-02 18:04:09 +0000
+++ b/mysql-test/t/innodb_ctype_ldml.test 2009-06-24 19:39:33 +0000
@@ -1,13 +1,6 @@
--source include/have_innodb.inc
--source include/have_ucs2.inc
-#
-# Disabled due to WL#1213 removal.
-#
-# --source include/have_utf16.inc
-# --source include/have_utf32.inc
-
-
--disable_warnings
drop table if exists t1;
--enable_warnings
=== modified file 'mysql-test/t/mysqlbinlog-cp932.test'
--- a/mysql-test/t/mysqlbinlog-cp932.test 2007-12-12 17:19:24 +0000
+++ b/mysql-test/t/mysqlbinlog-cp932.test 2009-06-24 19:39:33 +0000
@@ -1,3 +1,4 @@
+# -- [DISABLED Bug#45728]
# disabled in embedded until tools running is fixed with embedded
--source include/not_embedded.inc
=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test 2009-05-29 16:22:30 +0000
+++ b/mysql-test/t/mysqldump.test 2009-06-24 19:39:33 +0000
@@ -1698,6 +1698,7 @@ DROP TABLE t1;
# Added for use-thread option
#
+# -- [DISABLED Bug#32991]
# THIS PART OF THE TEST IS DISABLED UNTIL Bug#32991 IS FIXED
if ($bug32991_fixed) {
=== modified file 'mysql-test/t/partition_mgm_err2.test'
--- a/mysql-test/t/partition_mgm_err2.test 2008-10-02 14:14:27 +0000
+++ b/mysql-test/t/partition_mgm_err2.test 2009-06-24 19:39:33 +0000
@@ -4,9 +4,8 @@
--source include/have_partition.inc
--source include/have_symlink.inc
-#
-# This test is disabled on windows due to BUG#19107
-#
+# -- [DISABLED Bug#33687]
+# This test is disabled on windows due to BUG#33687
--source include/not_windows.inc
#
# BUG: 14354 Partitions: data directory clause fails
=== modified file 'mysql-test/t/partition_not_windows.test'
--- a/mysql-test/t/partition_not_windows.test 2009-02-02 15:58:48 +0000
+++ b/mysql-test/t/partition_not_windows.test 2009-06-24 19:39:33 +0000
@@ -4,7 +4,8 @@
# DATA DIRECTORY/INDEX DIRECTORY require symbolic link support
--source include/have_symlink.inc
-# The test for Bug 20770 is disabled on Windows due to BUG#19107; it
+# -- [DISABLED Bug#33687]
+# The test for Bug 20770 is disabled on Windows due to BUG#33687; it
# should be moved into partition.test once the bug has been resolved.
#
=== modified file 'mysql-test/t/ps.test'
--- a/mysql-test/t/ps.test 2009-05-29 08:09:00 +0000
+++ b/mysql-test/t/ps.test 2009-06-24 19:39:33 +0000
@@ -2795,7 +2795,7 @@ execute abc;
deallocate prepare abc;
drop table t1, t2;
-#
+# -- [DISABLED Bug#45716]
# Bug #21422: GRANT/REVOKE possible inside stored function, probably in a trigger
# This is disabled for now till it is resolved in 5.0
#
=== modified file 'mysql-test/t/query_cache.test'
--- a/mysql-test/t/query_cache.test 2009-02-13 16:30:54 +0000
+++ b/mysql-test/t/query_cache.test 2009-06-24 19:39:33 +0000
@@ -1185,6 +1185,8 @@ set global query_cache_type=0;
show status like 'Qcache_free_blocks';
--echo Restore default values.
+#
+# -- [DISABLED Bug#45729]
# Bug#28211 RENAME DATABASE and query cache don't play nicely together
#
# TODO: enable these tests when RENAME DATABASE is implemented.
=== modified file 'mysql-test/t/show_check.test'
--- a/mysql-test/t/show_check.test 2009-03-06 20:33:52 +0000
+++ b/mysql-test/t/show_check.test 2009-06-24 19:39:33 +0000
@@ -1,4 +1,4 @@
-# Uses GRANT commands that usually disabled in embedded server
+# Uses GRANT commands that are not available in embedded server
-- source include/not_embedded.inc
# check that CSV engine was compiled in, as the result of the test
@@ -362,6 +362,7 @@ delete from mysql.db
where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
flush privileges;
+# -- [DISABLED Bug#45730]
# This test fails on MAC OSX, so it is temporary disabled.
# This needs WL#1324 to be done.
#set names latin1;
=== modified file 'mysql-test/t/sp.test'
--- a/mysql-test/t/sp.test 2009-06-17 07:30:19 +0000
+++ b/mysql-test/t/sp.test 2009-06-24 19:39:33 +0000
@@ -3352,6 +3352,7 @@ begin
select plus;
end|
+# -- [DISABLED Bug#45707]
# QQ: This is currently disabled. Not only does it slow down a normal test
# run, it makes running with valgrind (or similar tools) extremely
# painful.
@@ -4069,6 +4070,7 @@ drop procedure if exists bug7088_1|
drop procedure if exists bug7088_2|
--enable_warnings
+# -- [DISABLED Bug#45708]
--disable_parsing # temporarily disabled until Bar fixes BUG#11986
create procedure bug6063()
lâbel: begin end|
=== modified file 'mysql-test/t/symlink.test'
--- a/mysql-test/t/symlink.test 2009-05-15 13:45:06 +0000
+++ b/mysql-test/t/symlink.test 2009-06-24 19:39:33 +0000
@@ -73,6 +73,7 @@ create database mysqltest;
--error 1,1
create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="/this-dir-does-not-exist";
+# -- [DISABLED Bug#45731]
# temporarily disabled as it returns different result in the embedded server
# --error ER_WRONG_ARGUMENTS, ER_WRONG_ARGUMENTS
# create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path";
=== modified file 'mysql-test/t/trigger.test'
--- a/mysql-test/t/trigger.test 2009-06-16 12:27:49 +0000
+++ b/mysql-test/t/trigger.test 2009-06-24 19:39:33 +0000
@@ -862,6 +862,7 @@ select * from t1;
drop trigger t1_bi;
drop tables t1, t2;
+# -- [DISABLED Bug#45732]
# Tests for bug #12704 "Server crashes during trigger execution".
# If we run DML statements and CREATE TRIGGER statements concurrently
# it may happen that trigger will be created while DML statement is
=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc 2009-06-09 16:53:34 +0000
+++ b/sql/opt_range.cc 2009-06-24 10:55:41 +0000
@@ -4862,13 +4862,14 @@ static TRP_RANGE *get_key_scans_params(P
found_records= check_quick_select(param, idx, read_index_only, *key,
update_tbl_stats, &mrr_flags,
&buf_size, &cost);
- found_read_time= cost.total_cost();
+
if ((found_records != HA_POS_ERROR) && param->is_ror_scan)
{
tree->n_ror_scans++;
tree->ror_scans_map.set_bit(idx);
}
- if (found_records != HA_POS_ERROR && read_time > found_read_time)
+ if (found_records != HA_POS_ERROR &&
+ read_time > (found_read_time= cost.total_cost()))
{
read_time= found_read_time;
best_records= found_records;
Attachment: [text/bzr-bundle] bzr/holyfoot@mysql.com-20090625111804-zkgex4vbiysyikxs.bundle
| Thread | ||
|---|---|---|
| • bzr commit into mysql-5.4 branch (holyfoot:3356) | Alexey Botchkov | 25 Jun 2009 |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.719 sec. using MySQL 5.1.14-beta-log