2642 Patrick Crews 2008-07-01
Bug#37380 - Test funcs_1.is_columns_myisam_embedded fails on OS X
Test was failing due to the addition of a '\x05' character in result sets
Latest builds of the server have shown this problem to have disappeared.
Removing code within the test that disables the test on Mac OS X.
Recommit due to tree error on earlier, approved patch.
modified:
mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
2641 Timothy Smith 2008-06-27 [merge]
Merge from upstream (my:5.0-bugteam)
added:
mysql-test/include/wait_condition.inc
mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
mysql-test/suite/funcs_1/datadict/is_routines.inc
mysql-test/suite/funcs_1/datadict/is_schemata.inc
mysql-test/suite/funcs_1/datadict/is_tables.inc
mysql-test/suite/funcs_1/datadict/is_triggers.inc
mysql-test/suite/funcs_1/datadict/is_views.inc
mysql-test/suite/funcs_1/datadict/tables.inc
mysql-test/suite/funcs_1/include/bug28309_skip.inc
mysql-test/suite/funcs_1/r/is_cml_innodb.result
mysql-test/suite/funcs_1/r/is_cml_memory.result
mysql-test/suite/funcs_1/r/is_cml_myisam.result
mysql-test/suite/funcs_1/r/is_cml_ndb.result
mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
mysql-test/suite/funcs_1/r/is_routines_embedded.result
mysql-test/suite/funcs_1/r/is_schemata_embedded.result
mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_tables_embedded.result
mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result
mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_triggers_embedded.result
mysql-test/suite/funcs_1/r/is_views_embedded.result
mysql-test/suite/funcs_1/t/is_cml_innodb.test
mysql-test/suite/funcs_1/t/is_cml_memory.test
mysql-test/suite/funcs_1/t/is_cml_myisam.test
mysql-test/suite/funcs_1/t/is_cml_ndb.test
mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test
mysql-test/suite/funcs_1/t/is_routines_embedded.test
mysql-test/suite/funcs_1/t/is_schemata_embedded.test
mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_tables_embedded.test
mysql-test/suite/funcs_1/t/is_tables_myisam_embedded.test
mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_triggers_embedded.test
mysql-test/suite/funcs_1/t/is_views_embedded.test
modified:
client/mysql.cc
mysql-test/r/mysql.result
mysql-test/r/varbinary.result
mysql-test/suite/funcs_1/datadict/columns.inc
mysql-test/suite/funcs_1/datadict/tables1.inc
mysql-test/suite/funcs_1/datadict/tables2.inc
mysql-test/suite/funcs_1/include/innodb_tb1.inc
mysql-test/suite/funcs_1/include/innodb_tb3.inc
mysql-test/suite/funcs_1/include/innodb_tb4.inc
mysql-test/suite/funcs_1/include/memory_tb4.inc
mysql-test/suite/funcs_1/include/myisam_tb1.inc
mysql-test/suite/funcs_1/include/myisam_tb3.inc
mysql-test/suite/funcs_1/include/myisam_tb4.inc
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
mysql-test/suite/funcs_1/r/is_columns_innodb.result
mysql-test/suite/funcs_1/r/is_columns_memory.result
mysql-test/suite/funcs_1/r/is_columns_myisam.result
mysql-test/suite/funcs_1/r/is_tables_innodb.result
mysql-test/suite/funcs_1/r/is_tables_is.result
mysql-test/suite/funcs_1/r/is_tables_memory.result
mysql-test/suite/funcs_1/r/is_tables_myisam.result
mysql-test/suite/funcs_1/r/is_tables_mysql.result
mysql-test/suite/funcs_1/r/is_tables_ndb.result
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
mysql-test/suite/funcs_1/t/disabled.def
mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
mysql-test/suite/funcs_1/t/is_basics_mixed.test
mysql-test/suite/funcs_1/t/is_column_privileges.test
mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test
mysql-test/suite/funcs_1/t/is_columns.test
mysql-test/suite/funcs_1/t/is_columns_innodb.test
mysql-test/suite/funcs_1/t/is_columns_is.test
mysql-test/suite/funcs_1/t/is_columns_memory.test
mysql-test/suite/funcs_1/t/is_columns_myisam.test
mysql-test/suite/funcs_1/t/is_columns_mysql.test
mysql-test/suite/funcs_1/t/is_columns_ndb.test
mysql-test/suite/funcs_1/t/is_key_column_usage.test
mysql-test/suite/funcs_1/t/is_routines.test
mysql-test/suite/funcs_1/t/is_schema_privileges.test
mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test
mysql-test/suite/funcs_1/t/is_schemata.test
mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test
mysql-test/suite/funcs_1/t/is_statistics.test
mysql-test/suite/funcs_1/t/is_statistics_mysql.test
mysql-test/suite/funcs_1/t/is_table_constraints.test
mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test
mysql-test/suite/funcs_1/t/is_table_privileges.test
mysql-test/suite/funcs_1/t/is_tables.test
mysql-test/suite/funcs_1/t/is_tables_innodb.test
mysql-test/suite/funcs_1/t/is_tables_memory.test
mysql-test/suite/funcs_1/t/is_tables_myisam.test
mysql-test/suite/funcs_1/t/is_tables_mysql.test
mysql-test/suite/funcs_1/t/is_tables_ndb.test
mysql-test/suite/funcs_1/t/is_triggers.test
mysql-test/suite/funcs_1/t/is_user_privileges.test
mysql-test/suite/funcs_1/t/is_views.test
mysql-test/suite/funcs_1/t/memory_trig_0102.test
mysql-test/suite/funcs_1/t/memory_trig_0407.test
mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
mysql-test/suite/funcs_1/t/memory_views.test
mysql-test/suite/funcs_1/triggers/trig_frkey.inc
mysql-test/suite/funcs_1/triggers/triggers_03.inc
mysql-test/suite/funcs_1/views/func_view.inc
mysql-test/suite/funcs_1/views/views_master.inc
mysql-test/t/mysql_delimiter.sql
mysql-test/t/subselect.test
mysql-test/t/varbinary.test
sql/item.cc
=== modified file 'mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test'
--- a/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test 2008-06-16 18:39:58 +0000
+++ b/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test 2008-07-01 18:44:47 +0000
@@ -10,11 +10,6 @@
# 2008-06-06 mleich Create this this variant for the embedded server.
#
-let $value= query_get_value(SHOW VARIABLES LIKE 'version_compile_os',Value,1);
-if (`SELECT '$value' LIKE 'apple-darwin%'`)
-{
- skip Bug#37380 Test funcs_1.is_columns_myisam_embedded fails on OS X;
-}
if (`SELECT VERSION() NOT LIKE '%embedded%'`)
{
--skip Test requires: embedded server
| Thread |
|---|
| • bzr push into mysql-5.0 branch (pcrews:2641 to 2642) Bug#37380 | Patrick Crews | 2 Jul |
