summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Crews <pcrews@mysql.com>2008-07-01 15:07:34 -0400
committerPatrick Crews <pcrews@mysql.com>2008-07-01 15:07:34 -0400
commit12607d4b6689fc35e51c79e8da6a698b769de412 (patch)
tree15929f8a20d3b3a284e43f023adb90cf9c619242
parent0a60bd22436fb4ee0fe6f18e4f8d95de158694f5 (diff)
parent9393ae3dff60d256cd9e5aa73134e0e38168df44 (diff)
downloadmariadb-git-12607d4b6689fc35e51c79e8da6a698b769de412.tar.gz
upmerge into 5.1
-rw-r--r--mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test5
1 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test b/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
index 0d5f1a72cdb..3d0cca24474 100644
--- a/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
+++ b/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
@@ -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