make sure embedded server is correctly initialized

diff --git a/ext/mysqli/tests/connect.inc b/ext/mysqli/tests/connect.inc
index 2fcf4ff0fff36e6c45155165bab119719a1e6ea7..b6cea2632b006261bc5e65a470f7b9415c28030b 100644 (file)
--- a/ext/mysqli/tests/connect.inc
+++ b/ext/mysqli/tests/connect.inc
@@ -15,7 +15,8 @@
                                        "--datadir=$path", 
                                        "--innodb_data_home_dir=$path",
                                        "--innodb_data_file_path=ibdata1:10M:autoextend",
-                                       "--log-error=$path/testrun.log"
+                                       "--log-error=$path/testrun.log",
+                                       "--init-connect='CREATE DATABASE IF NOT EXISTS test;'"
                                );
                $driver->embedded_server_start(TRUE, $args, NULL);
        }

diff --git a/ext/mysqli/tests/skipifnotemb.inc b/ext/mysqli/tests/skipifnotemb.inc
new file mode 100644 (file)
index 0000000..8639130
--- /dev/null
+++ b/ext/mysqli/tests/skipifnotemb.inc
@@ -0,0 +1,5 @@
+<?php
+  $driver = new mysqli_driver();
+  if (!$driver->embedded) 
+    die("skip test for with embedded server only");
+?>