From 61b57050a40b03148a5891a3c317dcd426dc6d5c Mon Sep 17 00:00:00 2001
From: Paul Tarjan <ptarjan@fb.com>
Date: Mon, 22 Apr 2013 18:35:02 -0700
Subject: [PATCH] import zend mysql tests

---
 hphp/test/zend/bad/ext-mysql/001.php          |  22 ++
 hphp/test/zend/bad/ext-mysql/001.php.expectf  |   2 +
 hphp/test/zend/bad/ext-mysql/002.php          |  28 ++
 hphp/test/zend/bad/ext-mysql/002.php.expectf  |  22 ++
 hphp/test/zend/bad/ext-mysql/003.php          |  48 ++++
 hphp/test/zend/bad/ext-mysql/003.php.expectf  |  30 ++
 hphp/test/zend/bad/ext-mysql/bug47438.php     |  38 +++
 .../zend/bad/ext-mysql/bug47438.php.expectf   |   3 +
 hphp/test/zend/bad/ext-mysql/bug48754.php     |  60 ++++
 .../zend/bad/ext-mysql/bug48754.php.expectf   |  21 ++
 hphp/test/zend/bad/ext-mysql/bug53649.php     |  44 +++
 .../zend/bad/ext-mysql/bug53649.php.expectf   |   1 +
 .../bad/ext-mysql/mysql_affected_rows.php     | 113 ++++++++
 .../ext-mysql/mysql_affected_rows.php.expectf |   1 +
 .../bad/ext-mysql/mysql_client_encoding.php   |  60 ++++
 .../mysql_client_encoding.php.expectf         |   1 +
 hphp/test/zend/bad/ext-mysql/mysql_close.php  |  29 ++
 .../bad/ext-mysql/mysql_close.php.expectf     |   1 +
 .../test/zend/bad/ext-mysql/mysql_connect.php |  97 +++++++
 .../bad/ext-mysql/mysql_connect.php.expectf   |   2 +
 .../zend/bad/ext-mysql/mysql_constants.php    |  55 ++++
 .../bad/ext-mysql/mysql_constants.php.expectf |   1 +
 .../zend/bad/ext-mysql/mysql_create_db.php    |  43 +++
 .../bad/ext-mysql/mysql_create_db.php.expectf |   1 +
 .../zend/bad/ext-mysql/mysql_data_seek.php    |  58 ++++
 .../bad/ext-mysql/mysql_data_seek.php.expectf |   5 +
 .../test/zend/bad/ext-mysql/mysql_db_name.php |  51 ++++
 .../bad/ext-mysql/mysql_db_name.php.expectf   |   4 +
 .../zend/bad/ext-mysql/mysql_db_query.php     |  53 ++++
 .../bad/ext-mysql/mysql_db_query.php.expectf  |   1 +
 .../test/zend/bad/ext-mysql/mysql_drop_db.php |  42 +++
 .../bad/ext-mysql/mysql_drop_db.php.expectf   |   1 +
 hphp/test/zend/bad/ext-mysql/mysql_errno.php  |  46 +++
 .../bad/ext-mysql/mysql_errno.php.expectf     |   5 +
 hphp/test/zend/bad/ext-mysql/mysql_error.php  |  53 ++++
 .../bad/ext-mysql/mysql_error.php.expectf     |   3 +
 .../zend/bad/ext-mysql/mysql_fetch_array.php  | 272 ++++++++++++++++++
 .../ext-mysql/mysql_fetch_array.php.expectf   |  75 +++++
 .../zend/bad/ext-mysql/mysql_fetch_assoc.php  |  54 ++++
 .../ext-mysql/mysql_fetch_assoc.php.expectf   |  37 +++
 .../zend/bad/ext-mysql/mysql_fetch_field.php  | 147 ++++++++++
 .../ext-mysql/mysql_fetch_field.php.expectf   | 117 ++++++++
 .../bad/ext-mysql/mysql_fetch_lengths.php     |  30 ++
 .../ext-mysql/mysql_fetch_lengths.php.expectf |  10 +
 .../zend/bad/ext-mysql/mysql_fetch_object.php |  73 +++++
 .../ext-mysql/mysql_fetch_object.php.expectf  |  60 ++++
 .../zend/bad/ext-mysql/mysql_fetch_row.php    |  32 +++
 .../bad/ext-mysql/mysql_fetch_row.php.expectf |  12 +
 .../zend/bad/ext-mysql/mysql_field_flags.php  | 135 +++++++++
 .../ext-mysql/mysql_field_flags.php.expectf   |   6 +
 .../zend/bad/ext-mysql/mysql_field_len.php    |  38 +++
 .../bad/ext-mysql/mysql_field_len.php.expectf |   6 +
 .../zend/bad/ext-mysql/mysql_field_name.php   |  37 +++
 .../ext-mysql/mysql_field_name.php.expectf    |   7 +
 .../zend/bad/ext-mysql/mysql_field_seek.php   |  35 +++
 .../ext-mysql/mysql_field_seek.php.expectf    |  94 ++++++
 .../zend/bad/ext-mysql/mysql_field_table.php  |  37 +++
 .../ext-mysql/mysql_field_table.php.expectf   |   7 +
 .../zend/bad/ext-mysql/mysql_field_type.php   |  37 +++
 .../ext-mysql/mysql_field_type.php.expectf    |   7 +
 .../zend/bad/ext-mysql/mysql_free_result.php  |  35 +++
 .../ext-mysql/mysql_free_result.php.expectf   |   4 +
 .../bad/ext-mysql/mysql_get_host_info.php     |  32 +++
 .../ext-mysql/mysql_get_host_info.php.expectf |   1 +
 .../bad/ext-mysql/mysql_get_proto_info.php    |  22 ++
 .../mysql_get_proto_info.php.expectf          |   1 +
 .../bad/ext-mysql/mysql_get_server_info.php   |  29 ++
 .../mysql_get_server_info.php.expectf         |   1 +
 hphp/test/zend/bad/ext-mysql/mysql_info.php   |  61 ++++
 .../zend/bad/ext-mysql/mysql_info.php.expectf |   1 +
 .../zend/bad/ext-mysql/mysql_insert_id.php    |  57 ++++
 .../bad/ext-mysql/mysql_insert_id.php.expectf |   3 +
 .../zend/bad/ext-mysql/mysql_list_dbs.php     |  42 +++
 .../bad/ext-mysql/mysql_list_dbs.php.expectf  |   1 +
 .../zend/bad/ext-mysql/mysql_list_fields.php  |  55 ++++
 .../ext-mysql/mysql_list_fields.php.expectf   |  13 +
 .../bad/ext-mysql/mysql_list_processes.php    |  42 +++
 .../mysql_list_processes.php.expectf          |   1 +
 .../zend/bad/ext-mysql/mysql_list_tables.php  |  73 +++++
 .../ext-mysql/mysql_list_tables.php.expectf   |   1 +
 .../zend/bad/ext-mysql/mysql_num_fields.php   |  43 +++
 .../ext-mysql/mysql_num_fields.php.expectf    |   2 +
 .../zend/bad/ext-mysql/mysql_num_rows.php     |  70 +++++
 .../bad/ext-mysql/mysql_num_rows.php.expectf  |   4 +
 .../test/zend/bad/ext-mysql/mysql_phpinfo.php |  65 +++++
 .../bad/ext-mysql/mysql_phpinfo.php.expectf   |   1 +
 hphp/test/zend/bad/ext-mysql/mysql_ping.php   |  33 +++
 .../zend/bad/ext-mysql/mysql_ping.php.expectf |   5 +
 hphp/test/zend/bad/ext-mysql/mysql_query.php  | 104 +++++++
 .../bad/ext-mysql/mysql_query.php.expectf     |  11 +
 .../mysql_query_load_data_openbasedir.php     |  84 ++++++
 ...ql_query_load_data_openbasedir.php.expectf |   5 +
 .../ext-mysql/mysql_real_escape_string.php    |  26 ++
 .../mysql_real_escape_string.php.expectf      |   8 +
 hphp/test/zend/bad/ext-mysql/mysql_result.php |  56 ++++
 .../bad/ext-mysql/mysql_result.php.expectf    |  37 +++
 .../zend/bad/ext-mysql/mysql_select_db.php    |  59 ++++
 .../bad/ext-mysql/mysql_select_db.php.expectf |   4 +
 .../zend/bad/ext-mysql/mysql_set_charset.php  |  44 +++
 .../ext-mysql/mysql_set_charset.php.expectf   |   1 +
 hphp/test/zend/bad/ext-mysql/mysql_stat.php   |  37 +++
 .../zend/bad/ext-mysql/mysql_stat.php.expectf |   2 +
 .../zend/bad/ext-mysql/mysql_tablename.php    |  35 +++
 .../bad/ext-mysql/mysql_tablename.php.expectf |   7 +
 .../zend/bad/ext-mysql/mysql_thread_id.php    |  28 ++
 .../bad/ext-mysql/mysql_thread_id.php.expectf |   2 +
 .../bad/ext-mysql/mysql_unbuffered_query.php  |  98 +++++++
 .../mysql_unbuffered_query.php.expectf        |  10 +
 hphp/test/zend/good/ext-mysql/connect.inc     |  82 ++++++
 .../good/ext-mysql/mysql_escape_string.php    |  19 ++
 .../ext-mysql/mysql_escape_string.php.expectf |   8 +
 .../good/ext-mysql/mysql_get_client_info.php  |  16 ++
 .../mysql_get_client_info.php.expectf         |   1 +
 hphp/tools/import_zend_test.py                |   2 +-
 114 files changed, 3893 insertions(+), 1 deletion(-)
 create mode 100644 hphp/test/zend/bad/ext-mysql/001.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/001.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/002.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/002.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/003.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/003.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/bug47438.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/bug47438.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/bug48754.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/bug48754.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/bug53649.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/bug53649.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_affected_rows.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_affected_rows.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_client_encoding.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_client_encoding.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_close.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_close.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_connect.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_connect.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_constants.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_constants.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_create_db.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_create_db.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_data_seek.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_data_seek.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_db_name.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_db_name.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_db_query.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_db_query.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_drop_db.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_drop_db.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_errno.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_errno.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_error.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_error.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_fetch_array.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_fetch_array.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_fetch_field.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_fetch_field.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_fetch_lengths.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_fetch_lengths.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_fetch_object.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_fetch_object.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_fetch_row.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_fetch_row.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_field_flags.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_field_flags.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_field_len.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_field_len.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_field_name.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_field_name.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_field_seek.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_field_seek.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_field_table.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_field_table.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_field_type.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_field_type.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_free_result.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_free_result.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_get_host_info.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_get_host_info.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_get_proto_info.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_get_proto_info.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_get_server_info.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_get_server_info.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_info.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_info.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_insert_id.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_insert_id.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_list_dbs.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_list_dbs.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_list_fields.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_list_fields.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_list_processes.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_list_processes.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_list_tables.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_list_tables.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_num_fields.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_num_fields.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_num_rows.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_num_rows.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_phpinfo.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_phpinfo.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_ping.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_ping.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_query.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_query.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_real_escape_string.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_real_escape_string.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_result.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_result.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_select_db.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_select_db.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_set_charset.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_set_charset.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_stat.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_stat.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_tablename.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_tablename.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_thread_id.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_thread_id.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_unbuffered_query.php
 create mode 100644 hphp/test/zend/bad/ext-mysql/mysql_unbuffered_query.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mysql/connect.inc
 create mode 100644 hphp/test/zend/good/ext-mysql/mysql_escape_string.php
 create mode 100644 hphp/test/zend/good/ext-mysql/mysql_escape_string.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mysql/mysql_get_client_info.php
 create mode 100644 hphp/test/zend/good/ext-mysql/mysql_get_client_info.php.expectf

diff --git a/hphp/test/zend/bad/ext-mysql/001.php b/hphp/test/zend/bad/ext-mysql/001.php
new file mode 100644
index 000000000..1dfad4ee5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/001.php
@@ -0,0 +1,22 @@
+<?php
+require_once('connect.inc');
+$test = '';
+
+if ($socket)
+	$host = sprintf("%s:%s", $host, $socket);
+else if ($port)
+	$host = sprintf("%s:%s", $host, $port);
+
+/*** test mysql_connect localhost ***/
+$db = mysql_connect($host, $user, $passwd);
+$test .= ($db) ? '1' : '0';
+mysql_close($db);
+
+/*** test mysql_connect localhost:port ***/
+$db = mysql_connect($host, $user, $passwd, true);
+$test .= ($db) ? '1' : '0';
+mysql_close($db);
+
+var_dump($test);
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/001.php.expectf b/hphp/test/zend/bad/ext-mysql/001.php.expectf
new file mode 100644
index 000000000..fa11f7593
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/001.php.expectf
@@ -0,0 +1,2 @@
+%unicode|string%(2) "11"
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/002.php b/hphp/test/zend/bad/ext-mysql/002.php
new file mode 100644
index 000000000..e8f2a7c5a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/002.php
@@ -0,0 +1,28 @@
+<?php
+require_once('connect.inc');
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+	printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+
+var_dump($link);
+
+var_dump(mysql_query('DROP TABLE IF EXISTS test'));
+
+var_dump(mysql_query('CREATE TABLE test(col1 int PRIMARY KEY, col2 varchar(50), col3 char(5))'));
+
+var_dump(mysql_query("INSERT INTO test(col1, col2, col3) VALUES(1, 'foo', 'bar'),(2, 'foo', 'bar')"));
+
+var_dump($res = mysql_query('SELECT col1, col2, col3 FROM test ORDER BY col1 ASC'));
+
+while ($data = mysql_fetch_array($res, MYSQL_ASSOC)) {
+	var_dump($data);
+}
+
+mysql_free_result($res);
+mysql_close($link);
+
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/002.php.expectf b/hphp/test/zend/bad/ext-mysql/002.php.expectf
new file mode 100644
index 000000000..7e7e6fe04
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/002.php.expectf
@@ -0,0 +1,22 @@
+resource(%d) of type (mysql link)
+bool(true)
+bool(true)
+bool(true)
+resource(%d) of type (mysql result)
+array(3) {
+  [%u|b%"col1"]=>
+  %unicode|string%(1) "1"
+  [%u|b%"col2"]=>
+  %unicode|string%(3) "foo"
+  [%u|b%"col3"]=>
+  %unicode|string%(3) "bar"
+}
+array(3) {
+  [%u|b%"col1"]=>
+  %unicode|string%(1) "2"
+  [%u|b%"col2"]=>
+  %unicode|string%(3) "foo"
+  [%u|b%"col3"]=>
+  %unicode|string%(3) "bar"
+}
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/003.php b/hphp/test/zend/bad/ext-mysql/003.php
new file mode 100644
index 000000000..30948d07d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/003.php
@@ -0,0 +1,48 @@
+<?php
+include_once('connect.inc');
+
+class class24 {
+	function __construct() {
+		echo __METHOD__ . "\n";
+	}
+}
+
+$data = array("one", "two", "three");
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+	printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+
+if (!mysql_query('DROP TABLE IF EXISTS test', $link))
+	printf("[002] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!mysql_query("CREATE TABLE test(a varchar(10))", $link))
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+foreach ($data as $str) {
+	if (!mysql_query(sprintf("INSERT INTO test VALUES('%s')", $str), $link))
+		printf("[004 - %s] [%d] %s\n", $str, mysql_errno($link), mysql_error($link));
+}
+
+echo "==stdClass==\n";
+if (!$res = mysql_query("SELECT a FROM test", $link))
+	printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+while ($obj = mysql_fetch_object($res)) {
+	var_dump($obj);
+}
+mysql_free_result($res);
+
+echo "==class24==\n";
+if (!$res = mysql_query("SELECT a FROM test", $link))
+    printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+while ($obj = mysql_fetch_object($res, 'class24')) {
+	var_dump($obj);
+}
+mysql_free_result($res);
+mysql_close($link);
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/003.php.expectf b/hphp/test/zend/bad/ext-mysql/003.php.expectf
new file mode 100644
index 000000000..dcf82a7af
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/003.php.expectf
@@ -0,0 +1,30 @@
+==stdClass==
+object(stdClass)#%d (1) {
+  [%u|b%"a"]=>
+  %unicode|string%(3) "one"
+}
+object(stdClass)#%d (1) {
+  [%u|b%"a"]=>
+  %unicode|string%(3) "two"
+}
+object(stdClass)#%d (1) {
+  [%u|b%"a"]=>
+  %unicode|string%(5) "three"
+}
+==class24==
+class24::__construct
+object(class24)#%d (1) {
+  [%u|b%"a"]=>
+  %unicode|string%(3) "one"
+}
+class24::__construct
+object(class24)#%d (1) {
+  [%u|b%"a"]=>
+  %unicode|string%(3) "two"
+}
+class24::__construct
+object(class24)#%d (1) {
+  [%u|b%"a"]=>
+  %unicode|string%(5) "three"
+}
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/bug47438.php b/hphp/test/zend/bad/ext-mysql/bug47438.php
new file mode 100644
index 000000000..90baa02ee
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/bug47438.php
@@ -0,0 +1,38 @@
+<?php
+require_once('connect.inc');
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+        printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+                $host, $user, $db, $port, $socket);
+
+mysql_select_db($db, $link);
+mysql_query("DROP TABLE IF EXISTS test_47438", $link);
+mysql_query("CREATE TABLE test_47438 (a INT, b INT, c INT)", $link);
+mysql_query("INSERT INTO test_47438 VALUES (10, 11, 12), (20, 21, 22)", $link);
+$result = mysql_query("SELECT * FROM test_47438", $link);
+mysql_field_seek($result, 1);
+
+$i = 0;
+
+while($i<mysql_num_fields($result))
+{
+  $meta=mysql_fetch_field($result,$i);
+  echo $i . "." . $meta->name . "\n";
+  $i++;
+}
+
+mysql_query("DROP TABLE IF EXISTS test_47438", $link);
+
+?><?php
+require_once('connect.inc');
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+        printf("[c001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+                $host, $user, $db, $port, $socket);
+
+if (!mysql_select_db($db, $link) ||
+	!mysql_query("DROP TABLE IF EXISTS test_47438", $link))
+	printf("[c002] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+mysql_close($link);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/bug47438.php.expectf b/hphp/test/zend/bad/ext-mysql/bug47438.php.expectf
new file mode 100644
index 000000000..78cf68bc0
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/bug47438.php.expectf
@@ -0,0 +1,3 @@
+0.a
+1.b
+2.c
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/bug48754.php b/hphp/test/zend/bad/ext-mysql/bug48754.php
new file mode 100644
index 000000000..a6ec1ad8b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/bug48754.php
@@ -0,0 +1,60 @@
+<?php
+require_once('connect.inc');
+
+function my_mysql_pconnect($host, $user, $passwd, $db, $port, $socket) {
+	if ($socket)
+		$host = sprintf("%s:%s", $host, $socket);
+	else if ($port)
+		$host = sprintf("%s:%s", $host, $port);
+
+	if (!$link = mysql_pconnect($host, $user, $passwd, true)) {
+		printf("[000-a] Cannot connect using host '%s', user '%s', password '****', [%d] %s\n",
+			$host, $user, $passwd,
+			mysql_errno(), mysql_error());
+		return false;
+	}
+	return $link;
+}
+
+echo "Explicit connection on close\n";
+$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket);
+$link1_thread_id = mysql_thread_id($link);
+$default1_thread_id = mysql_thread_id();
+echo 'Expect same thread id for $link and default conn: ';
+var_dump($link1_thread_id == $default1_thread_id);
+var_dump($link);
+mysql_close($link);
+var_dump($link);
+
+// we sohuld have no default link anymore
+mysql_close();
+
+echo "\nClosing default link\n";
+$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket);
+$link2_thread_id = mysql_thread_id($link);
+$default2_thread_id = mysql_thread_id();
+echo 'Expect same thread id for $link and default conn but not the previous: ';
+var_dump($link1_thread_id == $default1_thread_id && $link1_thread_id != $link2_thread_id);
+var_dump($link);
+mysql_close();
+var_dump($link);
+mysql_close($link);
+var_dump($link);
+
+echo "\nExplicit resource and pconnect\n";
+$link = my_mysql_pconnect($host, $user, $passwd, $db, $port, $socket);
+var_dump($link);
+mysql_close($link);
+var_dump($link);
+
+// we sohuld have no default link
+mysql_close();
+
+echo "\nDefault link and pconnect\n";
+$link = my_mysql_pconnect($host, $user, $passwd, $db, $port, $socket);
+var_dump($link);
+mysql_close();
+var_dump($link);
+mysql_close($link);
+var_dump($link);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/bug48754.php.expectf b/hphp/test/zend/bad/ext-mysql/bug48754.php.expectf
new file mode 100644
index 000000000..76055c716
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/bug48754.php.expectf
@@ -0,0 +1,21 @@
+Explicit connection on close
+Expect same thread id for $link and default conn: bool(true)
+resource(%d) of type (mysql link)
+resource(%d) of type (Unknown)
+HipHop Warning: %a
+
+Closing default link
+Expect same thread id for $link and default conn but not the previous: bool(true)
+resource(%d) of type (mysql link)
+resource(%d) of type (mysql link)
+resource(%d) of type (Unknown)
+
+Explicit resource and pconnect
+resource(%d) of type (mysql link persistent)
+resource(%d) of type (Unknown)
+HipHop Warning: %a
+
+Default link and pconnect
+resource(%d) of type (mysql link persistent)
+resource(%d) of type (mysql link persistent)
+resource(%d) of type (Unknown)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/bug53649.php b/hphp/test/zend/bad/ext-mysql/bug53649.php
new file mode 100644
index 000000000..daf60a8a5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/bug53649.php
@@ -0,0 +1,44 @@
+<?php
+	require_once("connect.inc");
+
+	if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) {
+		printf("[001] Connect failed, [%d] %s\n", mysqlerrno(), mysqli_error());
+	}
+
+	if (!mysql_query("DROP TABLE IF EXISTS test", $link)) {
+		printf("[002] [%d] %s\n", mysql_errno($link), mysql_error($link));
+	}
+
+	if (!mysql_query("CREATE TABLE test (dump1 INT UNSIGNED NOT NULL PRIMARY KEY) ENGINE=" . $engine, $link)) {
+		printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+	}
+
+	if (false === file_put_contents('bug53649.data', "1\n2\n3\n"))
+		printf("[004] Failed to create data file\n");
+
+	if (!mysql_query("SELECT 1 FROM DUAL", $link))
+	  printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+	if (!mysql_query("LOAD DATA LOCAL INFILE 'bug53649.data' INTO TABLE test", $link)) {
+		printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link));
+		echo "bug";
+	} else {
+		echo "done";
+	}
+	mysql_close($link);
+?>
<?php
+require_once('connect.inc');
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) {
+	printf("[clean] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+}
+
+if (!mysql_query($link, 'DROP TABLE IF EXISTS test', $link)) {
+	printf("[clean] Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+}
+
+mysql_close($link);
+
+unlink('bug53649.data');
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/bug53649.php.expectf b/hphp/test/zend/bad/ext-mysql/bug53649.php.expectf
new file mode 100644
index 000000000..348ebd949
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/bug53649.php.expectf
@@ -0,0 +1 @@
+done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_affected_rows.php b/hphp/test/zend/bad/ext-mysql/mysql_affected_rows.php
new file mode 100644
index 000000000..dddb2be67
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_affected_rows.php
@@ -0,0 +1,113 @@
+<?php
+include_once("connect.inc");
+include_once('setupdefault.inc');
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (0 !== ($tmp = @mysql_affected_rows()))
+	printf("[001] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
+
+if (null !== ($tmp = @mysql_affected_rows($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!is_null($tmp = @mysql_affected_rows($link, $link)))
+	printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+	printf("[004] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+
+if (-1 !== ($tmp = mysql_affected_rows($link)))
+	printf("[005] Expecting int/-1, got %s/%s. [%d] %s\n",
+		gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+if (!mysql_query('DROP TABLE IF EXISTS test', $link))
+	printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!mysql_query('CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE = ' . $engine, $link))
+	printf("[007] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!mysql_query("INSERT INTO test(id, label) VALUES (1, 'a')", $link))
+	printf("[008] [%d] %s\n",  mysql_errno($link), mysql_error($link));
+
+if (1 !== ($tmp = mysql_affected_rows($link)))
+	printf("[010] Expecting int/1, got %s/%s\n", gettype($tmp), $tmp);
+
+// ignore INSERT error, NOTE: command line returns 0, affected_rows returns -1 as documented
+@mysql_query("INSERT INTO test(id, label) VALUES (1, 'a')", $link);
+if (-1 !== ($tmp = mysql_affected_rows($link)))
+	printf("[011] Expecting int/-1, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!mysql_query("INSERT INTO test(id, label) VALUES (1, 'a') ON DUPLICATE KEY UPDATE id = 4", $link))
+	printf("[012] [%d] %s\n",  mysql_errno($link), mysql_error($link));
+
+if (2 !== ($tmp = mysql_affected_rows($link)))
+	printf("[013] Expecting int/2, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!mysql_query("INSERT INTO test(id, label) VALUES (2, 'b'), (3, 'c')", $link))
+	printf("[014] [%d] %s\n",  mysql_errno($link), mysql_error($link));
+
+if (2 !== ($tmp = mysql_affected_rows($link)))
+	printf("[015] Expecting int/2, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!mysql_query("INSERT IGNORE INTO test(id, label) VALUES (1, 'a')", $link)) {
+	printf("[016] [%d] %s\n",  mysql_errno($link), mysql_error($link));
+}
+
+if (1 !== ($tmp = mysql_affected_rows($link)))
+	printf("[017] Expecting int/1, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!mysql_query("INSERT INTO test(id, label) SELECT id + 10, label FROM test", $link))
+	printf("[018] [%d] %s\n",  mysql_errno($link), mysql_error($link));
+
+if (4 !== ($tmp = mysql_affected_rows($link)))
+	printf("[019] Expecting int/4, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!mysql_query("REPLACE INTO test(id, label) values (4, 'd')", $link))
+	printf("[020] [%d] %s\n",  mysql_errno($link), mysql_error($link));
+
+if (2 !== ($tmp = mysql_affected_rows($link)))
+	printf("[021] Expecting int/2, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!mysql_query("REPLACE INTO test(id, label) values (5, 'e')", $link))
+	printf("[022] [%d] %s\n",  mysql_errno($link), mysql_error($link));
+
+if (1 !== ($tmp = mysql_affected_rows($link)))
+	printf("[023] Expecting int/1, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!mysql_query("UPDATE test SET label = 'a' WHERE id = 2", $link))
+	printf("[024] [%d] %s\n",  mysql_errno($link), mysql_error($link));
+
+if (1 !== ($tmp = mysql_affected_rows($link)))
+	printf("[025] Expecting int/1, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!mysql_query("UPDATE test SET label = 'a' WHERE id = 2", $link)) {
+	printf("[025] [%d] %s\n",  mysql_errno($link), mysql_error($link));
+}
+
+if (0 !== ($tmp = mysql_affected_rows($link)))
+	printf("[026] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!mysql_query("UPDATE test SET label = 'a' WHERE id = 100", $link)) {
+	printf("[025] [%d] %s\n",  mysql_errno($link), mysql_error($link));
+}
+
+if (0 !== ($tmp = mysql_affected_rows($link)))
+	printf("[026] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
+
+if (0 !== ($tmp = mysql_affected_rows()))
+	printf("[027] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!mysql_query('DROP TABLE IF EXISTS test', $link))
+	printf("[028] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+mysql_close($link);
+
+if (false !== ($tmp = @mysql_affected_rows($link)))
+	printf("[029] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_affected_rows.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_affected_rows.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_affected_rows.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_client_encoding.php b/hphp/test/zend/bad/ext-mysql/mysql_client_encoding.php
new file mode 100644
index 000000000..d1499b702
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_client_encoding.php
@@ -0,0 +1,60 @@
+<?php
+include_once "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+	printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+
+$default_link_enc = mysql_client_encoding();
+$link_enc = mysql_client_encoding($link);
+
+if ($default_link_enc !== $link_enc)
+	printf("[003] %s != %s, [%d] %s\n", $default_link_enc, $link_enc, mysql_errno($link), mysql_error($link));
+
+if (!$res = mysql_query('SELECT version() AS server_version', $link))
+	printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
+$tmp = mysql_fetch_assoc($res);
+mysql_free_result($res);
+$version = explode('.', $tmp['server_version']);
+if (empty($version))
+	printf("[005] Cannot determine server version, need MySQL Server 4.1+ for the test!\n");
+
+if ($version[0] <= 4 && $version[1] < 1)
+	printf("[006] Need MySQL Server 4.1+ for the test!\n");
+
+if (!$res = mysql_query('SELECT @@character_set_connection AS charset, @@collation_connection AS collation', $link))
+	printf("[007] [%d] %s\n", mysql_errno($link), mysql_error($link));
+$tmp = mysql_fetch_assoc($res);
+mysql_free_result($res);
+if (!$tmp['charset'])
+	printf("[008] Cannot determine current character set and collation\n");
+
+if ($link_enc !== $tmp['charset']) {
+	if ($link_enc === $tmp['collation']) {
+		printf("[009] Known bug, collation instead of chatset returned, http://bugs.mysql.com/bug.php?id=7923\n");
+	} else {
+		printf("[009] Check manually, watch out for unicode and others\n");
+		var_dump($link_enc);
+		var_dump($tmp);
+	}
+}
+
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && function_exists('is_unicode')) {
+// unicode mode
+	if (!is_unicode($default_link_enc) || !is_unicode($link_enc)) {
+		printf("[010] No unicode returned!\n");
+		var_dump($default_link_enc);
+		var_dump($link_enc);
+	}
+}
+
+mysql_close($link);
+
+if (false !== ($tmp = @mysql_client_encoding($link)))
+	printf("[012] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_client_encoding.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_client_encoding.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_client_encoding.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_close.php b/hphp/test/zend/bad/ext-mysql/mysql_close.php
new file mode 100644
index 000000000..557004930
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_close.php
@@ -0,0 +1,29 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (false !== ($tmp = @mysql_close()))
+	printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_close($link, $link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+	printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+
+$tmp = @mysql_close(NULL);
+if (null !== $tmp)
+	printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+$tmp = mysql_close($link);
+if (true !== $tmp)
+	printf("[005] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = @mysql_query("SELECT 1", $link)))
+	printf("[006] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_close.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_close.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_close.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_connect.php b/hphp/test/zend/bad/ext-mysql/mysql_connect.php
new file mode 100644
index 000000000..9a263eb4c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_connect.php
@@ -0,0 +1,97 @@
+<?php
+include_once "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+// mysql_connect ( [string server [, string username [, string password [, bool new_link [, int client_flags]]]]] )
+if (NULL !== ($tmp = @mysql_connect($link, $link, $link, $link, $link, $link)))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+$myhost = (is_null($socket)) ? ((is_null($port)) ? $host : $host . ':' . $port) : $host . ':' . $socket;
+if (!$link = mysql_connect($myhost, $user, $passwd, true))
+	printf("[002] Cannot connect to the server using host=%s/%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $myhost, $user, $db, $port, $socket);
+
+mysql_close($link);
+
+if (!$link = mysql_connect($myhost, $user, $passwd, true))
+	printf("[003] Cannot connect to the server using host=%s/%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $myhost, $user, $db, $port, $socket);
+
+mysql_close();
+
+if ($link = mysql_connect($myhost, $user . 'unknown_really', $passwd . 'non_empty', true))
+	printf("[004] Can connect to the server using host=%s/%s, user=%s, passwd=***non_empty, dbname=%s, port=%s, socket=%s\n",
+		$host, $myhost, $user . 'unknown_really', $db, $port, $socket);
+
+if (false !== $link)
+printf("[005] Expecting boolean/false, got %s/%s\n", gettype($link), $link);
+
+// Run the following tests without an anoynmous MySQL user and use a password for the test user!
+ini_set('mysql.default_socket', $socket);
+if (!is_null($socket)) {	
+	if (!is_resource($link = mysql_connect($host, $user, $passwd, true))) {
+		printf("[006] Usage of mysql.default_socket failed\n");
+	} else {
+		mysql_close($link);
+	}
+}
+
+if (!ini_get('sql.safe_mode')) {
+
+	ini_set('mysql.default_port', $port);
+	if (!is_null($port)) {
+		if (!is_resource($link = mysql_connect($host, $user, $passwd, true))) {
+			printf("[007] Usage of mysql.default_port failed\n");
+		} else {
+			mysql_close($link);
+		}
+	}
+
+	ini_set('mysql.default_password', $passwd);
+	if (!is_resource($link = mysql_connect($myhost, $user))) {
+		printf("[008] Usage of mysql.default_password failed\n");
+	} else {
+		mysql_close($link);
+	}
+	ini_set('mysql.default_user', $user);
+	if (!is_resource($link = mysql_connect($myhost))) {
+		printf("[009] Usage of mysql.default_user failed\n");
+	} else {
+		mysql_close($link);
+	}
+
+	ini_set('mysql.default_host', $myhost);
+	if (!is_resource($link = mysql_connect())) {
+		printf("[010] Usage of mysql.default_host failed\n") ;
+	} else {
+		mysql_close($link);
+	}
+
+	if (!is_resource($link = mysql_connect()) || !is_resource($link2 = mysql_connect())) {
+		printf("[011] Usage of mysql.default_host failed\n") ;
+	} else {
+		mysql_close();
+		mysql_close($link2);
+	}
+
+	if (!stristr(PHP_OS, 'win') && !stristr(PHP_OS, 'netware')) {
+		ini_set('mysql.default_port', -1);
+		if (putenv(sprintf('MYSQL_TCP_PORT=%d', $port))) {
+			if (!is_resource($link = mysql_connect())) {
+				printf("[012] Usage of env MYSQL_TCP_PORT failed\n") ;
+			} else {
+			mysql_close($link);
+		}
+		} else if (putenv(sprintf('MYSQL_TCP_PORT=%d', $port + 1))) {
+			if (!is_resource($link = mysql_connect())) {
+				printf("[013] Usage of env MYSQL_TCP_PORT=%d should have failed\n", $port + 1) ;
+				mysql_close($link);
+		}
+		}
+	}
+}
+
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_connect.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_connect.php.expectf
new file mode 100644
index 000000000..6305362dc
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_connect.php.expectf
@@ -0,0 +1,2 @@
+HipHop Warning: %a
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_constants.php b/hphp/test/zend/bad/ext-mysql/mysql_constants.php
new file mode 100644
index 000000000..da9a1e824
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_constants.php
@@ -0,0 +1,55 @@
+<?php
+require("connect.inc");
+require("table.inc");
+
+$constants = get_defined_constants(true);
+sort($constants);
+
+$expected_constants = array(
+	'MYSQL_ASSOC'                   => true,
+	'MYSQL_NUM'                     => true,
+	'MYSQL_BOTH'                    => true,
+	'MYSQL_CLIENT_COMPRESS'         => true,
+	'MYSQL_CLIENT_INTERACTIVE'      => true,
+	'MYSQL_CLIENT_IGNORE_SPACE'     => true,
+);
+
+$version = mysql_get_server_info($link);
+if (!preg_match('@(\d+)\.(\d+)\.(\d+)@ism', $version, $matches))
+	printf("[001] Cannot get server version\n");
+$version = ($matches[1] * 100) + ($matches[2] * 10) + $matches[3];
+
+if ($version > 400) {
+	$expected_constants = array_merge($expected_constants, array(
+					"MYSQL_CLIENT_SSL"                => true,
+					));
+}
+
+
+$unexpected_constants = array();
+
+foreach ($constants as $group => $consts) {
+	foreach ($consts as $name => $value) {
+		if (stristr($name, 'mysql') && !preg_match("/^mysql([^_]+)_/iu", $name)) {
+			$name = strtoupper($name);
+			if (isset($expected_constants[$name])) {
+				unset($expected_constants[$name]);
+			} else {
+				$unexpected_constants[$name] = $name;
+			}
+		}
+	}
+}
+
+if (!empty($unexpected_constants)) {
+	printf("Dumping list of unexpected constants\n");
+	var_dump($unexpected_constants);
+}
+
+if (!empty($expected_constants)) {
+	printf("Dumping list of missing constants\n");
+	var_dump($expected_constants);
+}
+
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_constants.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_constants.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_constants.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_create_db.php b/hphp/test/zend/bad/ext-mysql/mysql_create_db.php
new file mode 100644
index 000000000..c0dfc3f8d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_create_db.php
@@ -0,0 +1,43 @@
+<?php
+include "connect.inc";
+
+$link   = NULL;
+$tmp    = null;
+
+if (false !== ($tmp = mysql_create_db()))
+	printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_create_db($link, $link, $link)))
+	printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if ($link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+	printf("[003] Can connect to the server using host=%s, user=%s, passwd=***non_empty, dbname=%s, port=%s, socket=%s\n",
+		$host, $user . 'unknown_really', $db, $port, $socket);
+
+if (!mysql_query("CREATE DATABASE mysqlcreatedb", $link))
+	die(sprintf("[004] Cannot create database, aborting test, [%d] %s\n", mysql_errno($link), mysql_error($link)));
+
+if (!mysql_query("DROP DATABASE mysqlcreatedb", $link))
+	printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (true !== ($tmp = mysql_create_db("mysqlcreatedb", $link)))
+	printf("[006] Expecting boolean/true, got %s/%s, [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+if (false !== ($tmp = mysql_create_db("mysqlcreatedb", $link)))
+	printf("[007] Expecting boolean/false, got %s/%s, [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+if (!mysql_query("DROP DATABASE mysqlcreatedb", $link))
+	printf("[008] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+print "done!";
+?><?php
+require_once('connect.inc');
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+	printf("[c001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+
+if (!mysql_query("DROP DATABASE IF EXISTS mysqlcreatedb", $link))
+	printf("[c002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+mysql_close($link);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_create_db.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_create_db.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_create_db.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_data_seek.php b/hphp/test/zend/bad/ext-mysql/mysql_data_seek.php
new file mode 100644
index 000000000..355482eac
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_data_seek.php
@@ -0,0 +1,58 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (NULL !== ($tmp = @mysql_data_seek()))
+	printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_data_seek($link)))
+	printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_data_seek($link, $link)))
+	printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query('SELECT * FROM test ORDER BY id LIMIT 4', $link))
+	printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (true !== ($tmp = mysql_data_seek($res, 3)))
+	printf("[005] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp);
+
+$row = mysql_fetch_assoc($res);
+if (4 != $row['id'])
+	printf("[006] Expecting record 4/d, got record %s/%s\n", $row['id'], $row['label']);
+
+if (true !== ($tmp = mysql_data_seek($res, 0)))
+	printf("[007] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp);
+
+$row = mysql_fetch_assoc($res);
+if (1 != $row['id'])
+	printf("[008] Expecting record 1/a, got record %s/%s\n", $row['id'], $row['label']);
+
+if (false !== ($tmp = mysql_data_seek($res, 4)))
+	printf("[009] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_data_seek($res, -1)))
+	printf("[010] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_free_result($res);
+
+if (!$res = mysql_unbuffered_query('SELECT * FROM test ORDER BY id', $link))
+	printf("[011] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (false !== ($tmp = mysql_data_seek($res, 3)))
+	printf("[012] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_free_result($res);
+
+if (false !== ($tmp = mysql_data_seek($res, 1)))
+	printf("[013] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_close($link);
+
+print "done!\n";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_data_seek.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_data_seek.php.expectf
new file mode 100644
index 000000000..3ecd7c4e4
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_data_seek.php.expectf
@@ -0,0 +1,5 @@
+HipHop Warning: %a
+HipHop Warning: %a
+HipHop Warning: %a
+HipHop Warning: %a
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_db_name.php b/hphp/test/zend/bad/ext-mysql/mysql_db_name.php
new file mode 100644
index 000000000..2702f314e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_db_name.php
@@ -0,0 +1,51 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (NULL !== ($tmp = @mysql_db_name()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_db_name($link, $link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (!$res = @mysql_list_dbs($link))
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!$num = mysql_num_rows($res))
+	printf("[004] Empty database list? [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (false !== ($tmp = mysql_db_name($res, -1)))
+	printf("[005] Expecting boolean/false, got %s/%s. [%d] %s\n",
+		gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+if (false !== ($tmp = mysql_db_name($res, $num + 1)))
+	printf("[006] Expecting boolean/false, got %s/%s. [%d] %s\n",
+		gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+$unicode = (boolean)(version_compare(PHP_VERSION, '5.9.9', '>') == 1);
+for ($i = 0; $i < $num; $i++) {
+	if ('' === ($dbname = mysql_db_name($res, $i)))
+		printf("[%03d] Got empty database name! [%d] %s\n",
+			(($i * 2) + 1) + 6, mysql_errno($link), mysql_error($link));
+
+	if ($unicode && !is_unicode($dbname)) {
+		printf("[%03d] Expecting unicode string! [%d] %s\n",
+			(($i * 2) + 2) + 6, mysql_errno($link), mysql_error($link));
+		var_inspect($dbname);
+	}
+}
+
+mysql_free_result($res);
+
+if (false !== ($tmp = mysql_db_name($res, $num)))
+	printf("[999] Expecting boolean/false, got %s/%s. [%d] %s\n",
+		gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+mysql_close($link);
+
+print "done!\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_db_name.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_db_name.php.expectf
new file mode 100644
index 000000000..bbb6a90e5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_db_name.php.expectf
@@ -0,0 +1,4 @@
+HipHop Warning: %a
+HipHop Warning: %a
+HipHop Warning: %a
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_db_query.php b/hphp/test/zend/bad/ext-mysql/mysql_db_query.php
new file mode 100644
index 000000000..a8f5f7d8d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_db_query.php
@@ -0,0 +1,53 @@
+<?php
+include "connect.inc";
+
+// NOTE: this function is deprecated. We do only the most necessary
+// to test it. We don't test all aspects of the documented behaviour.
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (NULL !== ($tmp = @mysql_db_query()))
+	printf("[001] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_db_query($link)))
+	printf("[002] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_db_query($link)))
+	printf("[003] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = @mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT 1', $link))
+	printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+$row = mysql_fetch_assoc($res);
+if (1 != $row['id'])
+	printf("[005] Expecting record 1/a, got record %s/%s\n", $row['id'], $row['label']);
+
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row['label'])) {
+	printf("[006] No unicode returned! [%d] %s\n", mysql_errno($link), mysql_error($link));
+	var_inspect($row);
+}
+
+mysql_free_result($res);
+
+
+if (!$res = @mysql_db_query($db, 'SELECT id, label FROM test ORDER BY id LIMIT 1'))
+	printf("[007] [%d] %s\n", mysql_errno(), mysql_error());
+
+$row = mysql_fetch_assoc($res);
+if (1 != $row['id'])
+	printf("[008] Expecting record 1/a, got record %s/%s\n", $row['id'], $row['label']);
+
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row['label'])) {
+	printf("[009] No unicode returned! [%d] %s\n", mysql_errno(), mysql_error());
+	var_inspect($row);
+}
+
+mysql_free_result($res);
+mysql_close($link);
+
+print "done!\n";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_db_query.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_db_query.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_db_query.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_drop_db.php b/hphp/test/zend/bad/ext-mysql/mysql_drop_db.php
new file mode 100644
index 000000000..46e4e9249
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_drop_db.php
@@ -0,0 +1,42 @@
+<?php
+include_once "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+// NOTE: again this test does not test all of the behaviour of the function
+
+if (NULL !== ($tmp = mysql_drop_db()))
+	printf("[001] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!mysql_query('DROP DATABASE IF EXISTS mysqldropdb'))
+	printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!mysql_query('CREATE DATABASE mysqldropdb'))
+	die(sprintf("[005] Skipping, can't create test database. [%d] %s\n", mysql_errno($link), mysql_error($link)));
+
+if (true !== ($tmp = mysql_drop_db('mysqldropdb', $link)))
+	printf("[006] Can't drop, got %s/%s. [%d] %s\n",
+		gettype($tmp), $tmp,
+		mysql_errno($link), mysql_error($link));
+
+if (false !== ($tmp = mysql_drop_db('mysqldropdb', $link)))
+	printf("[007] Expecting boolean/false, got %s/%s. [%d] %s\n",
+		gettype($tmp), $tmp,
+		mysql_errno($link), mysql_error($link));
+
+mysql_close($link);
+
+print "done!\n";
+?><?php
+require_once('connect.inc');
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+	printf("[c001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+
+if (!mysql_query("DROP DATABASE IF EXISTS mysqldropdb", $link))
+	printf("[c002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+mysql_close($link);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_drop_db.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_drop_db.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_drop_db.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_errno.php b/hphp/test/zend/bad/ext-mysql/mysql_errno.php
new file mode 100644
index 000000000..1a64d3430
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_errno.php
@@ -0,0 +1,46 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (false !== ($tmp = @mysql_errno()))
+	printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (null !== ($tmp = @mysql_errno($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!is_null($tmp = @mysql_errno($link, 'too many args')))
+	printf("[002b] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) {
+	printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+}
+var_dump(mysql_errno($link));
+
+if (!mysql_query('DROP TABLE IF EXISTS test', $link)) {
+	printf("[004] Failed to drop old test table: [%d] %s\n", mysql_errno($link), mysql_errno($link));
+}
+
+mysql_query('SELECT * FROM test', $link);
+var_dump(mysql_errno($link));
+
+mysql_close($link);
+
+var_dump(mysql_errno($link));
+
+if ($link = @mysql_connect($host . '_unknown', $user . '_unknown', $passwd, true)) {
+	printf("[005] Can connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host . '_unknown', $user . '_unknown', $db, $port, $socket);
+} else {
+	$errno = mysql_errno();
+	if (!is_int($errno))
+		printf("[006] Expecting int/any (e.g 1046, 2005) got %s/%s\n", gettype($errno), $errno);
+
+}
+
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_errno.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_errno.php.expectf
new file mode 100644
index 000000000..8bef15d2c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_errno.php.expectf
@@ -0,0 +1,5 @@
+int(0)
+int(%d)
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_error.php b/hphp/test/zend/bad/ext-mysql/mysql_error.php
new file mode 100644
index 000000000..9071f37ea
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_error.php
@@ -0,0 +1,53 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (false !== ($tmp = @mysql_error()))
+	printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_error($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!is_null($tmp = @mysql_error($link, 'too many args')))
+	printf("[002b] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) {
+	printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+}
+
+$tmp = mysql_error($link);
+if (!is_string($tmp) || ('' !== $tmp))
+	printf("[004] Expecting string/empty, got %s/%s. [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+if (!mysql_query('DROP TABLE IF EXISTS test', $link)) {
+	printf("[005] Failed to drop old test table: [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+mysql_query('SELECT * FROM test', $link);
+$tmp = mysql_error($link);
+if (!is_string($tmp) || !preg_match("/Table '\w*\.test' doesn't exist/su", $tmp))
+	printf("[006] Expecting string/[Table... doesn't exit], got %s/%s. [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp)) {
+	printf("[007] Expecting Unicode error message!\n");
+	var_inspect($tmp);
+}
+
+mysql_close($link);
+
+var_dump(mysql_error($link));
+
+if ($link = @mysql_connect($host . '_unknown', $user . '_unknown', $passwd, true)) {
+	printf("[008] Can connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host . '_unknown', $user . '_unknown', $db, $port, $socket);
+}
+if ('' == mysql_error())
+	printf("[009] Connect error should have been set\n");
+
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_error.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_error.php.expectf
new file mode 100644
index 000000000..f2f386ad8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_error.php.expectf
@@ -0,0 +1,3 @@
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_array.php b/hphp/test/zend/bad/ext-mysql/mysql_fetch_array.php
new file mode 100644
index 000000000..c49cbe295
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_array.php
@@ -0,0 +1,272 @@
+<?php
+include_once "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (NULL !== ($tmp = @mysql_fetch_array()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL != ($tmp = @mysql_fetch_array($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT * FROM test ORDER BY id LIMIT 5", $link)) {
+	printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+print "[005]\n";
+var_dump(mysql_fetch_array($res));
+
+print "[006]\n";
+var_dump(mysql_fetch_array($res, MYSQL_NUM));
+
+print "[007]\n";
+var_dump(mysql_fetch_array($res, MYSQL_BOTH));
+
+print "[008]\n";
+var_dump(mysql_fetch_array($res, MYSQL_ASSOC));
+
+print "[009]\n";
+var_dump(mysql_fetch_array($res));
+
+mysql_free_result($res);
+
+if (!$res = mysql_query("SELECT 1 AS a, 2 AS a, 3 AS c, 4 AS C, NULL AS d, true AS e", $link)) {
+	printf("[010] Cannot run query, [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+print "[011]\n";
+var_dump(mysql_fetch_array($res, MYSQL_BOTH));
+
+mysql_free_result($res);
+if (!$res = mysql_query("SELECT 1 AS a, 2 AS b, 3 AS c, 4 AS C", $link)) {
+	printf("[012] Cannot run query, [%d] %s\n",
+		mysql_errno($link), $mysql_error($link));
+	exit(1);
+}
+
+do {
+	$illegal_mode = mt_rand(0, 10000);
+} while (in_array($illegal_mode, array(MYSQL_ASSOC, MYSQL_NUM, MYSQL_BOTH)));
+$tmp = mysql_fetch_array($res, $illegal_mode);
+if (!is_array($tmp))
+	printf("[013] Expecting array, got %s/%s. [%d] %s\n",
+		gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+$tmp = @mysql_fetch_array($res, $illegal_mode);
+if (false !== $tmp)
+	printf("[014] Expecting boolean/false, got %s/%s. [%d] %s\n",
+		gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+mysql_free_result($res);
+
+function func_mysql_fetch_array($link, $engine, $sql_type, $sql_value, $php_value, $offset, $regexp_comparison = NULL, $binary_type = false) {
+
+	if (!mysql_query("DROP TABLE IF EXISTS test", $link)) {
+		printf("[%04d] [%d] %s\n", $offset, mysql_errno($link), mysql_error($link));
+		return false;
+	}
+
+	if (!mysql_query($sql = sprintf("CREATE TABLE test(id INT NOT NULL, label %s, PRIMARY KEY(id)) ENGINE = %s", $sql_type, $engine), $link)) {
+		// don't bail, engine might not support the datatype
+		return false;
+	}
+
+	if (is_null($php_value) && !mysql_query($sql = sprintf("INSERT INTO test(id, label) VALUES (1, NULL)"), $link)) {
+		printf("[%04d] [%d] %s\n", $offset + 1, mysql_errno($link), mysql_error($link));
+		return false;
+	}
+
+	if (!is_null($php_value)) {
+		if (is_int($sql_value) && !mysql_query(sprintf("INSERT INTO test(id, label) VALUES (1, '%d')", $sql_value), $link)) {
+			printf("[%04d] [%d] %s\n", $offset + 1, mysql_errno($link), mysql_error($link));
+			return false;
+		} else if (!is_int($sql_value) && !mysql_query(sprintf("INSERT INTO test(id, label) VALUES (1, '%s')", $sql_value), $link)) {
+			printf("[%04d] [%d] %s\n", $offset + 1, mysql_errno($link), mysql_error($link));
+			return false;
+		}
+	}
+
+	if (!$res = mysql_query("SELECT id, label FROM test", $link)) {
+		printf("[%04d] [%d] %s\n", $offset + 2, mysql_errno($link), mysql_error($link));
+		return false;
+	}
+
+	if (!$row = mysql_fetch_array($res, MYSQL_BOTH)) {
+		printf("[%04d] [%d] %s\n", $offset + 3, mysql_errno($link), mysql_error($link));
+		return false;
+	}
+
+	if ($regexp_comparison) {
+		if (!preg_match($regexp_comparison, (string)$row['label']) || !preg_match($regexp_comparison, (string)$row[1])) {
+		printf("[%04d] Expecting %s/%s [reg exp = %s], got %s/%s resp. %s/%s. [%d] %s\n", $offset + 4,
+			gettype($php_value), $php_value, $regexp_comparison,
+			gettype($row[1]), $row[1],
+			gettype($row['label']), $row['label'], mysql_errno($link), mysql_error($link));
+		return false;
+		}
+	} else if ((gettype($php_value) == 'unicode') && $binary_type) {
+		// Unicode is on and we are told that the MySQL column type is a binary type.
+		// Don't expect a unicode value from the database, you'll get binary string
+		if (($row['label'] != $php_value) || ($row[1] != $php_value)) {
+			printf("[%04d] Expecting %s/%s, got %s/%s resp. %s/%s. [%d] %s\n", $offset + 5,
+				gettype($php_value), $php_value,
+				gettype($row[1]), $row[1],
+				gettype($row['label']), $row['label'], mysql_errno($link), mysql_error($link));
+			return false;
+		}
+		if (gettype($row['label']) == 'unicode') {
+			printf("[%04d] SQL Type: '%s', binary columns are supposed to return binary string and not unicode\n",
+				$offset + 6, $sql_type);
+			return false;
+		}
+	} else {
+		if (($row['label'] !== $php_value) || ($row[1] != $php_value)) {
+			printf("[%04d] Expecting %s/%s, got %s/%s resp. %s/%s. [%d] %s\n", $offset + 7,
+				gettype($php_value), $php_value,
+				gettype($row[1]), $row[1],
+				gettype($row['label']), $row['label'], mysql_errno($link), mysql_error($link));
+			return false;
+		}
+	}
+
+	return true;
+}
+
+function func_mysql_fetch_array_make_string($len) {
+
+	$ret = '';
+	for ($i = 0; $i < $len; $i++)
+		$ret .= chr(mt_rand(65, 90));
+
+	return $ret;
+}
+
+func_mysql_fetch_array($link, $engine, "TINYINT", -11, "-11", 20);
+func_mysql_fetch_array($link, $engine, "TINYINT", NULL, NULL, 30);
+func_mysql_fetch_array($link, $engine, "TINYINT UNSIGNED", 1, "1", 40);
+func_mysql_fetch_array($link, $engine, "TINYINT UNSIGNED", NULL, NULL, 50);
+
+func_mysql_fetch_array($link, $engine, "BOOL", 1, "1", 60);
+func_mysql_fetch_array($link, $engine, "BOOL", NULL, NULL, 70);
+func_mysql_fetch_array($link, $engine, "BOOLEAN", 0, "0", 80);
+func_mysql_fetch_array($link, $engine, "BOOLEAN", NULL, NULL, 90);
+
+func_mysql_fetch_array($link, $engine, "SMALLINT", -32768, "-32768", 100);
+func_mysql_fetch_array($link, $engine, "SMALLINT", 32767, "32767", 110);
+func_mysql_fetch_array($link, $engine, "SMALLINT", NULL, NULL, 120);
+func_mysql_fetch_array($link, $engine, "SMALLINT UNSIGNED", 65535, "65535", 130);
+func_mysql_fetch_array($link, $engine, "SMALLINT UNSIGNED", NULL, NULL, 140);
+
+func_mysql_fetch_array($link, $engine, "MEDIUMINT", -8388608, "-8388608", 150);
+func_mysql_fetch_array($link, $engine, "MEDIUMINT", 8388607, "8388607", 160);
+func_mysql_fetch_array($link, $engine, "MEDIUMINT", NULL, NULL, 170);
+func_mysql_fetch_array($link, $engine, "MEDIUMINT UNSIGNED", 16777215, "16777215", 180);
+func_mysql_fetch_array($link, $engine, "MEDIUMINT UNSIGNED", NULL, NULL, 190);
+
+func_mysql_fetch_array($link, $engine, "INTEGER", -2147483648, "-2147483648", 200);
+func_mysql_fetch_array($link, $engine, "INTEGER", 2147483647, "2147483647", 210);
+func_mysql_fetch_array($link, $engine, "INTEGER", NULL, NULL, 220);
+func_mysql_fetch_array($link, $engine, "INTEGER UNSIGNED", 4294967295, "4294967295", 230);
+func_mysql_fetch_array($link, $engine, "INTEGER UNSIGNED", NULL, NULL, 240);
+
+// func_mysql_fetch_array($link, $engine, "BIGINT", -9223372036854775808, "-9.22337e+018", 250, "/-9\.22337e\+[0]?18/iu");
+func_mysql_fetch_array($link, $engine, "BIGINT", NULL, NULL, 260);
+// func_mysql_fetch_array($link, $engine, "BIGINT UNSIGNED", 18446744073709551615, "1.84467e+019", 270, "/1\.84467e\+[0]?19/iu");
+func_mysql_fetch_array($link, $engine, "BIGINT UNSIGNED", NULL, NULL, 280);
+
+func_mysql_fetch_array($link, $engine, "FLOAT", -9223372036854775808 - 1.1, "-9.22337e+18", 290, "/-9\.22337e\+?[0]?18/iu");
+func_mysql_fetch_array($link, $engine, "FLOAT", NULL, NULL, 300);
+func_mysql_fetch_array($link, $engine, "FLOAT UNSIGNED", 18446744073709551615 + 1.1, "1.84467e+19", 310, "/1\.84467e\+?[0]?19/iu");
+func_mysql_fetch_array($link, $engine, "FLOAT UNSIGNED ", NULL, NULL, 320);
+
+func_mysql_fetch_array($link, $engine, "DOUBLE(10,2)", -99999999.99, "-99999999.99", 330);
+func_mysql_fetch_array($link, $engine, "DOUBLE(10,2)", NULL, NULL, 340);
+func_mysql_fetch_array($link, $engine, "DOUBLE(10,2) UNSIGNED", 99999999.99, "99999999.99", 350);
+func_mysql_fetch_array($link, $engine, "DOUBLE(10,2) UNSIGNED", NULL, NULL, 360);
+
+func_mysql_fetch_array($link, $engine, "DECIMAL(10,2)", -99999999.99, "-99999999.99", 370);
+func_mysql_fetch_array($link, $engine, "DECIMAL(10,2)", NULL, NULL, 380);
+func_mysql_fetch_array($link, $engine, "DECIMAL(10,2)", 99999999.99, "99999999.99", 390);
+func_mysql_fetch_array($link, $engine, "DECIMAL(10,2)", NULL, NULL, 400);
+
+// don't care about date() strict TZ warnings...
+func_mysql_fetch_array($link, $engine, "DATE", @date('Y-m-d'), @date('Y-m-d'), 410);
+func_mysql_fetch_array($link, $engine, "DATE NOT NULL", @date('Y-m-d'), @date('Y-m-d'), 420);
+func_mysql_fetch_array($link, $engine, "DATE", NULL, NULL, 430);
+
+func_mysql_fetch_array($link, $engine, "DATETIME", @date('Y-m-d H:i:s'), @date('Y-m-d H:i:s'), 440);
+func_mysql_fetch_array($link, $engine, "DATETIME NOT NULL", @date('Y-m-d H:i:s'), @date('Y-m-d H:i:s'), 450);
+func_mysql_fetch_array($link, $engine, "DATETIME", NULL, NULL, 460);
+
+func_mysql_fetch_array($link, $engine, "TIMESTAMP", @date('Y-m-d H:i:s'), @date('Y-m-d H:i:s'), 470);
+
+func_mysql_fetch_array($link, $engine, "TIME", @date('H:i:s'), @date('H:i:s'), 480);
+func_mysql_fetch_array($link, $engine, "TIME NOT NULL", @date('H:i:s'), @date('H:i:s'), 490);
+func_mysql_fetch_array($link, $engine, "TIME", NULL, NULL, 500);
+
+func_mysql_fetch_array($link, $engine, "YEAR", @date('Y'), @date('Y'), 510);
+func_mysql_fetch_array($link, $engine, "YEAR NOT NULL", @date('Y'), @date('Y'), 520);
+func_mysql_fetch_array($link, $engine, "YEAR", NULL, NULL, 530);
+
+$string255 = func_mysql_fetch_array_make_string(255);
+
+func_mysql_fetch_array($link, $engine, "CHAR(1)", "a", "a", 540);
+func_mysql_fetch_array($link, $engine, "CHAR(255)", $string255,  $string255, 550);
+func_mysql_fetch_array($link, $engine, "CHAR(1) NOT NULL", "a", "a", 560);
+func_mysql_fetch_array($link, $engine, "CHAR(1)", NULL, NULL, 570);
+
+$string65k = func_mysql_fetch_array_make_string(65400);
+
+func_mysql_fetch_array($link, $engine, "VARCHAR(1)", "a", "a", 580);
+func_mysql_fetch_array($link, $engine, "VARCHAR(255)", $string255, $string255, 590);
+func_mysql_fetch_array($link, $engine, "VARCHAR(65400)", $string65k, $string65k, 600);
+func_mysql_fetch_array($link, $engine, "VARCHAR(1) NOT NULL", "a", "a", 610);
+func_mysql_fetch_array($link, $engine, "VARCHAR(1)", NULL, NULL, 620);
+
+func_mysql_fetch_array($link, $engine, "BINARY(1)", "a", "a", 630, null , true);
+func_mysql_fetch_array($link, $engine, "BINARY(1) NOT NULL", "b", "b", 650, null , true);
+func_mysql_fetch_array($link, $engine, "BINARY(1)", NULL, NULL, 660, null , true);
+
+func_mysql_fetch_array($link, $engine, "VARBINARY(1)", "a", "a", 670, null , true);
+func_mysql_fetch_array($link, $engine, "VARBINARY(1) NOT NULL", "b", "b", 690, null , true);
+func_mysql_fetch_array($link, $engine, "VARBINARY(1)", NULL, NULL, 700, null , true);
+
+func_mysql_fetch_array($link, $engine, "TINYBLOB", "a", "a", 710, null , true);
+func_mysql_fetch_array($link, $engine, "TINYBLOB NOT NULL", "b", "b", 730, null , true);
+func_mysql_fetch_array($link, $engine, "TINYBLOB", NULL, NULL, 740, null , true);
+
+func_mysql_fetch_array($link, $engine, "TINYTEXT", "a", "a", 750);
+func_mysql_fetch_array($link, $engine, "TINYTEXT NOT NULL", "a", "a", 760);
+func_mysql_fetch_array($link, $engine, "TINYTEXT", NULL, NULL, 770);
+
+func_mysql_fetch_array($link, $engine, "BLOB", "a", "a", 780, null , true);
+func_mysql_fetch_array($link, $engine, "BLOB", NULL, NULL, 790, null , true);
+
+func_mysql_fetch_array($link, $engine, "TEXT", "a", "a", 800);
+func_mysql_fetch_array($link, $engine, "TEXT", NULL, NULL, 820);
+
+func_mysql_fetch_array($link, $engine, "MEDIUMBLOB", "a", "a", 830, null , true);
+func_mysql_fetch_array($link, $engine, "MEDIUMBLOB", NULL, NULL, 850, null , true);
+
+func_mysql_fetch_array($link, $engine, "MEDIUMTEXT", "a", "a", 860);
+func_mysql_fetch_array($link, $engine, "MEDIUMTEXT", NULL, NULL, 880);
+
+func_mysql_fetch_array($link, $engine, "LONGBLOB", "a", "a", 890, null , true);
+func_mysql_fetch_array($link, $engine, "LONGBLOB", NULL, NULL, 910, null , true);
+
+func_mysql_fetch_array($link, $engine, "ENUM('a', 'b')", "a", "a", 920);
+func_mysql_fetch_array($link, $engine, "ENUM('a', 'b')", NULL, NULL, 930);
+
+func_mysql_fetch_array($link, $engine, "SET('a', 'b')", "a", "a", 940);
+func_mysql_fetch_array($link, $engine, "SET('a', 'b')", NULL, NULL, 950);
+
+mysql_close($link);
+
+if (false !== ($tmp = mysql_fetch_array($res, MYSQL_ASSOC)))
+printf("[015] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_array.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_fetch_array.php.expectf
new file mode 100644
index 000000000..d6c28a050
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_array.php.expectf
@@ -0,0 +1,75 @@
+[005]
+array(4) {
+  [0]=>
+  %unicode|string%(1) "1"
+  [%u|b%"id"]=>
+  %unicode|string%(1) "1"
+  [1]=>
+  %unicode|string%(1) "a"
+  [%u|b%"label"]=>
+  %unicode|string%(1) "a"
+}
+[006]
+array(2) {
+  [0]=>
+  %unicode|string%(1) "2"
+  [1]=>
+  %unicode|string%(1) "b"
+}
+[007]
+array(4) {
+  [0]=>
+  %unicode|string%(1) "3"
+  [%u|b%"id"]=>
+  %unicode|string%(1) "3"
+  [1]=>
+  %unicode|string%(1) "c"
+  [%u|b%"label"]=>
+  %unicode|string%(1) "c"
+}
+[008]
+array(2) {
+  [%u|b%"id"]=>
+  %unicode|string%(1) "4"
+  [%u|b%"label"]=>
+  %unicode|string%(1) "d"
+}
+[009]
+array(4) {
+  [0]=>
+  %unicode|string%(1) "5"
+  [%u|b%"id"]=>
+  %unicode|string%(1) "5"
+  [1]=>
+  %unicode|string%(1) "e"
+  [%u|b%"label"]=>
+  %unicode|string%(1) "e"
+}
+[011]
+array(11) {
+  [0]=>
+  %unicode|string%(1) "1"
+  [%u|b%"a"]=>
+  %unicode|string%(1) "2"
+  [1]=>
+  %unicode|string%(1) "2"
+  [2]=>
+  %unicode|string%(1) "3"
+  [%u|b%"c"]=>
+  %unicode|string%(1) "3"
+  [3]=>
+  %unicode|string%(1) "4"
+  [%u|b%"C"]=>
+  %unicode|string%(1) "4"
+  [4]=>
+  NULL
+  [%u|b%"d"]=>
+  NULL
+  [5]=>
+  %unicode|string%(1) "1"
+  [%u|b%"e"]=>
+  %unicode|string%(1) "1"
+}
+HipHop Warning: %a
+HipHop Warning: %a
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.php b/hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.php
new file mode 100644
index 000000000..a45c53711
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.php
@@ -0,0 +1,54 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+// Note: no SQL type tests, internally the same function gets used as for mysql_fetch_array() which does a lot of SQL type test
+
+if (!is_null($tmp = @mysql_fetch_assoc()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_fetch_assoc($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 1", $link)) {
+	printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+print "[005]\n";
+var_dump(mysql_fetch_assoc($res));
+
+print "[006]\n";
+var_dump(mysql_fetch_assoc($res));
+
+mysql_free_result($res);
+
+if (!$res = mysql_query("SELECT 1 AS a, 2 AS a, 3 AS c, 4 AS C, NULL AS d, true AS e", $link)) {
+	printf("[007] Cannot run query, [%d] %s\n", mysql_errno($link), $mysql_error($link));
+}
+print "[008]\n";
+var_dump(mysql_fetch_assoc($res));
+
+mysql_free_result($res);
+
+if (false !== ($tmp = mysql_fetch_assoc($res)))
+	printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_close($link);
+
+include('table.inc');
+if (!$res = mysql_query("SELECT id, label, id AS _id, CONCAT(label, 'a') _label, NULL as _foo FROM test _test ORDER BY id ASC LIMIT 1", $link)) {
+	printf("[009] [%d] %s\n", mysql_errno($link), $mysql_error($link));
+}
+print "[010]\n";
+var_dump(mysql_fetch_assoc($res));
+mysql_free_result($res);
+
+mysql_close($link);
+
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.php.expectf
new file mode 100644
index 000000000..cf4880dcd
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.php.expectf
@@ -0,0 +1,37 @@
+[005]
+array(2) {
+  [%u|b%"id"]=>
+  %unicode|string%(1) "1"
+  [%u|b%"label"]=>
+  %unicode|string%(1) "a"
+}
+[006]
+bool(false)
+[008]
+array(5) {
+  [%u|b%"a"]=>
+  %unicode|string%(1) "2"
+  [%u|b%"c"]=>
+  %unicode|string%(1) "3"
+  [%u|b%"C"]=>
+  %unicode|string%(1) "4"
+  [%u|b%"d"]=>
+  NULL
+  [%u|b%"e"]=>
+  %unicode|string%(1) "1"
+}
+HipHop Warning: %a
+[010]
+array(5) {
+  [%u|b%"id"]=>
+  %unicode|string%(1) "1"
+  [%u|b%"label"]=>
+  %unicode|string%(1) "a"
+  [%u|b%"_id"]=>
+  %unicode|string%(1) "1"
+  [%u|b%"_label"]=>
+  %unicode|string%(2) "aa"
+  [%u|b%"_foo"]=>
+  NULL
+}
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_field.php b/hphp/test/zend/bad/ext-mysql/mysql_fetch_field.php
new file mode 100644
index 000000000..bc943663f
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_field.php
@@ -0,0 +1,147 @@
+<?php
+	include "connect.inc";
+
+	$tmp    = NULL;
+	$link   = NULL;
+
+	// Note: no SQL type tests, internally the same function gets used as for mysql_fetch_array() which does a lot of SQL type test
+	if (!is_null($tmp = @mysql_fetch_field()))
+		printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	if (NULL !== ($tmp = @mysql_fetch_field($link)))
+		printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	require('table.inc');
+
+	$version = mysql_get_server_info($link);
+	if (!preg_match('@(\d+)\.(\d+)\.(\d+)@ism', $version, $matches))
+		printf("[003] Cannot get server version\n");
+	$version = ($matches[1] * 100) + ($matches[2] * 10) + $matches[3];
+
+	if (!$res = mysql_query("SELECT id AS ID, label FROM test AS TEST ORDER BY id LIMIT 1", $link)) {
+		printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
+	}
+
+	while ($tmp = mysql_fetch_field($res))
+		var_dump($tmp);
+	var_dump($tmp);
+
+	mysql_free_result($res);
+
+	if (!$res = mysql_query("SELECT id AS ID, label FROM test AS TEST ORDER BY id LIMIT 1", $link)) {
+		printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link));
+	}
+	if (false !== ($tmp = mysql_fetch_field($res, PHP_INT_MAX - 1)))
+		printf("[006] Expecting boolean/false got %s/%s\n", gettype($tmp), var_export($tmp, true));
+
+	mysql_free_result($res);
+
+	if (false !== ($tmp = mysql_fetch_field($res)))
+		printf("[007] Expecting boolean/false, got %s/%s\n", gettype($tmp), var_export($tmp, true));
+
+	$types = array(
+		'BIT'               => array(1, 'int'),
+		'TINYINT'           => array(1, 'int'),
+		'BOOL'              => array('true', 'int'),
+		'BOOL'              => array(1, 'int'),
+		'SMALLINT'          => array(32767, 'int'),
+		'MEDIUMINT'         => array(8388607, 'int'),
+		'INT'               => array(100, 'int'),
+		'BIGINT'            => array(100, 'int'),
+		'FLOAT'             => array(100, 'real'),
+		'DOUBLE'            => array(100, 'real'),
+		'DECIMAL'           => array(100, 'real'),
+		'DATE'              => array(@date('Y-m-d'), 'date'),
+		'DATETIME'          => array(@date('Y-m-d H:i:s'), 'datetime'),
+		'TIMESTAMP'         => array(@date('Y-m-d H:i:s'), 'timestamp'),
+		'TIME'              => array(@date('H:i:s'), 'time'),
+		'YEAR'              => array(@date('Y'), 'year'),
+		'CHAR(1)'           => array('a', 'string'),
+		'VARCHAR(1)'        => array('a', 'string'),
+		'BINARY(1)'         => array('a', 'string'),
+		'VARBINARY(1)'      => array('a', 'string'),
+		'TINYBLOB'          => array('a', 'blob'),
+		'TINYTEXT'          => array('a', 'blob'),
+		'BLOB'              => array('a', 'blob'),
+		'TEXT'              => array('a', 'blob'),
+		'MEDIUMBLOB'        => array('a', 'blob'),
+		'MEDIUMTEXT'        => array('a', 'blob'),
+		'LONGBLOB'          => array('a', 'blob'),
+		'LONGTEXT'          => array('a', 'blob'),
+		'ENUM("a", "b")'    => array('a', 'string'), /* !!! */
+		'SET("a", "b")'     => array('a', 'string'), /* !!! */
+	);
+
+	foreach ($types as $type_name => $type_desc) {
+		if (!mysql_query("DROP TABLE IF EXISTS test", $link))
+			printf("[008/%s] [%d] %s\n", $type_name, mysql_errno($link), mysql_error($link));
+		if (!mysql_query(sprintf("CREATE TABLE test(id INT, label %s) ENGINE = %s", $type_name, $engine), $link)) {
+			// server and/or engine might not support the data type
+			continue;
+		}
+
+		if (is_string($type_desc[0]))
+			$insert = sprintf("INSERT INTO test(id, label) VALUES (1, '%s')", $type_desc[0]);
+		else
+			$insert = sprintf("INSERT INTO test(id, label) VALUES (1, %s)", $type_desc[0]);
+
+		if (!mysql_query($insert, $link)) {
+			if (1366 == mysql_errno($link)) {
+				/* Strict SQL mode - 1366, Incorrect integer value: 'true' for column 'label' at row 1 */
+				continue;
+			}
+			printf("[009/%s] [%d] %s\n", $type_name, mysql_errno($link), mysql_error($link));
+			continue;
+		}
+		if (!$res = mysql_query("SELECT id, label FROM test", $link)) {
+			printf("[010/%s] [%d] %s\n", $type_name, mysql_errno($link), mysql_error($link));
+			continue;
+		}
+		if (!$tmp = mysql_fetch_field($res, 1)) {
+			printf("[011/%s] [%d] %s\n", $type_name, mysql_errno($link), mysql_error($link));
+		}
+
+		if ($type_desc[1] != $tmp->type) {
+			printf("[012/%s] Expecting type '%s' got '%s'\n", $type_name, $type_desc[1], $tmp->type);
+		}
+		mysql_free_result($res);
+	}
+
+	if (!mysql_query("DROP TABLE IF EXISTS test", $link))
+		printf("[013] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+	if (!mysql_query("CREATE TABLE test(id INT DEFAULT 1)"))
+		printf("[014] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+	if (!mysql_query("INSERT INTO test(id) VALUES (2)"))
+		printf("[015] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+	if (!$res = mysql_query("SELECT id FROM test", $link)) {
+		printf("[016] [%d] %s\n", mysql_errno($link), mysql_error($link));
+	}
+
+	var_dump(mysql_fetch_field($res));
+	mysql_free_result($res);
+
+	if (!$res = mysql_query("SELECT id FROM test", $link)) {
+		printf("[017] [%d] %s\n", mysql_errno($link), mysql_error($link));
+	}
+	$res = mysql_list_fields($db, 'test');
+	$found = false;
+	while ($tmp = mysql_fetch_field($res)) {
+		if ($tmp->name == 'id') {
+			printf("Fetch field from mysql_list_fields result set.\n");
+			$found = true;
+			var_dump($tmp);
+		}
+	}
+	if (!$found)
+		printf("[018] mysqli_list_fields result set processing has failed.\n");
+
+	mysql_free_result($res);
+
+	mysql_close($link);
+	print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_field.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_fetch_field.php.expectf
new file mode 100644
index 000000000..adbecee87
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_field.php.expectf
@@ -0,0 +1,117 @@
+object(stdClass)#%d (13) {
+  [%u|b%"name"]=>
+  %unicode|string%(2) "ID"
+  [%u|b%"table"]=>
+  %unicode|string%(4) "TEST"
+  [%u|b%"def"]=>
+  %unicode|string%(0) ""
+  [%u|b%"max_length"]=>
+  int(1)
+  [%u|b%"not_null"]=>
+  int(1)
+  [%u|b%"primary_key"]=>
+  int(1)
+  [%u|b%"multiple_key"]=>
+  int(0)
+  [%u|b%"unique_key"]=>
+  int(0)
+  [%u|b%"numeric"]=>
+  int(1)
+  [%u|b%"blob"]=>
+  int(0)
+  [%u|b%"type"]=>
+  %unicode|string%(3) "int"
+  [%u|b%"unsigned"]=>
+  int(0)
+  [%u|b%"zerofill"]=>
+  int(0)
+}
+object(stdClass)#%d (13) {
+  [%u|b%"name"]=>
+  %unicode|string%(5) "label"
+  [%u|b%"table"]=>
+  %unicode|string%(4) "TEST"
+  [%u|b%"def"]=>
+  %unicode|string%(0) ""
+  [%u|b%"max_length"]=>
+  int(1)
+  [%u|b%"not_null"]=>
+  int(0)
+  [%u|b%"primary_key"]=>
+  int(0)
+  [%u|b%"multiple_key"]=>
+  int(0)
+  [%u|b%"unique_key"]=>
+  int(0)
+  [%u|b%"numeric"]=>
+  int(0)
+  [%u|b%"blob"]=>
+  int(0)
+  [%u|b%"type"]=>
+  %unicode|string%(6) "string"
+  [%u|b%"unsigned"]=>
+  int(0)
+  [%u|b%"zerofill"]=>
+  int(0)
+}
+bool(false)
+HipHop Warning: %a
+HipHop Warning: %a
+object(stdClass)#%d (13) {
+  [%u|b%"name"]=>
+  %unicode|string%(2) "id"
+  [%u|b%"table"]=>
+  %unicode|string%(4) "test"
+  [%u|b%"def"]=>
+  %unicode|string%(0) ""
+  [%u|b%"max_length"]=>
+  int(1)
+  [%u|b%"not_null"]=>
+  int(0)
+  [%u|b%"primary_key"]=>
+  int(0)
+  [%u|b%"multiple_key"]=>
+  int(0)
+  [%u|b%"unique_key"]=>
+  int(0)
+  [%u|b%"numeric"]=>
+  int(1)
+  [%u|b%"blob"]=>
+  int(0)
+  [%u|b%"type"]=>
+  %unicode|string%(3) "int"
+  [%u|b%"unsigned"]=>
+  int(0)
+  [%u|b%"zerofill"]=>
+  int(0)
+}
+Fetch field from mysql_list_fields result set.
+object(stdClass)#%d (13) {
+  [%u|b%"name"]=>
+  %unicode|string%(2) "id"
+  [%u|b%"table"]=>
+  %unicode|string%(4) "test"
+  [%u|b%"def"]=>
+  %unicode|string%(1) "1"
+  [%u|b%"max_length"]=>
+  int(0)
+  [%u|b%"not_null"]=>
+  int(0)
+  [%u|b%"primary_key"]=>
+  int(0)
+  [%u|b%"multiple_key"]=>
+  int(0)
+  [%u|b%"unique_key"]=>
+  int(0)
+  [%u|b%"numeric"]=>
+  int(1)
+  [%u|b%"blob"]=>
+  int(0)
+  [%u|b%"type"]=>
+  %unicode|string%(3) "int"
+  [%u|b%"unsigned"]=>
+  int(0)
+  [%u|b%"zerofill"]=>
+  int(0)
+}
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_lengths.php b/hphp/test/zend/bad/ext-mysql/mysql_fetch_lengths.php
new file mode 100644
index 000000000..4665bfbe4
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_lengths.php
@@ -0,0 +1,30 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_fetch_lengths()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_fetch_lengths($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 1", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+while ($row = mysql_fetch_assoc($res))
+	var_dump(mysql_fetch_lengths($res));
+var_dump(mysql_fetch_lengths($res));
+
+mysql_free_result($res);
+
+var_dump(mysql_fetch_lengths($res));
+
+mysql_close($link);
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_lengths.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_fetch_lengths.php.expectf
new file mode 100644
index 000000000..e75812829
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_lengths.php.expectf
@@ -0,0 +1,10 @@
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(1)
+}
+bool(false)
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_object.php b/hphp/test/zend/bad/ext-mysql/mysql_fetch_object.php
new file mode 100644
index 000000000..fe91e2630
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_object.php
@@ -0,0 +1,73 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_fetch_object()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = @mysql_fetch_object($link)))
+	printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id AS ID, label FROM test AS TEST ORDER BY id LIMIT 5", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+var_dump(mysql_fetch_object($res));
+
+class mysql_fetch_object_test {
+
+	public $a = null;
+	public $b = null;
+
+	public function toString() {
+		var_dump($this);
+	}
+}
+
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_test'));
+
+class mysql_fetch_object_construct extends mysql_fetch_object_test {
+
+	public function __construct($a, $b) {
+		$this->a = $a;
+		$this->b = $b;
+	}
+
+}
+
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', null));
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a')));
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a', 'b')));
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a', 'b', 'c')));
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', "no array and not null"));
+var_dump(mysql_fetch_object($res));
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a', 'b')));
+
+class mysql_fetch_object_private_construct {
+	private function __construct($a, $b) {
+		var_dump($a);
+	}
+}
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_private_construct', array('a', 'b')));
+
+mysql_free_result($res);
+
+if (!$res = mysql_query("SELECT id AS ID, label FROM test AS TEST", $link)) {
+	printf("[009] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+mysql_free_result($res);
+
+var_dump(mysql_fetch_object($res));
+
+// Fatal error, script execution will end
+var_dump(mysql_fetch_object($res, 'this_class_does_not_exist'));
+
+mysql_close($link);
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_object.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_fetch_object.php.expectf
new file mode 100644
index 000000000..a3a5f5b80
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_object.php.expectf
@@ -0,0 +1,60 @@
+object(stdClass)#%d (2) {
+  [%u|b%"ID"]=>
+  %unicode|string%(1) "1"
+  [%u|b%"label"]=>
+  %unicode|string%(1) "a"
+}
+object(mysql_fetch_object_test)#%d (4) {
+  [%u|b%"a"]=>
+  NULL
+  [%u|b%"b"]=>
+  NULL
+  [%u|b%"ID"]=>
+  %unicode|string%(1) "2"
+  [%u|b%"label"]=>
+  %unicode|string%(1) "b"
+}
+HipHop Warning: %a
+HipHop Warning: %a
+HipHop Notice: %a
+HipHop Notice: %a
+object(mysql_fetch_object_construct)#%d (4) {
+  [%u|b%"a"]=>
+  NULL
+  [%u|b%"b"]=>
+  NULL
+  [%u|b%"ID"]=>
+  %unicode|string%(1) "3"
+  [%u|b%"label"]=>
+  %unicode|string%(1) "c"
+}
+HipHop Warning: %a
+HipHop Notice: %a
+object(mysql_fetch_object_construct)#%d (4) {
+  [%u|b%"a"]=>
+  %unicode|string%(1) "a"
+  [%u|b%"b"]=>
+  NULL
+  [%u|b%"ID"]=>
+  %unicode|string%(1) "4"
+  [%u|b%"label"]=>
+  %unicode|string%(1) "d"
+}
+object(mysql_fetch_object_construct)#%d (4) {
+  [%u|b%"a"]=>
+  %unicode|string%(1) "a"
+  [%u|b%"b"]=>
+  %unicode|string%(1) "b"
+  [%u|b%"ID"]=>
+  %unicode|string%(1) "5"
+  [%u|b%"label"]=>
+  %unicode|string%(1) "e"
+}
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+HipHop Warning: %a
+bool(false)
+HipHop Fatal error: %a
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_row.php b/hphp/test/zend/bad/ext-mysql/mysql_fetch_row.php
new file mode 100644
index 000000000..a9a3b9c5e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_row.php
@@ -0,0 +1,32 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_fetch_row()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_fetch_row($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 1", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+print "[004]\n";
+var_dump(mysql_fetch_row($res));
+
+print "[005]\n";
+var_dump(mysql_fetch_row($res));
+
+mysql_free_result($res);
+
+var_dump(mysql_fetch_row($res));
+
+mysql_close($link);
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_row.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_fetch_row.php.expectf
new file mode 100644
index 000000000..95afff965
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_row.php.expectf
@@ -0,0 +1,12 @@
+[004]
+array(2) {
+  [0]=>
+  %unicode|string%(1) "1"
+  [1]=>
+  %unicode|string%(1) "a"
+}
+[005]
+bool(false)
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php b/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php
new file mode 100644
index 000000000..409c38fc0
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php
@@ -0,0 +1,135 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_field_flags()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (null !== ($tmp = @mysql_field_flags($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+if (NULL !== ($tmp = mysql_field_flags($res)))
+	printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_field_flags($res, -1)))
+	printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!is_string($tmp = mysql_field_flags($res, 0)) || empty($tmp))
+	printf("[006] Expecting non empty string, got %s/%s\n", gettype($tmp), $tmp);
+
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp)) {
+	printf("[007] Check the unicode support!\n");
+	var_inspect($tmp);
+}
+
+if (false !== ($tmp = mysql_field_flags($res, 2)))
+	printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_free_result($res);
+
+$version = mysql_get_server_info($link);
+if (!preg_match('@(\d+)\.(\d+)\.(\d+)@ism', $version, $matches))
+	printf("[009] Cannot get server version\n");
+$version = ($matches[1] * 100) + ($matches[2] * 10) + $matches[3];
+
+$tables = array(
+	'label INT, UNIQUE KEY (label)'                         =>  array(
+								array('label', '1'),
+								'label' => array(($version < 500) ? 'multiple_key' : 'unique_key')
+								),
+	'labela INT, label2 CHAR(1), KEY keyname (labela, label2)'      =>  array(
+								array('labela, label2', "1, 'a'"),
+								'labela' => array('multiple_key'),
+								),
+	'label1 BLOB'                                           =>  array(
+								array('label1', "'blob'"),
+								'label1' => array('blob', 'binary'),
+								),
+	'label1 INT UNSIGNED'                                   =>  array(
+								array('label1', '100'),
+								'label1' => array('unsigned'),
+								),
+	'label1 INT UNSIGNED NOT NULL AUTO INCREMENT'           =>  array(
+								array('label1', '100'),
+								'label1' => array('auto_increment',
+										'unsigned'),
+								),
+	'label1 ENUM("a", "b")'                                 =>  array(
+								array('label1', "'a'"),
+								'label1' => array('enum'),
+								),
+	'label1 SET("a", "b")'                                  =>  array(
+								array('label1', "'a'"),
+								'label1' => array('set'),
+								),
+	'label1 TIMESTAMP'                                      =>  array(
+								array('label1', sprintf("'%s'", @date("Y-m-d H:i:s"))),
+								'label1' => array(
+										'timestamp',
+										'binary',
+										'not_null'),
+								),
+);
+
+if ($version < 560) {
+	$tables['label1 TIMESTAMP']['label1'][] = 'zerofill';
+	$tables['label1 TIMESTAMP']['label1'][] = 'unsigned';
+}
+
+
+foreach ($tables as $columns => $expected) {
+	if (!mysql_query("DROP TABLE IF EXISTS test", $link)) {
+		printf("[010/%s] [%d] %s\n", $columns, mysql_errno($link), mysql_error($link));
+		continue;
+	}
+	$sql = sprintf("CREATE TABLE test(id INT, %s) ENGINE = %s", $columns, $engine);
+		if (!@mysql_query($sql, $link)) {
+		// server or engine might not support this
+		continue;
+	}
+
+	reset($expected);
+	list($k, $values) = each($expected);
+	$sql = sprintf("INSERT INTO test(id, %s) VALUES (1, %s)", $values[0], $values[1]);
+	if (!mysql_query($sql, $link)) {
+		printf("[011/%s] '%s', [%d] %s\n", $columns, $sql, mysql_errno($link), mysql_error($link));
+		continue;
+	}
+
+	if (!$res = mysql_query(sprintf("SELECT id, %s FROM test", $values[0]), $link)) {
+		printf("[012/%s] [%d] %s\n", $columns, mysql_errno($link), mysql_error($link));
+		continue;
+	}
+
+	$i = 1;
+	while (list($field, $flags) = each($expected)) {
+		$tmp = mysql_field_flags($res, $i++);
+
+		foreach ($flags as $k => $flag) {
+		if (!preg_match(sprintf('@\s*%s\s*@ismU', $flag), $tmp)) {
+			printf("[013/%s] Field '%s', flag '%s' not found, [%d] %s\n", $columns, $field, $flag, mysql_errno($link), mysql_error($link));
+		}
+	}
+		foreach ($flags as $k => $flag) {
+			$tmp = preg_replace(sprintf('@\s*%s\s*@ismU', $flag), '', $tmp);
+		}
+		if ('' != $tmp)
+			printf("[014/%s] Field '%s', unexpected flags '%s' found, [%d] %s\n", $columns, $field, $tmp, mysql_errno($link), mysql_error($link));
+	}
+	mysql_free_result($res);
+}
+
+var_dump(mysql_field_flags($res, 0));
+
+mysql_close($link);
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php.expectf
new file mode 100644
index 000000000..bd8b7405b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php.expectf
@@ -0,0 +1,6 @@
+HipHop Warning: %a
+HipHop Warning: %a
+HipHop Warning: %a
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_len.php b/hphp/test/zend/bad/ext-mysql/mysql_field_len.php
new file mode 100644
index 000000000..187746282
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_field_len.php
@@ -0,0 +1,38 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_field_len()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (null !== ($tmp = @mysql_field_len($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+if (NULL !== ($tmp = mysql_field_len($res)))
+printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_field_len($res, -1)))
+	printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!is_int($tmp = mysql_field_len($res, 0)) || empty($tmp))
+	printf("[006] Expecting non empty integer, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_field_len($res, 2)))
+	printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_free_result($res);
+
+var_dump(mysql_field_len($res, 0));
+
+mysql_close($link);
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_len.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_field_len.php.expectf
new file mode 100644
index 000000000..bd8b7405b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_field_len.php.expectf
@@ -0,0 +1,6 @@
+HipHop Warning: %a
+HipHop Warning: %a
+HipHop Warning: %a
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_name.php b/hphp/test/zend/bad/ext-mysql/mysql_field_name.php
new file mode 100644
index 000000000..f1766a118
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_field_name.php
@@ -0,0 +1,37 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_field_name()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (null !== ($tmp = @mysql_field_name($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+if (NULL !== ($tmp = mysql_field_name($res)))
+	printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_field_name($res, -1)))
+	printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+var_dump(mysql_field_name($res, 0));
+
+if (false !== ($tmp = mysql_field_name($res, 2)))
+	printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_free_result($res);
+
+var_dump(mysql_field_name($res, 0));
+
+mysql_close($link);
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_name.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_field_name.php.expectf
new file mode 100644
index 000000000..38a80cc64
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_field_name.php.expectf
@@ -0,0 +1,7 @@
+HipHop Warning: %a
+HipHop Warning: %a
+%unicode|string%(2) "id"
+HipHop Warning: %a
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_seek.php b/hphp/test/zend/bad/ext-mysql/mysql_field_seek.php
new file mode 100644
index 000000000..3f02f02c8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_field_seek.php
@@ -0,0 +1,35 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_field_seek()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!is_null($tmp = @mysql_field_seek($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 1", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+var_dump(mysql_field_seek($res, -1));
+var_dump(mysql_fetch_field($res));
+var_dump(mysql_field_seek($res, 0));
+var_dump(mysql_fetch_field($res));
+var_dump(mysql_field_seek($res, 1));
+var_dump(mysql_fetch_field($res));
+var_dump(mysql_field_seek($res, 2));
+var_dump(mysql_fetch_field($res));
+
+mysql_free_result($res);
+
+var_dump(mysql_field_seek($res, 0));
+
+mysql_close($link);
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_seek.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_field_seek.php.expectf
new file mode 100644
index 000000000..2d166617d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_field_seek.php.expectf
@@ -0,0 +1,94 @@
+HipHop Warning: %a
+bool(false)
+object(stdClass)#%d (13) {
+  [%u|b%"name"]=>
+  %unicode|string%(2) "id"
+  [%u|b%"table"]=>
+  %unicode|string%(4) "test"
+  [%u|b%"def"]=>
+  %unicode|string%(0) ""
+  [%u|b%"max_length"]=>
+  int(1)
+  [%u|b%"not_null"]=>
+  int(1)
+  [%u|b%"primary_key"]=>
+  int(1)
+  [%u|b%"multiple_key"]=>
+  int(0)
+  [%u|b%"unique_key"]=>
+  int(0)
+  [%u|b%"numeric"]=>
+  int(1)
+  [%u|b%"blob"]=>
+  int(0)
+  [%u|b%"type"]=>
+  %unicode|string%(3) "int"
+  [%u|b%"unsigned"]=>
+  int(0)
+  [%u|b%"zerofill"]=>
+  int(0)
+}
+bool(true)
+object(stdClass)#%d (13) {
+  [%u|b%"name"]=>
+  %unicode|string%(2) "id"
+  [%u|b%"table"]=>
+  %unicode|string%(4) "test"
+  [%u|b%"def"]=>
+  %unicode|string%(0) ""
+  [%u|b%"max_length"]=>
+  int(1)
+  [%u|b%"not_null"]=>
+  int(1)
+  [%u|b%"primary_key"]=>
+  int(1)
+  [%u|b%"multiple_key"]=>
+  int(0)
+  [%u|b%"unique_key"]=>
+  int(0)
+  [%u|b%"numeric"]=>
+  int(1)
+  [%u|b%"blob"]=>
+  int(0)
+  [%u|b%"type"]=>
+  %unicode|string%(3) "int"
+  [%u|b%"unsigned"]=>
+  int(0)
+  [%u|b%"zerofill"]=>
+  int(0)
+}
+bool(true)
+object(stdClass)#%d (13) {
+  [%u|b%"name"]=>
+  %unicode|string%(5) "label"
+  [%u|b%"table"]=>
+  %unicode|string%(4) "test"
+  [%u|b%"def"]=>
+  %unicode|string%(0) ""
+  [%u|b%"max_length"]=>
+  int(1)
+  [%u|b%"not_null"]=>
+  int(0)
+  [%u|b%"primary_key"]=>
+  int(0)
+  [%u|b%"multiple_key"]=>
+  int(0)
+  [%u|b%"unique_key"]=>
+  int(0)
+  [%u|b%"numeric"]=>
+  int(0)
+  [%u|b%"blob"]=>
+  int(0)
+  [%u|b%"type"]=>
+  %unicode|string%(6) "string"
+  [%u|b%"unsigned"]=>
+  int(0)
+  [%u|b%"zerofill"]=>
+  int(0)
+}
+HipHop Warning: %a
+bool(false)
+bool(false)
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_table.php b/hphp/test/zend/bad/ext-mysql/mysql_field_table.php
new file mode 100644
index 000000000..af724dcbe
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_field_table.php
@@ -0,0 +1,37 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_field_table()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (null !== ($tmp = @mysql_field_table($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+if (NULL !== ($tmp = mysql_field_table($res)))
+	printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_field_table($res, -1)))
+	printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+var_dump(mysql_field_table($res, 0));
+
+if (false !== ($tmp = mysql_field_table($res, 2)))
+	printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_free_result($res);
+
+var_dump(mysql_field_table($res, 0));
+
+mysql_close($link);
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_table.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_field_table.php.expectf
new file mode 100644
index 000000000..b2f11176e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_field_table.php.expectf
@@ -0,0 +1,7 @@
+HipHop Warning: %a
+HipHop Warning: %a
+%unicode|string%(4) "test"
+HipHop Warning: %a
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_type.php b/hphp/test/zend/bad/ext-mysql/mysql_field_type.php
new file mode 100644
index 000000000..d27e50213
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_field_type.php
@@ -0,0 +1,37 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_field_type()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (null !== ($tmp = @mysql_field_type($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+if (NULL !== ($tmp = mysql_field_type($res)))
+	printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_field_type($res, -1)))
+	printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+var_dump(mysql_field_type($res, 0));
+
+if (false !== ($tmp = mysql_field_type($res, 2)))
+	printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_free_result($res);
+
+var_dump(mysql_field_type($res, 0));
+
+mysql_close($link);
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_type.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_field_type.php.expectf
new file mode 100644
index 000000000..452c3c171
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_field_type.php.expectf
@@ -0,0 +1,7 @@
+HipHop Warning: %a
+HipHop Warning: %a
+%unicode|string%(3) "int"
+HipHop Warning: %a
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_free_result.php b/hphp/test/zend/bad/ext-mysql/mysql_free_result.php
new file mode 100644
index 000000000..c0e1c22cf
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_free_result.php
@@ -0,0 +1,35 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_free_result()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (null !== ($tmp = @mysql_free_result($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id FROM test ORDER BY id LIMIT 1", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+var_dump(mysql_free_result($res));
+var_dump(mysql_free_result($res));
+
+if ($tmp = sys_get_temp_dir()) {
+	$tmpname = tempnam($tmp, 'free_result');
+	if ($fp = fopen($tmpname, 'w')) {
+		if (false !== ($tmp = @mysql_free_result($fp)))
+			printf("[004] Expecting boolean/false got %s/%s\n", gettype($tmp), $tmp);
+		fclose($fp);
+		@unlink($tmpname);
+	}
+}
+
+mysql_close($link);
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_free_result.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_free_result.php.expectf
new file mode 100644
index 000000000..69d1f7d6d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_free_result.php.expectf
@@ -0,0 +1,4 @@
+bool(true)
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_get_host_info.php b/hphp/test/zend/bad/ext-mysql/mysql_get_host_info.php
new file mode 100644
index 000000000..fd751fbc6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_get_host_info.php
@@ -0,0 +1,32 @@
+<?php
+include_once "connect.inc";
+
+if (NULL !== ($tmp = @mysql_get_host_info(NULL)))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require "table.inc";
+if (!is_string($info = mysql_get_host_info($link)) || ('' === $info))
+	printf("[003] Expecting string/any_non_empty, got %s/%s\n", gettype($info), $info);
+
+$def_info = mysql_get_host_info();
+if ($def_info !== $info) {
+	printf("[004] Host info for the default link and the specified link differ, [%d] %s\n",
+		mysql_errno(), mysql_error());
+
+	var_dump($def_info);
+	var_dump($info);
+}
+
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($info)) {
+	printf("[005] Expecting Unicode error message!\n");
+	var_inspect($info);
+}
+
+if (!is_null($tmp = @mysql_get_host_info($link, "too many arguments"))) {
+	printf("[006] Expecting NULL/NULL got %s/%s\n", $tmp, gettype($tmp));
+}
+
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_get_host_info.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_get_host_info.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_get_host_info.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_get_proto_info.php b/hphp/test/zend/bad/ext-mysql/mysql_get_proto_info.php
new file mode 100644
index 000000000..f2cb22856
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_get_proto_info.php
@@ -0,0 +1,22 @@
+<?php
+include_once "connect.inc";
+
+if (NULL !== ($tmp = @mysql_get_proto_info(NULL)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require "table.inc";
+if (!is_int($info = mysql_get_proto_info($link)) || (0 === $info))
+	printf("[003] Expecting int/any_non_empty, got %s/%s\n", gettype($info), $info);
+
+if (!is_int($info2 = mysql_get_proto_info()) || (0 === $info2))
+	printf("[004] Expecting int/any_non_empty, got %s/%s\n", gettype($info2), $info2);
+
+assert($info === $info2);
+
+if (NULL !== ($tmp = @mysql_get_proto_info('too many', 'arguments')))
+	printf("[005] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_get_proto_info.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_get_proto_info.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_get_proto_info.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_get_server_info.php b/hphp/test/zend/bad/ext-mysql/mysql_get_server_info.php
new file mode 100644
index 000000000..d520920f8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_get_server_info.php
@@ -0,0 +1,29 @@
+<?php
+include "connect.inc";
+
+if (null !== ($tmp = @mysql_get_server_info(NULL)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require "table.inc";
+if (!is_string($info = mysql_get_server_info($link)) || ('' === $info))
+	printf("[003] Expecting string/any_non_empty, got %s/%s\n", gettype($info), $info);
+
+$def_info = mysql_get_server_info();
+if ($def_info !== $info) {
+	printf("[004] Server info for the default link and the specified link differ, [%d] %s\n",
+		mysql_errno(), mysql_error());
+
+	var_dump($def_info);
+	var_dump($info);
+}
+
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($info)) {
+	printf("[005] Expecting Unicode error message!\n");
+	var_inspect($info);
+}
+
+if (NULL !== ($tmp = @mysql_get_server_info('too many', 'just too many')))
+	printf("[006] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_get_server_info.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_get_server_info.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_get_server_info.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_info.php b/hphp/test/zend/bad/ext-mysql/mysql_info.php
new file mode 100644
index 000000000..af80a3ef9
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_info.php
@@ -0,0 +1,61 @@
+<?php
+include "connect.inc";
+
+if (false !== ($tmp = @mysql_info()))
+	printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_info(NULL)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require "table.inc";
+if (!$res = mysql_query("INSERT INTO test(id, label) VALUES (100, 'a')", $link))
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (false !== ($tmp = mysql_info($link)))
+	printf("[004] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$res = mysql_query("INSERT INTO test(id, label) VALUES (101, 'a'), (102, 'b')", $link))
+	printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!is_string($tmp = mysql_info($link)) || ('' == $tmp))
+	printf("[006] Expecting string/any_non_empty, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$res = mysql_query('INSERT INTO test(id, label) SELECT id + 200, label FROM test', $link))
+	printf("[007] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!is_string($tmp = mysql_info($link)) || ('' == $tmp))
+	printf("[008] Expecting string/any_non_empty, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$res = mysql_query('ALTER TABLE test MODIFY label CHAR(2)', $link))
+	printf("[009] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!is_string($tmp = mysql_info($link)) || ('' == $tmp))
+	printf("[010] Expecting string/any_non_empty, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$res = mysql_query("UPDATE test SET label = 'b' WHERE id >= 100", $link))
+	printf("[011] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!is_string($tmp = mysql_info($link)) || ('' == $tmp))
+	printf("[012] Expecting string/any_non_empty, got %s/%s\n", gettype($tmp), $tmp);
+
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp)) {
+	printf("[013] Expecting Unicode!\n");
+	var_inspect($info);
+}
+
+if (!is_string($def_tmp = mysql_info()) || ('' == $def_tmp))
+	printf("[014] Expecting string/any_non_empty, got %s/%s\n", gettype($def_tmp), $def_tmp);
+
+if ($def_tmp !== $tmp) {
+	printf("[015] Results differ for default link and specified link, [%d] %s\n",
+		mysql_errno(), mysql_error());
+	var_inspect($tmp);
+	var_inspect($def_tmp);
+}
+
+// NOTE: no LOAD DATA INFILE test
+
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_info.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_info.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_info.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_insert_id.php b/hphp/test/zend/bad/ext-mysql/mysql_insert_id.php
new file mode 100644
index 000000000..c949c2f5e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_insert_id.php
@@ -0,0 +1,57 @@
+<?php
+include "connect.inc";
+include 'setupdefault.inc';
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (0 !== ($tmp = @mysql_insert_id()))
+	printf("[001] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_insert_id($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!is_null($tmp = @mysql_insert_id($link, 'too many args')))
+	printf("[002a] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (0 !== ($tmp = mysql_insert_id($link)))
+	printf("[003] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 1", $link)) {
+	printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+if (0 !== ($tmp = mysql_insert_id($link)))
+	printf("[005] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
+mysql_free_result($res);
+
+// no auto_increment column
+if (!$res = mysql_query("INSERT INTO test(id, label) VALUES (100, 'a')", $link)) {
+	printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+if (0 !== ($tmp = mysql_insert_id($link)))
+	printf("[007] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$res = mysql_query("ALTER TABLE test MODIFY id INT NOT NULL AUTO_INCREMENT", $link)) {
+	printf("[008] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+if (!$res = mysql_query("INSERT INTO test(label) VALUES ('a')", $link)) {
+	printf("[009] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+if (0 === ($tmp = mysql_insert_id($link)))
+	printf("[010] Expecting int/not zero, got %s/%s\n", gettype($tmp), $tmp);
+
+if ($tmp !== ($tmp2 = mysql_insert_id()))
+	printf("[011] Expecting %s/%s, got %s/%s\n",
+		gettype($tmp), $tmp,
+		gettype($tmp2), $tmp2);
+
+mysql_close($link);
+
+var_dump(mysql_insert_id($link));
+
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_insert_id.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_insert_id.php.expectf
new file mode 100644
index 000000000..f2f386ad8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_insert_id.php.expectf
@@ -0,0 +1,3 @@
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_list_dbs.php b/hphp/test/zend/bad/ext-mysql/mysql_list_dbs.php
new file mode 100644
index 000000000..f9848fad4
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_list_dbs.php
@@ -0,0 +1,42 @@
+<?php
+include_once "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (NULL !== ($tmp = @mysql_list_dbs(NULL)))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_list_dbs($link, $link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (!$res = @mysql_list_dbs($link))
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!$num = mysql_num_rows($res))
+	printf("[004] Empty database list? [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+$row = mysql_fetch_array($res, MYSQL_NUM);
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row[0])) {
+	printf("[005] Check for unicode support\n");
+	var_inspect($row);
+}
+
+mysql_free_result($res);
+
+if (!$res2 = @mysql_list_dbs())
+	printf("[006] [%d] %s\n", mysql_errno(), mysql_error());
+
+$row2 = mysql_fetch_array($res2, MYSQL_NUM);
+mysql_free_result($res2);
+
+assert($row === $row2);
+
+mysql_close($link);
+
+print "done!\n";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_list_dbs.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_list_dbs.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_list_dbs.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_list_fields.php b/hphp/test/zend/bad/ext-mysql/mysql_list_fields.php
new file mode 100644
index 000000000..03ed6bd7f
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_list_fields.php
@@ -0,0 +1,55 @@
+<?php
+require_once 'connect.inc';
+
+$tmp    = NULL;
+$link   = NULL;
+
+require 'table.inc';
+
+if (!$res = mysql_list_fields($db, 'test', $link))
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (2 !== ($num = mysql_num_fields($res)))
+	printf("[004] Expecting two fields from 'test', got %d. [%d] %s\n", $num, mysql_errno($link), mysql_error($link));
+
+mysql_free_result($res);
+
+if (!mysql_query("DROP TABLE IF EXISTS test2", $link))
+	printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!$res = @mysql_list_fields($db, 'test2', $link))
+	printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!$res = mysql_list_fields($db, 'test', $link))
+	printf("[007] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (2 !== ($num = mysql_num_fields($res)))
+	printf("[008] Expecting 2 fields from 'test', got %d. [%d] %s\n", $num, mysql_errno($link), mysql_error($link));
+
+var_dump(mysql_fetch_assoc($res));
+for ($field_offset = 0; $field_offset < mysql_num_fields($res); $field_offset++) {
+	printf("Field Offset %d\n", $field_offset);
+	printf("mysql_field_flags(): %s\n", mysql_field_flags($res, $field_offset));
+	printf("mysql_field_len(): %s\n", mysql_field_len($res, $field_offset));
+	printf("mysql_field_name(): %s\n", mysql_field_name($res, $field_offset));
+	printf("mysql_field_type(): %s\n", mysql_field_type($res, $field_offset));
+}
+
+mysql_free_result($res);
+mysql_close($link);
+
+print "done!";
+?><?php
+require_once 'connect.inc';
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+	printf("[c001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+
+if (!mysql_query("DROP TABLE IF EXISTS test", $link))
+	printf("[c002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+if (!mysql_query("DROP TABLE IF EXISTS test2", $link))
+	printf("[c002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+mysql_close($link);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_list_fields.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_list_fields.php.expectf
new file mode 100644
index 000000000..5c309fd1d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_list_fields.php.expectf
@@ -0,0 +1,13 @@
+[006] [%d] %s
+bool(false)
+Field Offset 0
+mysql_field_flags()%s
+mysql_field_len(): 11
+mysql_field_name(): id
+mysql_field_type(): int
+Field Offset 1
+mysql_field_flags()%s
+mysql_field_len(): 1
+mysql_field_name(): label
+mysql_field_type(): string
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_list_processes.php b/hphp/test/zend/bad/ext-mysql/mysql_list_processes.php
new file mode 100644
index 000000000..2e7490624
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_list_processes.php
@@ -0,0 +1,42 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (NULL !== ($tmp = @mysql_list_processes($link, $link)))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (!$res = mysql_list_processes($link))
+	printf("[002] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!$num = mysql_num_rows($res))
+	printf("[003] Empty process list? [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+$row = mysql_fetch_array($res, MYSQL_NUM);
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row[0])) {
+	printf("[004] Check for unicode support\n");
+	var_inspect($row);
+}
+
+mysql_free_result($res);
+
+if (!$res = mysql_list_processes())
+	printf("[005] [%d] %s\n", mysql_errno(), mysql_error());
+
+if (!$num = mysql_num_rows($res))
+	printf("[006] Empty process list? [%d] %s\n", mysql_errno(), mysql_error());
+
+$row = mysql_fetch_array($res, MYSQL_NUM);
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row[0])) {
+	printf("[007] Check for unicode support\n");
+	var_inspect($row);
+}
+
+mysql_free_result($res);
+mysql_close($link);
+
+print "done!\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_list_processes.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_list_processes.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_list_processes.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_list_tables.php b/hphp/test/zend/bad/ext-mysql/mysql_list_tables.php
new file mode 100644
index 000000000..380551020
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_list_tables.php
@@ -0,0 +1,73 @@
+<?php
+include_once "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (NULL !== ($tmp = @mysql_list_tables()))
+	printf("[001] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_list_tables('too', 'many', 'arguments')))
+	printf("[002] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = @mysql_list_tables(NULL)))
+	printf("[003] Expecting boolean/false got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_list_tables($db, NULL)))
+	printf("[004] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+
+require_once('table.inc');
+
+if (!$res_def = @mysql_list_tables($db))
+	printf("[005] [%d] %s\n", mysql_errno(), mysql_error());
+
+if (!$res = @mysql_list_tables($db, $link))
+	printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!$res_query = mysql_query("SHOW TABLES", $link))
+	printf("[007] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+$tables_def = $tables = $tables_query = array();
+
+while ($row = mysql_fetch_assoc($res_def))
+	$tables_def[] = $row;
+mysql_free_result($res_def);
+
+while ($row = mysql_fetch_assoc($res))
+	$tables[] = $row;
+mysql_free_result($res);
+
+while ($row = mysql_fetch_assoc($res_query))
+	$tables_query[] = $row;
+mysql_free_result($res_query);
+
+if ($tables_def !== $tables) {
+	printf("[008] Got different table lists for default link and specified link\n");
+	var_dump($tables_def);
+	var_dump($tables);
+}
+
+$list1 = $list2 = array();
+foreach ($tables as $k => $tlist)
+	foreach ($tlist as $k => $table)
+		$list1[] = $table;
+
+foreach ($tables_query as $k => $tlist)
+	foreach ($tlist as $k => $table)
+		$list2[] = $table;
+
+if ($list1 !== $list2) {
+	printf("[009] Got different results for mysql_list_tables() and SHOW TABLES\n");
+	var_dump($list1);
+	var_dump($list2);
+}
+
+if (!in_array('test', $list1))
+	printf("[010] Table lists seem to be wrong. Check manually.\n");
+
+mysql_close($link);
+
+print "done!\n";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_list_tables.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_list_tables.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_list_tables.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_num_fields.php b/hphp/test/zend/bad/ext-mysql/mysql_num_fields.php
new file mode 100644
index 000000000..842e7de2b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_num_fields.php
@@ -0,0 +1,43 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_num_fields()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_num_fields($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+function func_test_mysql_num_fields($link, $query, $expected, $offset, $test_free = false) {
+
+if (!($res = mysql_query($query, $link))) {
+	printf("[%03d] [%d] %s\n", $offset, mysql_errno($link), mysql_error($link));
+	return;
+}
+
+if ($expected !== ($tmp = mysql_num_fields($res)))
+	printf("[%03d] Expecting %s/%d, got %s/%d\n", $offset + 1,
+	gettype($expected), $expected,
+	gettype($tmp), $tmp);
+
+mysql_free_result($res);
+
+if ($test_free && (false !== ($tmp = mysql_num_fields($res))))
+	printf("[%03d] Expecting boolean/false, got %s/%s\n", $offset + 2, gettype($tmp), $tmp);
+}
+
+func_test_mysql_num_fields($link, "SELECT 1 AS a", 1, 5);
+func_test_mysql_num_fields($link, "SELECT id, label FROM test", 2, 10);
+func_test_mysql_num_fields($link, "SELECT 1 AS a, NULL AS b, 'foo' AS c", 3, 15);
+func_test_mysql_num_fields($link, "SELECT id FROM test", 1, 20, true);
+
+mysql_close($link);
+
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_num_fields.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_num_fields.php.expectf
new file mode 100644
index 000000000..6305362dc
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_num_fields.php.expectf
@@ -0,0 +1,2 @@
+HipHop Warning: %a
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_num_rows.php b/hphp/test/zend/bad/ext-mysql/mysql_num_rows.php
new file mode 100644
index 000000000..a7e25c1d9
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_num_rows.php
@@ -0,0 +1,70 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_num_rows()))
+printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (NULL !== ($tmp = @mysql_num_rows($link)))
+printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+function func_test_mysql_num_rows($link, $query, $expected, $offset, $test_free = false) {
+
+	if (!$res = mysql_query($query, $link)) {
+		printf("[%03d] [%d] %s\n", $offset, mysql_errno($link), mysql_error($link));
+		return;
+	}
+
+	if ($expected !== ($tmp = mysql_num_rows($res)))
+		printf("[%03d] Expecting %s/%d, got %s/%d\n", $offset + 1,
+			gettype($expected), $expected,
+			gettype($tmp), $tmp);
+
+	mysql_free_result($res);
+
+	if ($test_free && (false !== ($tmp = mysql_num_rows($res))))
+		printf("[%03d] Expecting boolean/false, got %s/%s\n", $offset + 2, gettype($tmp), $tmp);
+}
+
+func_test_mysql_num_rows($link, "SELECT 1 AS a", 1, 5);
+func_test_mysql_num_rows($link, "SHOW VARIABLES LIKE '%nixnutz%'", 0, 10);
+func_test_mysql_num_rows($link, "INSERT INTO test(id, label) VALUES (100, 'z')", NULL, 15);
+func_test_mysql_num_rows($link, "SELECT id FROM test LIMIT 2", 2, 20, true);
+
+if ($res = mysql_query('SELECT COUNT(id) AS num FROM test', $link)) {
+
+	$row = mysql_fetch_assoc($res);
+	mysql_free_result($res);
+
+	func_test_mysql_num_rows($link, "SELECT id, label FROM test", (int)$row['num'], 25);
+
+} else {
+	printf("[030] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+if ($res = mysql_unbuffered_query('SELECT id, label FROM test')) {
+
+	if (0 != mysql_num_rows($res))
+		printf("[032] Expecting 0 rows got %d\n", mysql_num_rows($res));
+	
+	$rows = 0;
+	while ($row = mysql_fetch_assoc($res))
+		$rows++;
+
+	if ($rows != mysql_num_rows($res))
+		printf("[033] Expecting %d rows got %d\n", $rows, mysql_num_rows($res));
+
+	mysql_free_result($res);
+} else {
+	printf("[034] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+mysql_close($link);
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_num_rows.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_num_rows.php.expectf
new file mode 100644
index 000000000..bbb6a90e5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_num_rows.php.expectf
@@ -0,0 +1,4 @@
+HipHop Warning: %a
+HipHop Warning: %a
+HipHop Warning: %a
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_phpinfo.php b/hphp/test/zend/bad/ext-mysql/mysql_phpinfo.php
new file mode 100644
index 000000000..a67563460
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_phpinfo.php
@@ -0,0 +1,65 @@
+<?php
+include_once("connect.inc");
+
+@ob_clean();
+ob_start();
+phpinfo();
+$phpinfo = ob_get_contents();
+ob_end_clean();
+
+/* all versions should at least dump this minimum information */
+if (!stristr($phpinfo, "mysql support"))
+	printf("[001] ext/mysql should have exposed itself.\n");
+
+if (!stristr($phpinfo, "client api version"))
+	printf("[002] ext/mysql should have exposed the library version.\n");
+
+if (!stristr($phpinfo, "mysql.default_host"))
+	printf("[003] php.ini setting mysql.default_host not shown.\n");
+
+if (!stristr($phpinfo, "mysql.default_port"))
+	printf("[004] php.ini setting mysql.default_port not shown.\n");
+
+if (!stristr($phpinfo, "mysql.default_password"))
+	printf("[005] php.ini setting mysql.default_password not shown.\n");
+
+if (!stristr($phpinfo, "mysql.default_socket"))
+	printf("[006] php.ini setting mysql.default_socket not shown.\n");
+
+if (!stristr($phpinfo, "mysql.default_user"))
+	printf("[007] php.ini setting mysql.default_user not shown.\n");
+
+if (!stristr($phpinfo, "mysql.max_links"))
+	printf("[008] php.ini setting mysql.max_links not shown.\n");
+
+if (!stristr($phpinfo, "mysql.max_persistent"))
+	printf("[009] php.ini setting mysql.max_persistent not shown.\n");
+
+if (!stristr($phpinfo, "mysql.connect_timeout"))
+	printf("[010] php.ini setting mysql.connect_timeout not shown.\n");
+
+if (!stristr($phpinfo, "mysql.allow_persistent"))
+	printf("[011] php.ini setting mysql.allow_persistent not shown.\n");
+
+if ($IS_MYSQLND) {
+	$expected = array(
+		'mysqlnd statistics',
+		'bytes_sent', 'bytes_received', 'packets_sent', 'packets_received',
+		'protocol_overhead_in', 'protocol_overhead_out', 'result_set_queries',
+		'non_result_set_queries', 'no_index_used', 'bad_index_used',
+		'buffered_sets', 'unbuffered_sets', 'ps_buffered_sets', 'ps_unbuffered_sets',
+		'flushed_normal_sets', 'flushed_ps_sets', 'rows_fetched_from_server',
+		'rows_fetched_from_client', 'rows_skipped', 'copy_on_write_saved',
+		'copy_on_write_performed', 'command_buffer_too_small', 'connect_success',
+		'connect_failure', 'connection_reused', 'explicit_close', 'implicit_close',
+		'disconnect_close', 'in_middle_of_command_close', 'explicit_free_result',
+		'implicit_free_result', 'explicit_stmt_close', 'implicit_stmt_close',
+		'size',
+	);
+	foreach ($expected as $k => $entry)
+		if (!stristr($phpinfo, $entry))
+			printf("[012] Could not find entry for '%s'\n", $entry);
+}
+
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_phpinfo.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_phpinfo.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_phpinfo.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_ping.php b/hphp/test/zend/bad/ext-mysql/mysql_ping.php
new file mode 100644
index 000000000..2120d516b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_ping.php
@@ -0,0 +1,33 @@
+<?php
+include_once "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+require('table.inc');
+
+if (!is_null($tmp = @mysql_ping($link, $link)))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+var_dump(mysql_ping($link));
+
+// provoke an error to check if mysql_ping resets it
+$res = mysql_query('SELECT * FROM unknown_table', $link);
+if (!($errno = mysql_errno($link)))
+	printf("[002] Statement should have caused an error\n");
+
+var_dump(mysql_ping($link));
+
+if ($errno === mysql_errno($link))
+	printf("[003] Error codes should have been reset\n");
+
+var_dump(mysql_ping());
+mysql_close($link);
+
+if (false !== ($tmp = mysql_ping($link)))
+	printf("[004] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_ping.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_ping.php.expectf
new file mode 100644
index 000000000..7dcae4d15
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_ping.php.expectf
@@ -0,0 +1,5 @@
+bool(true)
+bool(true)
+bool(true)
+HipHop Warning: %a
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_query.php b/hphp/test/zend/bad/ext-mysql/mysql_query.php
new file mode 100644
index 000000000..6fc441940
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_query.php
@@ -0,0 +1,104 @@
+<?php
+include_once("connect.inc");
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_query()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = @mysql_query($link)))
+	printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (NULL !== ($tmp = @mysql_query("SELECT 1 AS a", $link, "foo")))
+	printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_query('THIS IS NOT SQL', $link)))
+	printf("[004] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_query("SELECT 'this is sql but with backslash g'\g", $link)))
+	printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if ((0 === mysql_errno($link)) || ('' == mysql_error($link)))
+	printf("[006] mysql_errno()/mysql_error should return some error\n");
+
+if (!$res = mysql_query("SELECT 'this is sql but with semicolon' AS valid ; ", $link))
+	printf("[007] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+var_dump(mysql_fetch_assoc($res));
+mysql_free_result($res);
+
+if (!$res = mysql_query("SELECT 'a' AS ''", $link))
+	printf("[007a] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+var_dump($tmp = mysql_fetch_assoc($res));
+var_dump($tmp[""]);
+mysql_free_result($res);
+
+if (false !== ($res = mysql_query("SELECT 'this is sql but with semicolon' AS valid ; SHOW VARIABLES", $link)))
+	printf("[008] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (mysql_query('DROP PROCEDURE IF EXISTS p', $link)) {
+	// let's try to play with stored procedures
+	if (mysql_query('CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;', $link)) {
+		$res = mysql_query('CALL p(@version)', $link);
+		$res = mysql_query('SELECT @version AS p_version', $link);
+		$tmp = mysql_fetch_assoc($res);
+		if (!isset($tmp['p_version']) || ('' == $tmp['p_version'])) {
+			printf("[009] Result seems wrong, dumping\n");
+			var_dump($tmp);
+		}
+		if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['p_version'])) {
+			printf("[010] Expecting unicode string, dumping\n");
+			var_dump($tmp);
+		}
+		mysql_free_result($res);
+	} else {
+		printf("[011] [%d] %s\n", mysql_errno($link), mysql_error($link));
+	}
+
+	mysql_query('DROP FUNCTION IF EXISTS f', $link);
+	if (mysql_query('CREATE FUNCTION f( ver_param VARCHAR(25)) RETURNS VARCHAR(25) DETERMINISTIC RETURN ver_param;', $link)) {
+		$res = mysql_query('SELECT f(VERSION()) AS f_version', $link);
+		$tmp = mysql_fetch_assoc($res);
+		if (!isset($tmp['f_version']) || ('' == $tmp['f_version'])) {
+			printf("[012] Result seems wrong, dumping\n");
+			var_dump($tmp);
+		}
+		if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['f_version'])) {
+			printf("[013] Expecting unicode string, dumping\n");
+			var_dump($tmp);
+		}
+		mysql_free_result($res);
+	} else {
+		printf("[014] [%d] %s\n", mysql_errno($link), mysql_error($link));
+	}
+}
+
+mysql_close($link);
+
+if (false !== ($tmp = mysql_query("SELECT id FROM test", $link)))
+	printf("[011] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
+?><?php
+require_once('connect.inc');
+
+// connect + select_db
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) {
+	printf("[clean] Cannot connect to the server using host=%s/%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+ 	  $host, $myhost, $user, $db, $port, $socket);
+}
+
+if (!mysql_query('DROP TABLE IF EXISTS test', $link)) {
+	printf("[clean] Failed to drop test table: [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+/* MySQL server may not support this - ignore errors */
+@mysql_query('DROP PROCEDURE IF EXISTS p', $link);
+@mysql_query('DROP FUNCTION IF EXISTS f', $link);
+
+mysql_close($link);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_query.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_query.php.expectf
new file mode 100644
index 000000000..b5c652981
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_query.php.expectf
@@ -0,0 +1,11 @@
+array(1) {
+  [%u|b%"valid"]=>
+  %unicode|string%(30) "this is sql but with semicolon"
+}
+array(1) {
+  [%u|b%""]=>
+  %unicode|string%(1) "a"
+}
+%unicode|string%(1) "a"
+HipHop Warning: %a
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.php b/hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.php
new file mode 100644
index 000000000..76fda9f99
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.php
@@ -0,0 +1,84 @@
+<?php
+@include_once("connect.inc");
+ini_set("open_basedir", __DIR__);
+chdir(__DIR__);
+if (!isset($db)) {
+	// run-tests, I love you for not allowing me to set ini settings dynamically
+	print "[006] [1148] The used command is not allowed with this MySQL version
+[007] [0]
+[008] LOAD DATA not run?
+[010] [1148] The used command is not allowed with this MySQL version
+done!";
+	die();
+}
+require('table.inc');
+mysql_close($link);
+if ($socket)
+	$host = sprintf("%s:%s", $host, $socket);
+else if ($port)
+	$host = sprintf("%s:%s", $host, $port);
+
+if (!$link = mysql_connect($host, $user, $passwd, true, 128)) {
+	printf("[001] Cannot connect using host '%s', user '%s', password '****', [%d] %s\n",
+		$host, $user, $passwd,
+		mysql_errno(), mysql_error());
+}
+
+if (!mysql_select_db($db, $link)) {
+	printf("[002] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+if (file_exists('./simple.csv'))
+	unlink('./simple.csv');
+
+if (!$fp = fopen('./simple.csv', 'w'))
+	printf("[003] Cannot open CSV file\n");
+
+if (version_compare(PHP_VERSION, '5.9.9', '>') >= 0) {
+	if (!fwrite($fp, (binary)"'97';'x';\n") ||
+		!fwrite($fp, (binary)"'98';'y';\n") ||
+		!fwrite($fp, (binary)"99;'z';\n")) {
+		printf("[004] Cannot write CVS file '%s'\n", $file);
+	}
+} else {
+	if (!fwrite($fp, "97;'x';\n") ||
+		!fwrite($fp, "98;'y';\n") ||
+		!fwrite($fp, "99;'z';\n")) {
+		printf("[005] Cannot write CVS file '%s'\n", $file);
+	}
+}
+fclose($fp);
+
+$sql = sprintf("LOAD DATA LOCAL INFILE '%s'
+			INTO TABLE test
+			FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\''
+			LINES TERMINATED BY '\n'",
+			mysql_real_escape_string(realpath('./simple.csv'), $link));
+
+if (!mysql_query($sql, $link))
+	printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!($res = mysql_query('SELECT label FROM test WHERE id = 97', $link)) ||
+		!($row = mysql_fetch_assoc($res)) ||
+		!mysql_free_result($res))
+	printf("[007] [%d] '%s'\n", mysql_errno($link), mysql_error($link));
+
+if ($row['label'] != "x")
+	printf("[008] LOAD DATA not run?\n");
+
+if (!mysql_query('DELETE FROM test', $link))
+	printf("[009] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+$sql = "LOAD DATA LOCAL INFILE '/tmp/idonotexist'
+			INTO TABLE test
+			FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\''
+			LINES TERMINATED BY '\n'";
+
+if (!mysql_query($sql, $link))
+	printf("[010] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+mysql_close($link);
+unlink("./simple.csv");
+
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.php.expectf
new file mode 100644
index 000000000..dc835dbda
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.php.expectf
@@ -0,0 +1,5 @@
+[006] [1148] %s
+[007] [0] ''
+[008] LOAD DATA not run?
+[010] [1148] %s
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_real_escape_string.php b/hphp/test/zend/bad/ext-mysql/mysql_real_escape_string.php
new file mode 100644
index 000000000..a5f231d8c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_real_escape_string.php
@@ -0,0 +1,26 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (NULL !== ($tmp = @mysql_real_escape_string()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (NULL !== ($tmp = @mysql_real_escape_string('foo', $link, $link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+var_dump(mysql_real_escape_string("Am I a unicode string in PHP 6?", $link));
+var_dump(mysql_real_escape_string('\\', $link));
+var_dump(mysql_real_escape_string('"', $link));
+var_dump(mysql_real_escape_string("'", $link));
+var_dump(mysql_real_escape_string("\n", $link));
+var_dump(mysql_real_escape_string("\r", $link));
+var_dump($tmp = mysql_real_escape_string("foo" . chr(0) . "bar", $link));
+
+assert($tmp === mysql_real_escape_string("foo" . chr(0) . "bar"));
+
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_real_escape_string.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_real_escape_string.php.expectf
new file mode 100644
index 000000000..74500f8a5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_real_escape_string.php.expectf
@@ -0,0 +1,8 @@
+%unicode|string%(31) "Am I a unicode string in PHP 6?"
+%unicode|string%(2) "\\"
+%unicode|string%(2) "\""
+%unicode|string%(2) "\'"
+%unicode|string%(2) "\n"
+%unicode|string%(2) "\r"
+%unicode|string%(8) "foo\0bar"
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_result.php b/hphp/test/zend/bad/ext-mysql/mysql_result.php
new file mode 100644
index 000000000..ccc3bac69
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_result.php
@@ -0,0 +1,56 @@
+<?php
+require_once("connect.inc");
+
+$tmp    = NULL;
+$link   = NULL;
+
+// string mysql_result ( resource result, int row [, mixed field] )
+
+if (!is_null($tmp = @mysql_result()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!is_null($tmp = @mysql_result($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require_once('table.inc');
+if (!$res = mysql_query("SELECT id, label, id AS _id, CONCAT(label, 'a') _label, NULL as _foo FROM test _test ORDER BY id ASC LIMIT 1", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+var_dump(mysql_result($res, -1));
+var_dump(mysql_result($res, 2));
+
+var_dump(mysql_result($res, 0, -1));
+var_dump(mysql_result($res, 0, 500));
+
+print "valid fields\n";
+var_dump(mysql_result($res, 0));
+var_dump(mysql_result($res, 0, 1));
+
+var_dump(mysql_result($res, 0, 'id'));
+var_dump(mysql_result($res, 0, '_test.id'));
+var_dump(mysql_result($res, 0, 'label'));
+var_dump(mysql_result($res, 0, '_test.label'));
+print "some invalid fields\n";
+var_dump(mysql_result($res, 0, 'unknown'));
+var_dump(mysql_result($res, 0, '_test.'));
+var_dump(mysql_result($res, 0, chr(0)));
+var_dump(mysql_result($res, 0, '_test.' . chr(0)));
+print "_id\n";
+var_dump(mysql_result($res, 0, '_id'));
+print "_label\n";
+var_dump(mysql_result($res, 0, '_label'));
+print "_foo\n";
+var_dump(mysql_result($res, 0, '_foo'));
+var_dump(mysql_result($res, 0, 'test.id'));
+var_dump(mysql_result($res, 0, 'test.label'));
+
+mysql_free_result($res);
+
+var_dump(mysql_result($res, 0));
+
+mysql_close($link);
+print "done!";
+?><?php
+require_once("clean_table.inc");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_result.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_result.php.expectf
new file mode 100644
index 000000000..bb22d1601
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_result.php.expectf
@@ -0,0 +1,37 @@
+HipHop Warning: %a
+bool(false)
+HipHop Warning: %a
+bool(false)
+HipHop Warning: %a
+bool(false)
+HipHop Warning: %a
+bool(false)
+valid fields
+%unicode|string%(1) "1"
+%unicode|string%(1) "a"
+%unicode|string%(1) "1"
+%unicode|string%(1) "1"
+%unicode|string%(1) "a"
+%unicode|string%(1) "a"
+some invalid fields
+HipHop Warning: %a
+bool(false)
+HipHop Warning: %a
+bool(false)
+HipHop Warning: %a
+bool(false)
+HipHop Warning: %a
+bool(false)
+_id
+%unicode|string%(1) "1"
+_label
+string(2) "aa"
+_foo
+NULL
+HipHop Warning: %a
+bool(false)
+HipHop Warning: %a
+bool(false)
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_select_db.php b/hphp/test/zend/bad/ext-mysql/mysql_select_db.php
new file mode 100644
index 000000000..d713657d5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_select_db.php
@@ -0,0 +1,59 @@
+<?php
+include_once "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (false !== ($tmp = @mysql_select_db($link)))
+	printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+	printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+
+if (!is_null($tmp = @mysql_select_db($db, $link, "foo")))
+	printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+/* does not make too much sense, unless we have access to at least one more database than $db */
+if (!mysql_select_db($db, $link))
+	printf("[004] Cannot select DB %s, [%d] %s\n", $db, mysql_errno($link), mysql_error($link));
+
+if (!$res = mysql_query("SELECT DATABASE() AS dbname", $link))
+	printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!$row = mysql_fetch_assoc($res))
+	printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if ($row['dbname'] !== (string)$db)
+	printf("[007] Expecting database '%s', found '%s'\n", $db, $row['dbname']);
+
+var_dump($row['dbname']);
+
+mysql_free_result($res);
+
+if (mysql_select_db('mysql', $link)) {
+	// Yippie, a second database to play with - that's great because mysql_select_db
+	// ($db) was done by mysql__connect() already and the previous test
+	// was quite useless
+	if (!$res = mysql_query("SELECT DATABASE() AS dbname", $link))
+		printf("[008] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+	if (!$row = mysql_fetch_assoc($res))
+		printf("[009] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+	if (strtolower($row['dbname']) !== 'mysql')
+		printf("[010] Expecting database 'mysql', found '%s'\n", $row['dbname']);
+
+	mysql_free_result($res);
+}
+
+
+var_dump(mysql_select_db('I can not imagine that this database exists', $link));
+
+mysql_close($link);
+
+if (false !== ($tmp = mysql_select_db($db, $link)))
+	printf("[012] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_select_db.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_select_db.php.expectf
new file mode 100644
index 000000000..34c09c10c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_select_db.php.expectf
@@ -0,0 +1,4 @@
+%unicode|string%(%d) "%s"
+bool(false)
+HipHop Warning: %a
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_set_charset.php b/hphp/test/zend/bad/ext-mysql/mysql_set_charset.php
new file mode 100644
index 000000000..160490197
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_set_charset.php
@@ -0,0 +1,44 @@
+<?php
+include_once "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_set_charset()))
+	printf("[001] Expecting NULL got %s/%s\n", $tmp, gettype($tmp));
+
+if (false !== ($tmp = @mysql_set_charset($link)))
+	printf("[002] Expecting boolean/false got %s/%s\n", $tmp, gettype($tmp));
+
+if (false !== ($tmp = @mysql_set_charset(-1)))
+	printf("[003] Expecting boolean/false got %s/%s\n", $tmp, gettype($tmp));
+
+if (!is_null($tmp = @mysql_set_charset('somecharset', $link)))
+	printf("[004] Expecting NULL got %s/%s\n", $tmp, gettype($tmp));
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+	printf("[005] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+
+/* unicode mode should throw a warning */
+$tmp = mysql_set_charset('uFt8', $link);
+
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1))
+	$expect = false;
+else
+	$expect = true;
+
+$charsets = array('latin1', 'latin2');
+foreach ($charsets as $k => $charset) {
+	if (!($res = mysql_query(sprintf('SHOW CHARACTER SET LIKE "%s"', $charset), $link)))
+		continue;
+	mysql_free_result($res);
+	if ($expect !== ($tmp = @mysql_set_charset($charset, $link)))
+		printf("[006] Expecting %s/%s got %s/%s\n",
+			gettype($expect), $expect,
+			gettype($tmp), $tmp);
+}
+
+mysql_close($link);
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_set_charset.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_set_charset.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_set_charset.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_stat.php b/hphp/test/zend/bad/ext-mysql/mysql_stat.php
new file mode 100644
index 000000000..ce9222ae3
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_stat.php
@@ -0,0 +1,37 @@
+<?php
+include_once "connect.inc";
+
+$dbname = 'test';
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_stat($link)))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (!is_null($tmp = @mysql_stat($link, "foo")))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if ((!is_string($stat = mysql_stat($link))) || ('' === $stat))
+	printf("[003] Expecting non empty string, got %s/'%s', [%d] %s\n",
+		gettype($stat), $stat, mysql_errno($link), mysql_error($link));
+
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($stat)) {
+	printf("[004] Expecting Unicode error message!\n");
+	var_inspect($stat);
+}
+
+if ((!is_string($stat_def = mysql_stat())) || ('' === $stat_def))
+	printf("[003] Expecting non empty string, got %s/'%s', [%d] %s\n",
+		gettype($stat_def), $stat_def, mysql_errno(), mysql_error());
+
+assert(soundex($stat) === soundex($stat_def));
+
+mysql_close($link);
+
+if (false !== ($tmp = mysql_stat($link)))
+	printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_stat.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_stat.php.expectf
new file mode 100644
index 000000000..6305362dc
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_stat.php.expectf
@@ -0,0 +1,2 @@
+HipHop Warning: %a
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_tablename.php b/hphp/test/zend/bad/ext-mysql/mysql_tablename.php
new file mode 100644
index 000000000..3a575b16e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_tablename.php
@@ -0,0 +1,35 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_tablename()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (null !== ($tmp = @mysql_tablename($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+if (NULL !== ($tmp = mysql_tablename($res)))
+	printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_tablename($res, -1)))
+	printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+var_dump(mysql_tablename($res, 0));
+
+if (false !== ($tmp = mysql_tablename($res, 2)))
+	printf("[00%d] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_free_result($res);
+
+var_dump(mysql_tablename($res, 0));
+
+mysql_close($link);
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_tablename.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_tablename.php.expectf
new file mode 100644
index 000000000..3ff00b182
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_tablename.php.expectf
@@ -0,0 +1,7 @@
+HipHop Warning: %a
+HipHop Warning: %a
+%unicode|string%(1) "1"
+HipHop Warning: %a
+HipHop Warning: %a
+bool(false)
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_thread_id.php b/hphp/test/zend/bad/ext-mysql/mysql_thread_id.php
new file mode 100644
index 000000000..3b1925e2c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_thread_id.php
@@ -0,0 +1,28 @@
+<?php
+include_once "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_thread_id($link)))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (!is_int($id = mysql_thread_id($link)) || (0 === $id))
+	printf("[002] Expecting int/any but zero, got %s/%s. [%d] %s\n",
+		gettype($id), $id, mysql_errno($link), mysql_error($link));
+
+if (!is_int($id_def = mysql_thread_id()) || (0 === $id_def))
+	printf("[003] Expecting int/any but zero, got %s/%s. [%d] %s\n",
+		gettype($id_def), $id_def, mysql_errno(), mysql_error());
+
+assert($id === $id_def);
+
+mysql_close($link);
+
+if (false !== ($tmp = mysql_thread_id($link)))
+	printf("[003] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_thread_id.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_thread_id.php.expectf
new file mode 100644
index 000000000..6305362dc
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_thread_id.php.expectf
@@ -0,0 +1,2 @@
+HipHop Warning: %a
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_unbuffered_query.php b/hphp/test/zend/bad/ext-mysql/mysql_unbuffered_query.php
new file mode 100644
index 000000000..8714e228b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_unbuffered_query.php
@@ -0,0 +1,98 @@
+<?php
+include_once("connect.inc");
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (false !== ($tmp = @mysql_unbuffered_query($link)))
+	printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (NULL !== ($tmp = @mysql_unbuffered_query("SELECT 1 AS a", $link, "foo")))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_unbuffered_query('THIS IS NOT SQL', $link)))
+	printf("[003] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_unbuffered_query("SELECT 'this is sql but with backslash g'\g", $link)))
+	printf("[004] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if ((0 === mysql_errno($link)) || ('' == mysql_error($link)))
+	printf("[005] mysql_errno()/mysql_error should return some error\n");
+
+if (!$res = mysql_unbuffered_query("SELECT 'this is sql but with semicolon' AS valid ; ", $link))
+	printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+var_dump(mysql_fetch_assoc($res));
+mysql_free_result($res);
+
+if (false !== ($res = mysql_unbuffered_query("SELECT 'this is sql but with semicolon' AS valid ; SHOW VARIABLES", $link)))
+	printf("[007] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (mysql_unbuffered_query('DROP PROCEDURE IF EXISTS p', $link)) {
+	// let's try to play with stored procedures
+	if (mysql_unbuffered_query('CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;', $link)) {
+		$res = mysql_unbuffered_query('CALL p(@version)', $link);
+		$res = mysql_unbuffered_query('SELECT @version AS p_version', $link);
+		$tmp = mysql_fetch_assoc($res);
+		if (!isset($tmp['p_version']) || ('' == $tmp['p_version'])) {
+			printf("[008] Result seems wrong, dumping\n");
+			var_dump($tmp);
+		}
+		if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['p_version'])) {
+			printf("[009] Expecting unicode string, dumping\n");
+			var_dump($tmp);
+		}
+		mysql_free_result($res);
+	} else {
+		printf("[010] [%d] %s\n", mysql_errno($link), mysql_error($link));
+	}
+
+	mysql_unbuffered_query('DROP FUNCTION IF EXISTS f', $link);
+	if (mysql_unbuffered_query('CREATE FUNCTION f( ver_param VARCHAR(25)) RETURNS VARCHAR(25) DETERMINISTIC RETURN ver_param;', $link)) {
+		$res = mysql_unbuffered_query('SELECT f(VERSION()) AS f_version', $link);
+		$tmp = mysql_fetch_assoc($res);
+		if (!isset($tmp['f_version']) || ('' == $tmp['f_version'])) {
+			printf("[011] Result seems wrong, dumping\n");
+			var_dump($tmp);
+		}
+		if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['f_version'])) {
+			printf("[012] Expecting unicode string, dumping\n");
+			var_dump($tmp);
+		}
+		mysql_free_result($res);
+	} else {
+		printf("[012] [%d] %s\n", mysql_errno($link), mysql_error($link));
+	}
+}
+
+var_dump(mysql_unbuffered_query('INSERT INTO test(id) VALUES (100)', $link));
+var_dump($res = mysql_unbuffered_query('SELECT id FROM test', $link));
+var_dump(mysql_num_rows($res));
+
+mysql_close($link);
+
+if (false !== ($tmp = mysql_unbuffered_query("SELECT id FROM test", $link)))
+	printf("[010] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
+?><?php
+require_once('connect.inc');
+
+// connect + select_db
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) {
+	printf("[clean] Cannot connect to the server using host=%s/%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+ 	  $host, $myhost, $user, $db, $port, $socket);
+}
+
+if (!mysql_query('DROP TABLE IF EXISTS test', $link)) {
+	printf("[clean] Failed to drop test table: [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+/* MySQL server may not support this - ignore errors */
+@mysql_query('DROP PROCEDURE IF EXISTS p', $link);
+@mysql_query('DROP FUNCTION IF EXISTS f', $link);
+
+mysql_close($link);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mysql/mysql_unbuffered_query.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_unbuffered_query.php.expectf
new file mode 100644
index 000000000..6b8e7ddb9
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mysql/mysql_unbuffered_query.php.expectf
@@ -0,0 +1,10 @@
+array(1) {
+  [%u|b%"valid"]=>
+  %unicode|string%(30) "this is sql but with semicolon"
+}
+bool(true)
+resource(%d) of type (mysql result)
+int(0)
+HipHop Notice: %a
+HipHop Warning: %a
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mysql/connect.inc b/hphp/test/zend/good/ext-mysql/connect.inc
new file mode 100644
index 000000000..0df5bc3aa
--- /dev/null
+++ b/hphp/test/zend/good/ext-mysql/connect.inc
@@ -0,0 +1,82 @@
+<?php
+if (!function_exists('sys_get_temp_dir')) {
+	function sys_get_temp_dir() {
+
+		if (!empty($_ENV['TMP']))
+			return realpath( $_ENV['TMP'] );
+		if (!empty($_ENV['TMPDIR']))
+			return realpath( $_ENV['TMPDIR'] );
+		if (!empty($_ENV['TEMP']))
+			return realpath( $_ENV['TEMP'] );
+
+		$temp_file = tempnam(md5(uniqid(rand(), TRUE)), '');
+		if ($temp_file) {
+                	$temp_dir = realpath(dirname($temp_file));
+			unlink($temp_file);
+			return $temp_dir;
+		}
+		return FALSE;
+	}
+}
+
+if (!function_exists('my_mysql_connect')) {
+	/* wrapper to simplify test porting */
+	function my_mysql_connect($host, $user, $passwd, $db, $port, $socket, $flags = NULL, $persistent = false) {
+		global $connect_flags;
+
+		$flags = ($flags === NULL) ? $connect_flags : $flags;
+
+		if ($socket)
+			$host = sprintf("%s:%s", $host, $socket);
+		else if ($port)
+			$host = sprintf("%s:%s", $host, $port);
+
+		if ($persistent) {
+			$link = mysql_pconnect($host, $user, $passwd, $flags);
+		} else {
+			 $link = mysql_connect($host, $user, $passwd, true, $flags);
+		}
+
+		if (!$link) {
+			printf("[000-a] Cannot connect using host '%s', user '%s', password '****', persistent = %d, [%d] %s\n",
+				$host, $user, ($persistent) ? 1 : 0,
+				mysql_errno(), mysql_error());
+			return false;
+		}
+
+		if (!mysql_select_db($db, $link)) {
+			printf("[000-b] [%d] %s\n", mysql_errno($link), mysql_error($link));
+			return false;
+		}
+
+		return $link;
+	}
+} else {
+	printf("skip Eeeek/BUG/FIXME - connect.inc included twice! skipif bug?\n");
+}
+
+/*
+Default values are "localhost", "root", database "test" and empty password.
+Change the MYSQL_TEST_* environment values if you want to use another configuration.
+*/
+
+$host		= getenv("MYSQL_TEST_HOST")	? getenv("MYSQL_TEST_HOST")	: "localhost";
+$port		= getenv("MYSQL_TEST_PORT")	? getenv("MYSQL_TEST_PORT")	: 3306;
+$user		= getenv("MYSQL_TEST_USER")	? getenv("MYSQL_TEST_USER")	: "root";
+$passwd	= getenv("MYSQL_TEST_PASSWD")	? getenv("MYSQL_TEST_PASSWD")	: "";
+
+$db			= getenv("MYSQL_TEST_DB")	? getenv("MYSQL_TEST_DB")	: "test";
+$engine	= getenv("MYSQL_TEST_ENGINE")	? getenv("MYSQL_TEST_ENGINE")	: "MyISAM";
+$socket	= getenv("MYSQL_TEST_SOCKET")	? getenv("MYSQL_TEST_SOCKET")	: null;
+$skip_on_connect_failure  = getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") ? getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") : true;
+$connect_flags = getenv("MYSQL_TEST_CONNECT_FLAGS") ? (int)getenv("MYSQL_TEST_CONNECT_FLAGS") : 0;
+if ($socket) {
+	ini_set('mysql.default_socket', $socket);
+}
+/* Development setting: test experimal features and/or feature requests that never worked before? */
+$TEST_EXPERIMENTAL = (in_array(getenv("MYSQL_TEST_EXPERIMENTAL"), array(0, 1))) ?
+	((1 == getenv("MYSQL_TEST_EXPERIMENTAL")) ? true : false) :
+	false;
+
+$IS_MYSQLND = stristr(mysql_get_client_info(), "mysqlnd");
+?>
diff --git a/hphp/test/zend/good/ext-mysql/mysql_escape_string.php b/hphp/test/zend/good/ext-mysql/mysql_escape_string.php
new file mode 100644
index 000000000..7580e9eb8
--- /dev/null
+++ b/hphp/test/zend/good/ext-mysql/mysql_escape_string.php
@@ -0,0 +1,19 @@
+<?php
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (NULL !== ($tmp = @mysql_escape_string()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+var_dump(@mysql_escape_string("Am I a unicode string in PHP 6?"));
+var_dump(@mysql_escape_string('\\'));
+var_dump(@mysql_escape_string('"'));
+var_dump(@mysql_escape_string("'"));
+var_dump(@mysql_escape_string("\n"));
+var_dump(@mysql_escape_string("\r"));
+var_dump(@mysql_escape_string("foo" . chr(0) . "bar"));
+
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mysql/mysql_escape_string.php.expectf b/hphp/test/zend/good/ext-mysql/mysql_escape_string.php.expectf
new file mode 100644
index 000000000..74500f8a5
--- /dev/null
+++ b/hphp/test/zend/good/ext-mysql/mysql_escape_string.php.expectf
@@ -0,0 +1,8 @@
+%unicode|string%(31) "Am I a unicode string in PHP 6?"
+%unicode|string%(2) "\\"
+%unicode|string%(2) "\""
+%unicode|string%(2) "\'"
+%unicode|string%(2) "\n"
+%unicode|string%(2) "\r"
+%unicode|string%(8) "foo\0bar"
+done!
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mysql/mysql_get_client_info.php b/hphp/test/zend/good/ext-mysql/mysql_get_client_info.php
new file mode 100644
index 000000000..21ba526a0
--- /dev/null
+++ b/hphp/test/zend/good/ext-mysql/mysql_get_client_info.php
@@ -0,0 +1,16 @@
+<?php
+include "connect.inc";
+if (!is_string($info = mysql_get_client_info()) || ('' === $info))
+	printf("[001] Expecting string/any_non_empty, got %s/%s\n", gettype($info), $info);
+
+if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($info)) {
+	printf("[002] Expecting Unicode!\n");
+	var_inspect($info);
+}
+
+if (!is_null($tmp = @mysql_get_client_info("too many arguments"))) {
+	printf("[003] Expecting NULL/NULL got %s/%s\n", $tmp, gettype($tmp));
+}
+
+print "done!";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mysql/mysql_get_client_info.php.expectf b/hphp/test/zend/good/ext-mysql/mysql_get_client_info.php.expectf
new file mode 100644
index 000000000..dd55c26f1
--- /dev/null
+++ b/hphp/test/zend/good/ext-mysql/mysql_get_client_info.php.expectf
@@ -0,0 +1 @@
+done!
\ No newline at end of file
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index 23ab06d91..808172814 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -78,7 +78,6 @@ no_import = (
     '/ext/xmlwriter/examples/',
 
     # not imported yet, but will be
-    '/ext/mysql',
     '/ext/pdo_mysql',
     '/ext/pdo_sqlite',
     '/ext/spl',
@@ -202,6 +201,7 @@ other_files = (
     '/ext-ldap/connect.inc',
     '/ext-mbstring/common.inc',
     '/ext-mcrypt/vectors.txt',
+    '/ext-mysql/connect.inc',
     '/ext-openssl/005_crt.txt',
     '/ext-openssl/bug37820cert.pem',
     '/ext-openssl/bug37820key.pem',