upmerge into 5.1

12607d4b · Patrick Crews · 0a60bd22 · 9393ae3d · 12607d4b
Commit 12607d4b authored Jul 01, 2008 by Patrick Crews
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test +0 -5

No files found.
--- 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