MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:ahristov Date:January 24 2008 1:56pm
Subject:PHP mysqlnd svn commit: r1212 - in branches/experimental: mysqlnd php5/ext/mysql php5/ext/mysqli php6/ext/mysql php6/ext/mysqli
View as plain text  
Author: ahristov
Date: 2008-01-24 14:56:41 +0100 (Thu, 24 Jan 2008)
New Revision: 1212

Modified:
   branches/experimental/mysqlnd/config.w32
   branches/experimental/mysqlnd/mysqlnd.c
   branches/experimental/mysqlnd/mysqlnd.h
   branches/experimental/mysqlnd/mysqlnd_charset.c
   branches/experimental/mysqlnd/mysqlnd_charset.h
   branches/experimental/mysqlnd/mysqlnd_debug.c
   branches/experimental/mysqlnd/mysqlnd_debug.h
   branches/experimental/mysqlnd/mysqlnd_enum_n_def.h
   branches/experimental/mysqlnd/mysqlnd_libmysql_compat.h
   branches/experimental/mysqlnd/mysqlnd_loaddata.c
   branches/experimental/mysqlnd/mysqlnd_palloc.c
   branches/experimental/mysqlnd/mysqlnd_palloc.h
   branches/experimental/mysqlnd/mysqlnd_portability.h
   branches/experimental/mysqlnd/mysqlnd_priv.h
   branches/experimental/mysqlnd/mysqlnd_ps.c
   branches/experimental/mysqlnd/mysqlnd_ps_codec.c
   branches/experimental/mysqlnd/mysqlnd_qcache.c
   branches/experimental/mysqlnd/mysqlnd_result.c
   branches/experimental/mysqlnd/mysqlnd_result.h
   branches/experimental/mysqlnd/mysqlnd_result_meta.c
   branches/experimental/mysqlnd/mysqlnd_result_meta.h
   branches/experimental/mysqlnd/mysqlnd_statistics.c
   branches/experimental/mysqlnd/mysqlnd_statistics.h
   branches/experimental/mysqlnd/mysqlnd_structs.h
   branches/experimental/mysqlnd/mysqlnd_wireprotocol.c
   branches/experimental/mysqlnd/mysqlnd_wireprotocol.h
   branches/experimental/mysqlnd/php_mysqlnd.h
   branches/experimental/php5/ext/mysql/config.w32
   branches/experimental/php5/ext/mysql/mysql_mysqlnd.h
   branches/experimental/php5/ext/mysql/php_mysql.c
   branches/experimental/php5/ext/mysql/php_mysql.h
   branches/experimental/php5/ext/mysql/php_mysql_structs.h
   branches/experimental/php5/ext/mysqli/config.m4
   branches/experimental/php5/ext/mysqli/config.w32
   branches/experimental/php5/ext/mysqli/mysqli.c
   branches/experimental/php5/ext/mysqli/mysqli_api.c
   branches/experimental/php5/ext/mysqli/mysqli_driver.c
   branches/experimental/php5/ext/mysqli/mysqli_embedded.c
   branches/experimental/php5/ext/mysqli/mysqli_exception.c
   branches/experimental/php5/ext/mysqli/mysqli_fe.c
   branches/experimental/php5/ext/mysqli/mysqli_mysqlnd.h
   branches/experimental/php5/ext/mysqli/mysqli_nonapi.c
   branches/experimental/php5/ext/mysqli/mysqli_prop.c
   branches/experimental/php5/ext/mysqli/mysqli_report.c
   branches/experimental/php5/ext/mysqli/mysqli_report.h
   branches/experimental/php5/ext/mysqli/mysqli_warning.c
   branches/experimental/php5/ext/mysqli/php_mysqli.h
   branches/experimental/php5/ext/mysqli/php_mysqli_structs.h
   branches/experimental/php6/ext/mysql/config.w32
   branches/experimental/php6/ext/mysql/mysql_mysqlnd.h
   branches/experimental/php6/ext/mysql/php_mysql.c
   branches/experimental/php6/ext/mysql/php_mysql.h
   branches/experimental/php6/ext/mysql/php_mysql_structs.h
   branches/experimental/php6/ext/mysqli/config.m4
   branches/experimental/php6/ext/mysqli/config.w32
   branches/experimental/php6/ext/mysqli/mysqli.c
   branches/experimental/php6/ext/mysqli/mysqli_api.c
   branches/experimental/php6/ext/mysqli/mysqli_driver.c
   branches/experimental/php6/ext/mysqli/mysqli_embedded.c
   branches/experimental/php6/ext/mysqli/mysqli_exception.c
   branches/experimental/php6/ext/mysqli/mysqli_fe.c
   branches/experimental/php6/ext/mysqli/mysqli_mysqlnd.h
   branches/experimental/php6/ext/mysqli/mysqli_nonapi.c
   branches/experimental/php6/ext/mysqli/mysqli_prop.c
   branches/experimental/php6/ext/mysqli/mysqli_report.c
   branches/experimental/php6/ext/mysqli/mysqli_report.h
   branches/experimental/php6/ext/mysqli/mysqli_warning.c
   branches/experimental/php6/ext/mysqli/php_mysqli.h
   branches/experimental/php6/ext/mysqli/php_mysqli_structs.h
Log:
Merge changes from trunk/


Modified: branches/experimental/mysqlnd/config.w32
===================================================================
--- branches/experimental/mysqlnd/config.w32	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/config.w32	2008-01-24 13:56:41 UTC (rev 1212)
@@ -1,6 +1,9 @@
-// $Id: config.w32,v 1.4.2.2 2007/10/05 21:23:56 andrey Exp $
+// $Id: config.w32,v 1.6 2007/11/02 17:37:41 stas Exp $
 // vim:ft=javascript
 
+ARG_WITH("mysqlnd", "MySQL-nd support", "no");
+
+if (PHP_MYSQLND != "no") {
 mysqld_source = "";
 if (CHECK_LIB("ws2_32.lib", "mysqlnd")) {
 	mysqlnd_source = 
@@ -18,3 +21,4 @@
 		"mysqlnd_wireprotocol.c";
 	EXTENSION("mysqlnd", mysqlnd_source, false);
 }
+}
\ No newline at end of file

Modified: branches/experimental/mysqlnd/mysqlnd.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd.c,v 1.5.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.10 2008/01/08 13:13:39 andrey Exp $ */
 #include "php.h"
 #include "mysqlnd.h"
 #include "mysqlnd_wireprotocol.h"
@@ -1559,7 +1559,7 @@
 
 
 /* {{{ mysqlnd_conn::insert_id */
-static mynd_ulonglong
+static uint64
 MYSQLND_METHOD(mysqlnd_conn, insert_id)(const MYSQLND * const conn)
 {
 	return conn->upsert_status.last_insert_id;
@@ -1568,7 +1568,7 @@
 
 
 /* {{{ mysqlnd_conn::affected_rows */
-static mynd_ulonglong
+static uint64
 MYSQLND_METHOD(mysqlnd_conn, affected_rows)(const MYSQLND * const conn)
 {
 	return conn->upsert_status.affected_rows;
@@ -1647,7 +1647,7 @@
 
 
 /* {{{ mysqlnd_conn::thread_id */
-static mynd_ulonglong
+static uint64
 MYSQLND_METHOD(mysqlnd_conn, thread_id)(const MYSQLND * const conn)
 {
 	return conn->thread_id;
@@ -1701,7 +1701,7 @@
 	}
 
 	SET_EMPTY_ERROR(conn->error_info);
-	conn->upsert_status.affected_rows= ~(mynd_ulonglong) 0;
+	SET_ERROR_AFF_ROWS(conn);
 	/*
 	  We are sure that there is a result set, since conn->state is set accordingly
 	  in mysqlnd_store_result() or mysqlnd_fetch_row_unbuffered()

Modified: branches/experimental/mysqlnd/mysqlnd.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd.h,v 1.3.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd.h,v 1.6 2008/01/08 13:13:39 andrey Exp $ */
 
 #ifndef MYSQLND_H
 #define MYSQLND_H
@@ -30,7 +30,7 @@
 #define MYSQLND_USE_OPTIMISATIONS 0
 
 
-//#define MYSQLND_THREADING
+#define MYSQLND_THREADING
 
 /* #define MYSQLND_STRING_TO_INT_CONVERSION */
 /*

Modified: branches/experimental/mysqlnd/mysqlnd_charset.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_charset.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_charset.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -295,136 +295,136 @@
 /* {{{ mysqlnd_charsets */
 const MYSQLND_CHARSET mysqlnd_charsets[] =
 {
-	{   1, "big5","big5_chinese_ci", 1, 2, 0, mysqlnd_mbcharlen_big5, check_mb_big5},
-	{   3, "dec8", "dec8_swedisch_ci", 1, 1, 0, NULL, NULL},
-	{   4, "cp850", "cp850_general_ci", 1, 1, 0, NULL, NULL},
-	{   6, "hp8", "hp8_english_ci", 1, 1, 0, NULL, NULL},
-	{   7, "koi8r", "koi8r_general_ci", 1, 1, 0, NULL, NULL},
-	{   8, "latin1", "latin1_swedish_ci", 1, 1, 0, NULL, NULL},
-	{   9, "latin2", "latin2_general_ci", 1, 1, 0, NULL, NULL},
-	{  10, "swe7", "swe7_swedish_ci", 1, 1, 0, NULL, NULL},
-	{  11, "ascii", "ascii_general_ci", 1, 1, 0, NULL, NULL},
-	{  12, "ujis", "ujis_japanese_ci", 1, 3, 0, mysqlnd_mbcharlen_ujis, check_mb_ujis},
-	{  13, "sjis", "sjis_japanese_ci", 1, 2, 0, mysqlnd_mbcharlen_sjis, check_mb_sjis},
-	{  16, "hebrew", "hebrew_general_ci", 1, 1, 0, NULL, NULL},
-	{  18, "tis620", "tis620_thai_ci", 1, 1, 0, NULL, NULL},
-	{  19, "euckr", "euckr_korean_ci", 1, 2, 0, mysqlnd_mbcharlen_euckr, check_mb_euckr},
-	{  22, "koi8u", "koi8u_general_ci", 1, 1, 0, NULL, NULL},
-	{  24, "gb2312", "gb2312_chinese_ci", 1, 2, 0, mysqlnd_mbcharlen_gb2312,
check_mb_gb2312},
-	{  25, "greek", "greek_general_ci", 1, 1, 0, NULL, NULL},	
-	{  26, "cp1250", "cp1250_general_ci", 1, 1, 0, NULL, NULL},
-	{  28, "gbk", "gbk_chinese_ci", 1, 2, 0, mysqlnd_mbcharlen_gbk, check_mb_gbk},
-	{  30, "latin5", "latin5_turkish_ci", 1, 1, 0, NULL, NULL},
-	{  32, "armscii8", "armscii8_general_ci", 1, 1, 0, NULL, NULL},
-	{  33, "utf8", "utf8_general_ci", 1, 2, 0, mysqlnd_mbcharlen_utf8, 
check_mb_utf8_valid},
-	{  35, "ucs2", "ucs2_general_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{  36, "cp866", "cp866_general_ci", 1, 1, 0, NULL, NULL},
-	{  37, "keybcs2", "keybcs2_general_ci", 1, 1, 0, NULL, NULL},
-	{  38, "macce", "macce_general_ci", 1, 1, 0, NULL, NULL},
-	{  39, "macroman", "macroman_general_ci", 1, 1, 0, NULL, NULL},
-	{  40, "cp852", "cp852_general_ci", 1, 1, 0, NULL, NULL},
-	{  41, "latin7", "latin7_general_ci", 1, 1, 0, NULL, NULL},
-	{  51, "cp1251", "cp1251_general_ci", 1, 1, 0, NULL, NULL},
-	{  57, "cp1256", "cp1256_general_ci", 1, 1, 0, NULL, NULL},
-	{  59, "cp1257", "cp1257_general_ci", 1, 1, 0, NULL, NULL},
-	{  63, "binary", "binary", 1, 1, 0, NULL, NULL},
-	{  92, "geostd8", "geostd8_general_ci", 1, 1, 0, NULL, NULL},
-	{  95, "cp932", "cp932_japanese_ci", 1, 2, 1, mysqlnd_mbcharlen_cp932, check_mb_cp932},
-	{  97, "eucjpms", "eucjpms_japanese_ci", 1, 3, 0, mysqlnd_mbcharlen_eucjpms,
check_mb_eucjpms},
-	{   2, "latin2", "latin2_czech_cs", 1, 1, 0, NULL, NULL},
-	{   5, "latin1", "latin1_german_ci", 1, 1, 0, NULL, NULL},
-	{  14, "cp1251", "cp1251_bulgarian_ci", 1, 1, 0, NULL, NULL},
-	{  15, "latin1", "latin1_danish_ci", 1, 1, 0, NULL, NULL},
-	{  17, "filename", "filename", 1, 5, 1, NULL, NULL},
-	{  20, "latin7", "latin7_estonian_cs", 1, 1, 0, NULL, NULL},
-	{  21, "latin2", "latin2_hungarian_ci", 1, 1, 0, NULL, NULL},
-	{  23, "cp1251", "cp1251_ukrainian_ci", 1, 1, 0, NULL, NULL},
-	{  27, "latin2", "latin2_croatian_ci", 1, 1, 0, NULL, NULL},
-	{  29, "cp1257", "cp1257_lithunian_ci", 1, 1, 0, NULL, NULL},
-	{  31, "latin1", "latin1_german2_ci", 1, 1, 0, NULL, NULL},
-	{  34, "cp1250", "cp1250_czech_cs", 1, 1, 0, NULL, NULL},
-	{  42, "latin7", "latin7_general_cs", 1, 1, 0, NULL, NULL},
-	{  43, "macce", "macce_bin", 1, 1, 0, NULL, NULL},
-	{  44, "cp1250", "cp1250_croatian_ci", 1, 1, 0, NULL, NULL},
-	{  47, "latin1", "latin1_bin", 1, 1, 0, NULL, NULL},
-	{  48, "latin1", "latin1_general_ci", 1, 1, 0, NULL, NULL},
-	{  49, "latin1", "latin1_general_cs", 1, 1, 0, NULL, NULL},
-	{  50, "cp1251", "cp1251_bin", 1, 1, 0, NULL, NULL},
-	{  52, "cp1251", "cp1251_general_cs", 1, 1, 0, NULL, NULL},
-	{  53, "macroman", "macroman_bin", 1, 1, 0, NULL, NULL},
-	{  58, "cp1257", "cp1257_bin", 1, 1, 0, NULL, NULL},
-	{  60, "armascii8", "armascii8_bin", 1, 1, 0, NULL, NULL},
-	{  65, "ascii", "ascii_bin", 1, 1, 0, NULL, NULL},
-	{  66, "cp1250", "cp1250_bin", 1, 1, 0, NULL, NULL},
-	{  67, "cp1256", "cp1256_bin", 1, 1, 0, NULL, NULL},
-	{  68, "cp866", "cp866_bin", 1, 1, 0, NULL, NULL},
-	{  69, "dec8", "dec8_bin", 1, 1, 0, NULL, NULL},
-	{  70, "greek", "greek_bin", 1, 1, 0, NULL, NULL},
-	{  71, "hebew", "hebrew_bin", 1, 1, 0, NULL, NULL},
-	{  72, "hp8", "hp8_bin", 1, 1, 0, NULL, NULL},
-	{  73, "keybcs2", "keybcs2_bin", 1, 1, 0, NULL, NULL},
-	{  74, "koi8r", "koi8r_bin", 1, 1, 0, NULL, NULL},
-	{  75, "koi8u", "koi8u_bin", 1, 1, 0, NULL, NULL},
-	{  77, "latin2", "latin2_bin", 1, 1, 0, NULL, NULL},
-	{  78, "latin5", "latin5_bin", 1, 1, 0, NULL, NULL},
-	{  79, "latin7", "latin7_bin", 1, 1, 0, NULL, NULL},
-	{  80, "cp850", "cp850_bin", 1, 1, 0, NULL, NULL},
-	{  81, "cp852", "cp852_bin", 1, 1, 0, NULL, NULL},
-	{  82, "swe7", "swe7_bin", 1, 1, 0, NULL, NULL},
-	{  93, "geostd8", "geostd8_bin", 1, 1, 0, NULL, NULL},
-	{  83, "utf8", "utf8_bin", 1, 2, 0, mysqlnd_mbcharlen_utf8,  check_mb_utf8_valid},
-	{  84, "big5", "big5_bin", 1, 2, 0, mysqlnd_mbcharlen_big5, check_mb_big5},
-	{  85, "euckr", "euckr_bin", 1, 2, 0, mysqlnd_mbcharlen_euckr, check_mb_euckr},
-	{  86, "gb2312", "gb2312_bin", 1, 2, 0, mysqlnd_mbcharlen_gb2312, check_mb_gb2312},
-	{  87, "gbk", "gbk_bin", 1, 2, 0, mysqlnd_mbcharlen_gbk, check_mb_gbk},
-	{  88, "sjis", "sjis_bin", 1, 2, 0, mysqlnd_mbcharlen_sjis, check_mb_sjis},
-	{  89, "tis620", "tis620_bin", 1, 1, 0, NULL, NULL},
-	{  90, "ucs2", "ucs2_bin", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{  91, "ujis", "ujis_bin", 1, 3, 0, mysqlnd_mbcharlen_ujis, check_mb_ujis},
-	{  94, "latin1", "latin1_spanish_ci", 1, 1, 0, NULL, NULL},
-	{  96, "cp932", "cp932_bin", 1, 2, 1, mysqlnd_mbcharlen_cp932, check_mb_cp932},
-	{  99, "cp1250", "cp1250_polish_ci", 1, 1, 0, NULL, NULL},
-	{  98, "eucjpms", "eucjpms_bin", 1, 3, 0, mysqlnd_mbcharlen_eucjpms, check_mb_eucjpms},
-	{ 128, "ucs2", "ucs2_unicode_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 129, "ucs2", "ucs2_icelandic_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 130, "ucs2", "ucs2_latvian_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 131, "ucs2", "ucs2_romanian_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 132, "ucs2", "ucs2_slovenian_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 133, "ucs2", "ucs2_polish_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 134, "ucs2", "ucs2_estonian_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 135, "ucs2", "ucs2_spanish_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 136, "ucs2", "ucs2_swedish_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 137, "ucs2", "ucs2_turkish_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 138, "ucs2", "ucs2_czech_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 139, "ucs2", "ucs2_danish_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 140, "ucs2", "ucs2_lithunian_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 141, "ucs2", "ucs2_slovak_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 142, "ucs2", "ucs2_spanish2_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 143, "ucs2", "ucs2_roman_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 144, "ucs2", "ucs2_persian_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 145, "ucs2", "ucs2_esperanto_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 146, "ucs2", "ucs2_hungarian_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
-	{ 192, "utf8", "utf8_general_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
-	{ 193, "utf8", "utf8_icelandic_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8,
check_mb_utf8_valid},
-	{ 194, "utf8", "utf8_latvian_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8, 
check_mb_utf8_valid},
-	{ 195, "utf8", "utf8_romanian_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8,
check_mb_utf8_valid},
-	{ 196, "utf8", "utf8_slovenian_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8,
check_mb_utf8_valid},
-	{ 197, "utf8", "utf8_polish_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
-	{ 198, "utf8", "utf8_estonian_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8,
check_mb_utf8_valid},
-	{ 119, "utf8", "utf8_spanish_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
-	{ 200, "utf8", "utf8_swedish_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
-	{ 201, "utf8", "utf8_turkish_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
-	{ 202, "utf8", "utf8_czech_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
-	{ 203, "utf8", "utf8_danish_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid },
-	{ 204, "utf8", "utf8_lithunian_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid
},
-	{ 205, "utf8", "utf8_slovak_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
-	{ 206, "utf8", "utf8_spanish2_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8,
check_mb_utf8_valid},
-	{ 207, "utf8", "utf8_roman_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
-	{ 208, "utf8", "utf8_persian_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
-	{ 209, "utf8", "utf8_esperanto_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8,
check_mb_utf8_valid},
-	{ 210, "utf8", "utf8_hungarian_ci", 1, 3, 0, mysqlnd_mbcharlen_utf8,
check_mb_utf8_valid},
-	{ 254, "utf8", "utf8_general_cs", 1, 2, 0, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid
},
-	{   0, NULL, NULL, 0, 0, 0, NULL, NULL}
+	{   1, "big5","big5_chinese_ci", 1, 2, mysqlnd_mbcharlen_big5, check_mb_big5},
+	{   3, "dec8", "dec8_swedisch_ci", 1, 1, NULL, NULL},
+	{   4, "cp850", "cp850_general_ci", 1, 1, NULL, NULL},
+	{   6, "hp8", "hp8_english_ci", 1, 1, NULL, NULL},
+	{   7, "koi8r", "koi8r_general_ci", 1, 1, NULL, NULL},
+	{   8, "latin1", "latin1_swedish_ci", 1, 1, NULL, NULL},
+	{   9, "latin2", "latin2_general_ci", 1, 1, NULL, NULL},
+	{  10, "swe7", "swe7_swedish_ci", 1, 1, NULL, NULL},
+	{  11, "ascii", "ascii_general_ci", 1, 1, NULL, NULL},
+	{  12, "ujis", "ujis_japanese_ci", 1, 3, mysqlnd_mbcharlen_ujis, check_mb_ujis},
+	{  13, "sjis", "sjis_japanese_ci", 1, 2, mysqlnd_mbcharlen_sjis, check_mb_sjis},
+	{  16, "hebrew", "hebrew_general_ci", 1, 1, NULL, NULL},
+	{  18, "tis620", "tis620_thai_ci", 1, 1, NULL, NULL},
+	{  19, "euckr", "euckr_korean_ci", 1, 2, mysqlnd_mbcharlen_euckr, check_mb_euckr},
+	{  22, "koi8u", "koi8u_general_ci", 1, 1, NULL, NULL},
+	{  24, "gb2312", "gb2312_chinese_ci", 1, 2, mysqlnd_mbcharlen_gb2312, check_mb_gb2312},
+	{  25, "greek", "greek_general_ci", 1, 1, NULL, NULL},	
+	{  26, "cp1250", "cp1250_general_ci", 1, 1, NULL, NULL},
+	{  28, "gbk", "gbk_chinese_ci", 1, 2, mysqlnd_mbcharlen_gbk, check_mb_gbk},
+	{  30, "latin5", "latin5_turkish_ci", 1, 1, NULL, NULL},
+	{  32, "armscii8", "armscii8_general_ci", 1, 1, NULL, NULL},
+	{  33, "utf8", "utf8_general_ci", 1, 2, mysqlnd_mbcharlen_utf8,  check_mb_utf8_valid},
+	{  35, "ucs2", "ucs2_general_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{  36, "cp866", "cp866_general_ci", 1, 1, NULL, NULL},
+	{  37, "keybcs2", "keybcs2_general_ci", 1, 1, NULL, NULL},
+	{  38, "macce", "macce_general_ci", 1, 1, NULL, NULL},
+	{  39, "macroman", "macroman_general_ci", 1, 1, NULL, NULL},
+	{  40, "cp852", "cp852_general_ci", 1, 1, NULL, NULL},
+	{  41, "latin7", "latin7_general_ci", 1, 1, NULL, NULL},
+	{  51, "cp1251", "cp1251_general_ci", 1, 1, NULL, NULL},
+	{  57, "cp1256", "cp1256_general_ci", 1, 1, NULL, NULL},
+	{  59, "cp1257", "cp1257_general_ci", 1, 1, NULL, NULL},
+	{  63, "binary", "binary", 1, 1, NULL, NULL},
+	{  92, "geostd8", "geostd8_general_ci", 1, 1, NULL, NULL},
+	{  95, "cp932", "cp932_japanese_ci", 1, 2, mysqlnd_mbcharlen_cp932, check_mb_cp932},
+	{  97, "eucjpms", "eucjpms_japanese_ci", 1, 3, mysqlnd_mbcharlen_eucjpms,
check_mb_eucjpms},
+	{   2, "latin2", "latin2_czech_cs", 1, 1, NULL, NULL},
+	{   5, "latin1", "latin1_german_ci", 1, 1, NULL, NULL},
+	{  14, "cp1251", "cp1251_bulgarian_ci", 1, 1, NULL, NULL},
+	{  15, "latin1", "latin1_danish_ci", 1, 1, NULL, NULL},
+	{  17, "filename", "filename", 1, 5, NULL, NULL},
+	{  20, "latin7", "latin7_estonian_cs", 1, 1, NULL, NULL},
+	{  21, "latin2", "latin2_hungarian_ci", 1, 1, NULL, NULL},
+	{  23, "cp1251", "cp1251_ukrainian_ci", 1, 1, NULL, NULL},
+	{  27, "latin2", "latin2_croatian_ci", 1, 1, NULL, NULL},
+	{  29, "cp1257", "cp1257_lithunian_ci", 1, 1, NULL, NULL},
+	{  31, "latin1", "latin1_german2_ci", 1, 1, NULL, NULL},
+	{  34, "cp1250", "cp1250_czech_cs", 1, 1, NULL, NULL},
+	{  42, "latin7", "latin7_general_cs", 1, 1, NULL, NULL},
+	{  43, "macce", "macce_bin", 1, 1, NULL, NULL},
+	{  44, "cp1250", "cp1250_croatian_ci", 1, 1, NULL, NULL},
+	{  47, "latin1", "latin1_bin", 1, 1, NULL, NULL},
+	{  48, "latin1", "latin1_general_ci", 1, 1, NULL, NULL},
+	{  49, "latin1", "latin1_general_cs", 1, 1, NULL, NULL},
+	{  50, "cp1251", "cp1251_bin", 1, 1, NULL, NULL},
+	{  52, "cp1251", "cp1251_general_cs", 1, 1, NULL, NULL},
+	{  53, "macroman", "macroman_bin", 1, 1, NULL, NULL},
+	{  58, "cp1257", "cp1257_bin", 1, 1, NULL, NULL},
+	{  60, "armascii8", "armascii8_bin", 1, 1, NULL, NULL},
+	{  65, "ascii", "ascii_bin", 1, 1, NULL, NULL},
+	{  66, "cp1250", "cp1250_bin", 1, 1, NULL, NULL},
+	{  67, "cp1256", "cp1256_bin", 1, 1, NULL, NULL},
+	{  68, "cp866", "cp866_bin", 1, 1, NULL, NULL},
+	{  69, "dec8", "dec8_bin", 1, 1, NULL, NULL},
+	{  70, "greek", "greek_bin", 1, 1, NULL, NULL},
+	{  71, "hebew", "hebrew_bin", 1, 1, NULL, NULL},
+	{  72, "hp8", "hp8_bin", 1, 1, NULL, NULL},
+	{  73, "keybcs2", "keybcs2_bin", 1, 1, NULL, NULL},
+	{  74, "koi8r", "koi8r_bin", 1, 1, NULL, NULL},
+	{  75, "koi8u", "koi8u_bin", 1, 1, NULL, NULL},
+	{  77, "latin2", "latin2_bin", 1, 1, NULL, NULL},
+	{  78, "latin5", "latin5_bin", 1, 1, NULL, NULL},
+	{  79, "latin7", "latin7_bin", 1, 1, NULL, NULL},
+	{  80, "cp850", "cp850_bin", 1, 1, NULL, NULL},
+	{  81, "cp852", "cp852_bin", 1, 1, NULL, NULL},
+	{  82, "swe7", "swe7_bin", 1, 1, NULL, NULL},
+	{  93, "geostd8", "geostd8_bin", 1, 1, NULL, NULL},
+	{  83, "utf8", "utf8_bin", 1, 2, mysqlnd_mbcharlen_utf8,  check_mb_utf8_valid},
+	{  84, "big5", "big5_bin", 1, 2, mysqlnd_mbcharlen_big5, check_mb_big5},
+	{  85, "euckr", "euckr_bin", 1, 2, mysqlnd_mbcharlen_euckr, check_mb_euckr},
+	{  86, "gb2312", "gb2312_bin", 1, 2, mysqlnd_mbcharlen_gb2312, check_mb_gb2312},
+	{  87, "gbk", "gbk_bin", 1, 2, mysqlnd_mbcharlen_gbk, check_mb_gbk},
+	{  88, "sjis", "sjis_bin", 1, 2, mysqlnd_mbcharlen_sjis, check_mb_sjis},
+	{  89, "tis620", "tis620_bin", 1, 1, NULL, NULL},
+	{  90, "ucs2", "ucs2_bin", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{  91, "ujis", "ujis_bin", 1, 3, mysqlnd_mbcharlen_ujis, check_mb_ujis},
+	{  94, "latin1", "latin1_spanish_ci", 1, 1, NULL, NULL},
+	{  96, "cp932", "cp932_bin", 1, 2, mysqlnd_mbcharlen_cp932, check_mb_cp932},
+	{  99, "cp1250", "cp1250_polish_ci", 1, 1, NULL, NULL},
+	{  98, "eucjpms", "eucjpms_bin", 1, 3, mysqlnd_mbcharlen_eucjpms, check_mb_eucjpms},
+	{ 128, "ucs2", "ucs2_unicode_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 129, "ucs2", "ucs2_icelandic_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 130, "ucs2", "ucs2_latvian_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 131, "ucs2", "ucs2_romanian_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 132, "ucs2", "ucs2_slovenian_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 133, "ucs2", "ucs2_polish_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 134, "ucs2", "ucs2_estonian_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 135, "ucs2", "ucs2_spanish_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 136, "ucs2", "ucs2_swedish_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 137, "ucs2", "ucs2_turkish_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 138, "ucs2", "ucs2_czech_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 139, "ucs2", "ucs2_danish_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 140, "ucs2", "ucs2_lithunian_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 141, "ucs2", "ucs2_slovak_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 142, "ucs2", "ucs2_spanish2_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 143, "ucs2", "ucs2_roman_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 144, "ucs2", "ucs2_persian_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 145, "ucs2", "ucs2_esperanto_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 146, "ucs2", "ucs2_hungarian_ci", 2, 2, mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+	{ 192, "utf8", "utf8_general_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 193, "utf8", "utf8_icelandic_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 194, "utf8", "utf8_latvian_ci", 1, 3, mysqlnd_mbcharlen_utf8,  check_mb_utf8_valid},
+	{ 195, "utf8", "utf8_romanian_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 196, "utf8", "utf8_slovenian_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 197, "utf8", "utf8_polish_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 198, "utf8", "utf8_estonian_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 119, "utf8", "utf8_spanish_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 200, "utf8", "utf8_swedish_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 201, "utf8", "utf8_turkish_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 202, "utf8", "utf8_czech_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 203, "utf8", "utf8_danish_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid },
+	{ 204, "utf8", "utf8_lithunian_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid },
+	{ 205, "utf8", "utf8_slovak_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 206, "utf8", "utf8_spanish2_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 207, "utf8", "utf8_roman_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 208, "utf8", "utf8_persian_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 209, "utf8", "utf8_esperanto_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 210, "utf8", "utf8_hungarian_ci", 1, 3, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+	{ 254, "utf8", "utf8_general_cs", 1, 2, mysqlnd_mbcharlen_utf8, check_mb_utf8_valid },
+	{   0, NULL, NULL, 0, 0, NULL, NULL}
 };
 /* }}} */
 

Modified: branches/experimental/mysqlnd/mysqlnd_charset.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_charset.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_charset.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,12 +18,16 @@
   +----------------------------------------------------------------------+
 */
 
+#ifndef MYSQLND_CHARSET_H
+#define MYSQLND_CHARSET_H
+
 PHPAPI ulong mysqlnd_cset_escape_quotes(const MYSQLND_CHARSET * const charset, char
*newstr,
 										const char *escapestr, size_t escapestr_len TSRMLS_DC);
 
 PHPAPI ulong mysqlnd_cset_escape_slashes(const MYSQLND_CHARSET * const cset, char
*newstr,
 										 const char *escapestr, size_t escapestr_len TSRMLS_DC);
 
+#endif /* MYSQLND_CHARSET_H */
 
 /*
  * Local variables:

Modified: branches/experimental/mysqlnd/mysqlnd_debug.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_debug.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_debug.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_debug.c,v 1.1.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_debug.c,v 1.3 2007/12/31 07:12:12 sebastian Exp $ */
 
 #include "php.h"
 #include "mysqlnd.h"

Modified: branches/experimental/mysqlnd/mysqlnd_debug.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_debug.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_debug.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_debug.h,v 1.1.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_debug.h,v 1.4 2007/12/31 07:12:12 sebastian Exp $ */
 
 #ifndef MYSQLND_DEBUG_H
 #define MYSQLND_DEBUG_H

Modified: branches/experimental/mysqlnd/mysqlnd_enum_n_def.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_enum_n_def.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_enum_n_def.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_enum_n_def.h,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_enum_n_def.h,v 1.3 2007/12/31 07:12:12 sebastian Exp $ */
 #ifndef MYSQLND_ENUM_N_DEF_H
 #define MYSQLND_ENUM_N_DEF_H
 

Modified: branches/experimental/mysqlnd/mysqlnd_libmysql_compat.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_libmysql_compat.h	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/mysqlnd/mysqlnd_libmysql_compat.h	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -28,10 +28,10 @@
 #define MYSQL_STMT				MYSQLND_STMT
 #define MYSQL_FIELD				MYSQLND_FIELD
 #define MYSQL_RES				MYSQLND_RES
-#define MYSQL_ROW				MYSQLND_ROW
+#define MYSQL_ROW				MYSQLND_ROW_C
 #define MYSQL					MYSQLND
 #define my_bool					zend_bool
-#define my_ulonglong			mynd_ulonglong
+#define my_ulonglong			uint64
 
 #define MYSQL_VERSION_ID		MYSQLND_VERSION_ID
 #define MYSQL_SERVER_VERSION	MYSQLND_VERSION

Modified: branches/experimental/mysqlnd/mysqlnd_loaddata.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_loaddata.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_loaddata.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |

Modified: branches/experimental/mysqlnd/mysqlnd_palloc.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_palloc.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_palloc.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_palloc.c,v 1.2.2.3 2007/10/07 21:47:36 davidw Exp $ */
+/* $Id: mysqlnd_palloc.c,v 1.5 2007/12/31 07:12:12 sebastian Exp $ */
 #include "php.h"
 #include "mysqlnd.h"
 #include "mysqlnd_priv.h"

Modified: branches/experimental/mysqlnd/mysqlnd_palloc.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_palloc.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_palloc.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_palloc.h,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_palloc.h,v 1.3 2007/12/31 07:12:12 sebastian Exp $ */
 #ifndef MYSQLND_PALLOC_H
 #define MYSQLND_PALLOC_H
 

Modified: branches/experimental/mysqlnd/mysqlnd_portability.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_portability.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_portability.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -69,6 +69,7 @@
 #endif
 #endif
 
+
 #ifndef HAVE_UINT8
 #ifndef HAVE_UINT8_T
 typedef unsigned char uint8;		/* Unsigned integer >= 8    bits */
@@ -97,47 +98,89 @@
 typedef unsigned char uchar;		/* Short for unsigned char */
 #endif
 
-
-#if defined(HAVE_INT32_T) && defined(HAVE_UINT32_T)
+#ifndef HAVE_INT32
+#ifdef HAVE_INT32_T
 typedef int32_t int32;
-typedef uint32_t uint32;
-
 #elif SIZEOF_INT == 4
-
-#ifndef HAVE_INT32
 typedef signed int int32;
+#elif SIZEOF_LONG == 4
+typedef signed long int32;
+#else
+error "Neither int nor long is of 4 bytes width"
 #endif
+#endif /* HAVE_INT32 */
+
+
 #ifndef HAVE_UINT32
+#ifdef HAVE_UINT32_T
+typedef uint32_t uint32;
+#elif SIZEOF_INT == 4
 typedef unsigned int uint32;
+#elif SIZEOF_LONG == 4
+typedef unsigned long uint32;
+#else
+#error "Neither int nor long is of 4 bytes width"
 #endif
+#endif /* HAVE_UINT32 */
 
-#elif SIZEOF_LONG == 4
 
-#ifndef HAVE_INT32
-typedef signed long int32;
+#ifndef HAVE_INT64
+#ifdef HAVE_INT64_T
+typedef int64_t int64;
+#elif SIZEOF_INT == 8
+typedef signed int int64;
+#elif SIZEOF_LONG == 8
+typedef signed long int64;
+#elif SIZEOF_LONG_LONG == 8
+#ifdef PHP_WIN32
+typedef __int64 int64;
+#else
+typedef signed long long int64;
 #endif
-#ifndef HAVE_UINT32
-typedef unsigned long uint32;
+#else
+#error "Neither int nor long nor long long is of 8 bytes width"
 #endif
+#endif /* HAVE_INT64 */
 
+
+#ifndef HAVE_UINT64
+#ifdef HAVE_UINT64_T
+typedef uint64_t uint64;
+#elif SIZEOF_INT == 8
+typedef unsigned int uint64;
+#elif SIZEOF_LONG == 8
+typedef unsigned long uint64;
+#elif SIZEOF_LONG_LONG == 8
+#ifdef PHP_WIN32
+typedef unsigned __int64 uint64;
 #else
-error "Neither int or long is of 4 bytes width"
+typedef unsigned long long uint64;
 #endif
+#else
+#error "Neither int nor long nor long long is of 8 bytes width"
+#endif
+#endif /* HAVE_INT64 */
 
-#if !defined(HAVE_ULONG) && !defined(__USE_MISC) && !defined(ulong)
-typedef unsigned long    ulong;    /* Short for unsigned long */
+
+#ifdef PHP_WIN32
+#define MYSQLND_LLU_SPEC "%I64u"
+#define MYSQLND_LL_SPEC "%I64d"
+#ifndef L64
+#define L64(x) x##i64
 #endif
-#ifndef longlong_defined
-#if defined(HAVE_LONG_LONG) && SIZEOF_LONG != 8
-typedef unsigned long long int ulonglong; /* ulong or unsigned long long */
-typedef long long int longlong;
 #else
-typedef unsigned long    ulonglong;    /* ulong or unsigned long long */
-typedef long  longlong;
+#define MYSQLND_LLU_SPEC "%llu"
+#define MYSQLND_LL_SPEC "%lld"
+#ifndef L64
+#define L64(x) x##LL
 #endif
 #endif
 
 
+typedef int64 longlong;
+typedef uint64 ulonglong;
+
+
 #define int1store(T,A)	do { *((zend_uchar*) (T)) = (A); } while(0)
 #define uint1korr(A)	(*(((uint8*)(A))))
 
@@ -280,28 +323,8 @@
                                (((uint32) ((uchar) (A)[1])) << 8) +\
                                (((uint32) ((uchar) (A)[2])) << 16) +\
                                (((uint32) ((uchar) (A)[3])) << 24))
-#define bit_uint5korr(A)  ((ulonglong)(((uint32) ((uchar) (A)[0])) +\
-                                  (((uint32) ((uchar) (A)[1])) << 8) +\
-                                  (((uint32) ((uchar) (A)[2])) << 16) +\
-                                  (((uint32) ((uchar) (A)[3])) << 24)) +\
-                               (((ulonglong) ((uchar) (A)[4])) << 32))
-/* From Andrey Hristov, based on uint5korr */
-#define bit_uint6korr(A)	((ulonglong)(((uint32) (((uchar*) (A))[5])) +\
-									(((uint32) (((uchar*) (A))[4])) << 8) +\
-									(((uint32) (((uchar*) (A))[3])) << 16) +\
-									(((uint32) (((uchar*) (A))[2])) << 24)) +\
-									(((ulonglong) (((uint32) (((uchar*) (A))[1])) +\
-									(((uint32) (((uchar*) (A))[0]) << 8)))) << 32))
 
-#define bit_uint7korr(A)	((ulonglong)(((uint32) (((uchar*) (A))[6])) +\
-									(((uint32) (((uchar*) (A))[5])) << 8) +\
-									(((uint32) (((uchar*) (A))[4])) << 16) +\
-									(((uint32) (((uchar*) (A))[3])) << 24)) +\
-									(((ulonglong) (((uint32) (((uchar*) (A))[2])) +\
-									(((uint32) (((uchar*) (A))[1])) << 8) +\
-									(((uint32) (((uchar*) (A))[0])) << 16))) << 32))
 
-
 #define bit_uint8korr(A) ((ulonglong)(((uint32) (((uchar*) (A))[7])) +\
 									(((uint32) (((uchar*) (A))[6])) << 8) +\
 									(((uint32) (((uchar*) (A))[5])) << 16) +\
@@ -473,37 +496,6 @@
 #endif /* WORDS_BIGENDIAN */
 
 
-#ifdef PHP_WIN32
-#define MYSQLND_LLU_SPEC "%I64u"
-#define MYSQLND_LL_SPEC "%I64d"
-#ifndef L64
-#define L64(x) x##i64
-#endif
-typedef unsigned __int64 my_uint64;
-typedef __int64 my_int64;
-typedef unsigned __int64 mynd_ulonglong;
-typedef __int64 mynd_longlong;
-#else
-#define MYSQLND_LLU_SPEC "%llu"
-#define MYSQLND_LL_SPEC "%lld"
-#ifndef L64
-#define L64(x) x##LL
-#endif
-#ifndef HAVE_UINT64_T
-typedef unsigned long long my_uint64;
-typedef unsigned long long mynd_ulonglong;
-#else
-typedef uint64_t my_uint64;
-typedef uint64_t mynd_ulonglong;
-#endif
-#ifndef HAVE_INT64_T
-typedef long long my_int64;
-typedef long long mynd_longlong;
-#else
-typedef int64_t my_int64;
-typedef int64_t mynd_longlong;
-#endif
-#endif
 
 /*
  * Local variables:

Modified: branches/experimental/mysqlnd/mysqlnd_priv.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_priv.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_priv.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_priv.h,v 1.4.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_priv.h,v 1.8 2008/01/08 13:13:39 andrey Exp $ */
 
 #ifndef MYSQLND_PRIV_H
 #define MYSQLND_PRIV_H
@@ -115,7 +115,7 @@
 #define MAX_CHARSET_LEN			32
 
 
-#define SET_ERROR_AFF_ROWS(s)	(s)->upsert_status.affected_rows = (mynd_ulonglong) ~0
+#define SET_ERROR_AFF_ROWS(s)	(s)->upsert_status.affected_rows = (uint64) ~0
 
 /* Error handling */
 #define SET_NEW_MESSAGE(buf, buf_len, message, len, persistent) \

Modified: branches/experimental/mysqlnd/mysqlnd_ps.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_ps.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_ps.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_ps.c,v 1.3.2.3 2007/10/07 21:47:36 davidw Exp $ */
+/* $Id: mysqlnd_ps.c,v 1.3.2.5 2008/01/02 21:14:35 andrey Exp $ */
 #include "php.h"
 #include "mysqlnd.h"
 #include "mysqlnd_wireprotocol.h"
@@ -614,7 +614,7 @@
 
 			if (NULL == current_row[0]) {
 				set->initialized_rows++;
-				mynd_ulonglong row_num = (set->data_cursor - set->data) / field_count;
+				uint64 row_num = (set->data_cursor - set->data) / field_count;
 				result->m.row_decoder(set->row_buffers[row_num],
 									  current_row,
 									  result->meta->field_count,
@@ -1221,7 +1221,7 @@
 					stmt->param_bind[i].zv = NULL;
 				}
 			}
-			mnd_free(stmt->param_bind);
+			mnd_efree(stmt->param_bind);
 		}
 
 		stmt->param_bind = param_bind;
@@ -1323,7 +1323,7 @@
 
 
 /* {{{ mysqlnd_stmt::insert_id */
-static mynd_ulonglong
+static uint64
 MYSQLND_METHOD(mysqlnd_stmt, insert_id)(const MYSQLND_STMT * const stmt)
 {
 	return stmt->upsert_status.last_insert_id;
@@ -1332,7 +1332,7 @@
 
 
 /* {{{ mysqlnd_stmt::affected_rows */
-static mynd_ulonglong
+static uint64
 MYSQLND_METHOD(mysqlnd_stmt, affected_rows)(const MYSQLND_STMT * const stmt)
 {
 	return stmt->upsert_status.affected_rows;
@@ -1341,7 +1341,7 @@
 
 
 /* {{{ mysqlnd_stmt::num_rows */
-static mynd_ulonglong
+static uint64
 MYSQLND_METHOD(mysqlnd_stmt, num_rows)(const MYSQLND_STMT * const stmt)
 {
 	return stmt->result? mysqlnd_num_rows(stmt->result):0;
@@ -1405,7 +1405,7 @@
 
 /* {{{ mysqlnd_stmt::data_seek */
 static enum_func_status
-MYSQLND_METHOD(mysqlnd_stmt, data_seek)(const MYSQLND_STMT * const stmt, mynd_ulonglong
row TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_stmt, data_seek)(const MYSQLND_STMT * const stmt, uint64 row
TSRMLS_DC)
 {
 	return stmt->result? stmt->result->m.seek_data(stmt->result, row TSRMLS_CC)
: FAIL;
 }
@@ -1645,7 +1645,7 @@
 
 	/* Destroy the input bind */
 	if (stmt->param_bind) {
-		int i;
+		unsigned int i;
 		/*
 		  Because only the bound variables can point to our internal buffers, then
 		  separate or free only them. Free is possible because the user could have
@@ -1658,7 +1658,7 @@
 			}
 		}
 
-		mnd_free(stmt->param_bind);
+		mnd_efree(stmt->param_bind);
 		stmt->param_bind = NULL;
 	}
 

Modified: branches/experimental/mysqlnd/mysqlnd_ps_codec.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_ps_codec.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_ps_codec.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_ps_codec.c,v 1.3.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_ps_codec.c,v 1.5 2008/01/02 21:16:46 andrey Exp $ */
 #include "php.h"
 #include "mysqlnd.h"
 #include "mysqlnd_wireprotocol.h"
@@ -73,17 +73,17 @@
 	size_t tmp_len = 0;
 	zend_bool is_bit = field->type == MYSQL_TYPE_BIT;
 	if (field->flags & UNSIGNED_FLAG) {
-		my_uint64 uval = 0;
+		uint64 uval = 0;
 
 		switch (byte_count) {
-			case 8:uval = is_bit? (my_uint64) bit_uint8korr(*row):(my_uint64)
uint8korr(*row);break;
+			case 8:uval = is_bit? (uint64) bit_uint8korr(*row):(uint64) uint8korr(*row);break;
 			case 7:uval = bit_uint7korr(*row);break;
 			case 6:uval = bit_uint6korr(*row);break;
 			case 5:uval = bit_uint5korr(*row);break;
-			case 4:uval = is_bit? (my_uint64) bit_uint4korr(*row):(my_uint64)
uint4korr(*row);break;
-			case 3:uval = is_bit? (my_uint64) bit_uint3korr(*row):(my_uint64)
uint3korr(*row);break;
-			case 2:uval = is_bit? (my_uint64) bit_uint2korr(*row):(my_uint64)
uint2korr(*row);break;
-			case 1:uval = (my_uint64) uint1korr(*row);break;
+			case 4:uval = is_bit? (uint64) bit_uint4korr(*row):(uint64) uint4korr(*row);break;
+			case 3:uval = is_bit? (uint64) bit_uint3korr(*row):(uint64) uint3korr(*row);break;
+			case 2:uval = is_bit? (uint64) bit_uint2korr(*row):(uint64) uint2korr(*row);break;
+			case 1:uval = (uint64) uint1korr(*row);break;
 		}
 
 #if SIZEOF_LONG==4
@@ -100,21 +100,21 @@
 		}
 	} else {
 		/* SIGNED */
-		my_int64 lval = 0;
+		int64 lval = 0;
 		switch (byte_count) {
-			case 8:lval = (my_int64) sint8korr(*row);break;
+			case 8:lval = (int64) sint8korr(*row);break;
 			/*
 			  7, 6 and 5 are not possible.
 			  BIT is only unsigned, thus only uint5|6|7 macroses exist
 			*/
-			case 4:lval = (my_int64) sint4korr(*row);break;
-			case 3:lval = (my_int64) sint3korr(*row);break;
-			case 2:lval = (my_int64) sint2korr(*row);break;
-			case 1:lval = (my_int64) *(my_int8*)*row;break;
+			case 4:lval = (int64) sint4korr(*row);break;
+			case 3:lval = (int64) sint3korr(*row);break;
+			case 2:lval = (int64) sint2korr(*row);break;
+			case 1:lval = (int64) *(my_int8*)*row;break;
 		}
 
 #if SIZEOF_LONG==4
-	    if ((L64(2147483647) < (my_int64) lval) || (L64(-2147483648) > (my_int64)
lval)) {
+	    if ((L64(2147483647) < (int64) lval) || (L64(-2147483648) > (int64) lval)) {
 			tmp_len = sprintf((char *)&tmp, MYSQLND_LL_SPEC, lval);
 		} else 
 #endif /* SIZEOF */
@@ -245,15 +245,15 @@
 	ps_fetch_from_1_to_8_bytes(zv, field, pack_len, row, as_unicode, 8 TSRMLS_CC);
 #if 0
 
-	my_uint64 llval = (my_uint64) sint8korr(*row);
+	uint64 llval = (uint64) sint8korr(*row);
 	zend_bool uns = field->flags & UNSIGNED_FLAG? TRUE:FALSE;
 	
 #if SIZEOF_LONG==8  
 	if (uns == TRUE && llval > 9223372036854775807L) {
 #elif SIZEOF_LONG==4
 	if ((uns == TRUE && llval > L64(2147483647)) || 
-	    (uns == FALSE && ((L64( 2147483647) < (my_int64) llval) ||
-						  (L64(-2147483648) > (my_int64) llval))))
+	    (uns == FALSE && ((L64( 2147483647) < (int64) llval) ||
+						  (L64(-2147483648) > (int64) llval))))
 	{
 #endif
 		char tmp[22];

Modified: branches/experimental/mysqlnd/mysqlnd_qcache.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_qcache.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_qcache.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_qcache.c,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_qcache.c,v 1.3 2007/12/31 07:12:12 sebastian Exp $ */
 #include "php.h"
 #include "mysqlnd.h"
 #include "mysqlnd_priv.h"

Modified: branches/experimental/mysqlnd/mysqlnd_result.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_result.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_result.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_result.c,v 1.4.2.3 2007/10/07 21:47:36 davidw Exp $ */
+/* $Id: mysqlnd_result.c,v 1.4.2.5 2008/01/02 21:14:35 andrey Exp $ */
 #include "php.h"
 #include "mysqlnd.h"
 #include "mysqlnd_wireprotocol.h"
@@ -948,7 +948,7 @@
 
 		if (NULL == current_row[0]) {
 			set->initialized_rows++;
-			mynd_ulonglong row_num = (set->data_cursor - set->data) /
result->meta->field_count;
+			uint64 row_num = (set->data_cursor - set->data) /
result->meta->field_count;
 			result->m.row_decoder(set->row_buffers[row_num],
 								  current_row,
 								  result->meta->field_count,
@@ -1014,7 +1014,7 @@
 
 		if (NULL == current_row[0]) {
 			set->initialized_rows++;
-			mynd_ulonglong row_num = (set->data_cursor - set->data) /
result->meta->field_count;
+			uint64 row_num = (set->data_cursor - set->data) /
result->meta->field_count;
 			result->m.row_decoder(set->row_buffers[row_num],
 								  current_row,
 								  result->meta->field_count,
@@ -1134,7 +1134,7 @@
 	while (FAIL != (ret = PACKET_READ(row_packet, conn)) && !row_packet->eof) {
 
 		if (!free_rows) {
-			mynd_ulonglong total_rows = free_rows = next_extend = next_extend * 5 / 3; /* extend
with 33% */
+			uint64 total_rows = free_rows = next_extend = next_extend * 5 / 3; /* extend with 33%
*/
 			total_rows += set->row_count;
 			set->row_buffers = mnd_perealloc(set->row_buffers,
 											 total_rows * sizeof(MYSQLND_MEMORY_POOL_CHUNK *),
@@ -1272,7 +1272,7 @@
 
 	/* At the point we are still under LOCK */
 	if (set->data_cursor && (set->data_cursor - set->data) <
(set->row_count)) {
-		mynd_ulonglong row_num = set->data_cursor - set->data;
+		uint64 row_num = set->data_cursor - set->data;
 		zval **current_row = *set->data_cursor++;
 		set->initialized_rows++;
 		/* We don't forget to release the lock */
@@ -1390,8 +1390,8 @@
 	while (FAIL != (ret = PACKET_READ(row_packet, conn)) && !row_packet->eof) {
 		tsrm_mutex_lock(set->LOCK);
 		if (!free_rows) {
-			mynd_ulonglong total_rows = free_rows = next_extend = next_extend * 5 / 3; /* extend
with 33% */
-			mynd_ulonglong old_size;
+			uint64 total_rows = free_rows = next_extend = next_extend * 5 / 3; /* extend with 33%
*/
+			uint64 old_size;
 			total_rows += set->row_count;
 
 			old_size = set->data_size;
@@ -1588,7 +1588,7 @@
 
 /* {{{ mysqlnd_res::data_seek */
 static enum_func_status
-MYSQLND_METHOD(mysqlnd_res, data_seek)(MYSQLND_RES *result, mynd_ulonglong row TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_res, data_seek)(MYSQLND_RES *result, uint64 row TSRMLS_DC)
 {
 	DBG_ENTER("mysqlnd_res::data_seek");
 	DBG_INF_FMT("row=%lu", row);
@@ -1610,7 +1610,7 @@
 
 
 /* {{{ mysqlnd_res::num_rows */
-static mynd_ulonglong
+static uint64
 MYSQLND_METHOD(mysqlnd_res, num_rows)(const MYSQLND_RES * const result)
 {
 	/* Be compatible with libmysql. We count row_count, but will return 0 */
@@ -1796,7 +1796,7 @@
 {
 	zval row;
 	zval **entry;
-	uint i = 0;
+	unsigned int i = 0;
 
 	DBG_ENTER("mysqlnd_res::fetch_field_data");
 	DBG_INF_FMT("offset=%u", offset);

Modified: branches/experimental/mysqlnd/mysqlnd_result.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_result.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_result.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_result.h,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_result.h,v 1.3 2007/12/31 07:12:12 sebastian Exp $ */
 
 #ifndef MYSQLND_RESULT_H
 #define MYSQLND_RESULT_H

Modified: branches/experimental/mysqlnd/mysqlnd_result_meta.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_result_meta.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_result_meta.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_result_meta.c,v 1.3.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_result_meta.c,v 1.3.2.3 2007/12/31 07:17:11 sebastian Exp $ */
 #include "php.h"
 #include "mysqlnd.h"
 #include "mysqlnd_priv.h"
@@ -141,7 +141,7 @@
 MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const meta,
 												MYSQLND *conn TSRMLS_DC)
 {
-	int i = 0;
+	unsigned int i = 0;
 	php_mysql_packet_res_field field_packet;
 
 	DBG_ENTER("mysqlnd_res_meta::read_metadata");

Modified: branches/experimental/mysqlnd/mysqlnd_result_meta.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_result_meta.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_result_meta.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_result_meta.h,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_result_meta.h,v 1.3 2007/12/31 07:12:12 sebastian Exp $ */
 
 #ifndef MYSQLND_RESULT_META_H
 #define MYSQLND_RESULT_META_H

Modified: branches/experimental/mysqlnd/mysqlnd_statistics.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_statistics.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_statistics.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_statistics.c,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_statistics.c,v 1.3 2007/12/31 07:12:12 sebastian Exp $ */
 #include "php.h"
 #include "mysqlnd.h"
 #include "mysqlnd_priv.h"
@@ -92,7 +92,7 @@
 	{ STR_W_LEN("mem_calloc_ammount") },
 	{ STR_W_LEN("mem_realloc_calloc") },
 	{ STR_W_LEN("mem_realloc_ammount") },
-	{ STR_W_LEN("mem_free_count") },
+	{ STR_W_LEN("mem_free_count") }
 };
 /* }}} */
 

Modified: branches/experimental/mysqlnd/mysqlnd_statistics.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_statistics.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_statistics.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_statistics.h,v 1.4.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_statistics.h,v 1.6 2008/01/02 21:16:46 andrey Exp $ */
 
 #ifndef MYSQLND_STATISTICS_H
 #define MYSQLND_STATISTICS_H
@@ -86,7 +86,7 @@
 #define MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn_stats, statistic, value) \
  { \
  	if (MYSQLND_G(collect_statistics)) { \
-		my_uint64 v = (my_uint64) (value); \
+		uint64 v = (uint64) (value); \
 		DBG_INF_FMT("Global&Conn stat increase w value [%s]",
mysqlnd_stats_values_names[statistic]); \
 		tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
 		mysqlnd_global_stats->values[(statistic)] += v; \
@@ -100,9 +100,9 @@
 #define MYSQLND_INC_CONN_STATISTIC_W_VALUE3(conn_stats, statistic1, value1, statistic2,
value2, statistic3, value3) \
  { \
  	if (MYSQLND_G(collect_statistics)) { \
-		my_uint64 v1 = (my_uint64) (value1); \
-		my_uint64 v2 = (my_uint64) (value2); \
-		my_uint64 v3 = (my_uint64) (value3); \
+		uint64 v1 = (uint64) (value1); \
+		uint64 v2 = (uint64) (value2); \
+		uint64 v3 = (uint64) (value3); \
 								 \
 		tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
 		mysqlnd_global_stats->values[(statistic1)]+= v1; \
@@ -163,7 +163,7 @@
 
 #define MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn_stats, statistic, value) \
  { \
-	my_uint64 v = (my_uint64) (value); \
+	uint64 v = (uint64) (value); \
 	DBG_INF_FMT("Global&Conn stats increase w value [%s]",
mysqlnd_stats_values_names[statistic]); \
  	if (MYSQLND_G(collect_statistics)) { \
 		mysqlnd_global_stats->values[(statistic)] += v; \
@@ -176,9 +176,9 @@
 #define MYSQLND_INC_CONN_STATISTIC_W_VALUE3(conn_stats, statistic1, value1, statistic2,
value2, statistic3, value3) \
  { \
  	if (MYSQLND_G(collect_statistics)) { \
-		my_uint64 v1 = (my_uint64) (value1); \
-		my_uint64 v2 = (my_uint64) (value2); \
-		my_uint64 v3 = (my_uint64) (value3); \
+		uint64 v1 = (uint64) (value1); \
+		uint64 v2 = (uint64) (value2); \
+		uint64 v3 = (uint64) (value3); \
 								\
 		mysqlnd_global_stats->values[(statistic1)]+= v1; \
 		mysqlnd_global_stats->values[(statistic2)]+= v2; \

Modified: branches/experimental/mysqlnd/mysqlnd_structs.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_structs.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/mysqlnd_structs.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_structs.h,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_structs.h,v 1.6 2008/01/08 13:13:39 andrey Exp $ */
 
 #ifndef MYSQLND_STRUCTS_H
 #define MYSQLND_STRUCTS_H
@@ -46,7 +46,7 @@
 
 struct st_mysqlnd_memory_pool_chunk
 {
-	mynd_ulonglong		app;
+	uint64				app;
 	MYSQLND_MEMORY_POOL *pool;
 	zend_uchar			*ptr;
 	uint				size;
@@ -95,8 +95,8 @@
 {
 	unsigned int		warning_count;
 	unsigned int		server_status;
-	mynd_ulonglong		affected_rows;
-	mynd_ulonglong		last_insert_id;
+	uint64		affected_rows;
+	uint64		last_insert_id;
 } mysqlnd_upsert_status;
 
 
@@ -130,7 +130,6 @@
 	char	*collation;
 	uint	char_minlen;
 	uint	char_maxlen;
-	uint	dangerous_for_escape_backslash;
 	uint 	(*mb_charlen)(uint c);
 	uint 	(*mb_valid)(const char *start, const char *end);
 } MYSQLND_CHARSET;
@@ -211,7 +210,7 @@
 
 typedef struct st_mysqlnd_stats
 {
-	my_uint64	values[STAT_LAST];
+	uint64	values[STAT_LAST];
 #ifdef ZTS
 	MUTEX_T		LOCK_access;
 #endif
@@ -258,7 +257,7 @@
 	unsigned int		(*get_error_no)(const MYSQLND * const conn);
 	const char *		(*get_error_str)(const MYSQLND * const conn);
 	const char *		(*get_sqlstate)(const MYSQLND * const conn);
-	mynd_ulonglong		(*get_thread_id)(const MYSQLND * const conn);
+	uint64		(*get_thread_id)(const MYSQLND * const conn);
 	void				(*get_statistics)(const MYSQLND * const conn, zval *return_value TSRMLS_DC
ZEND_FILE_LINE_DC);
 
 	unsigned long		(*get_server_version)(const MYSQLND * const conn);
@@ -271,8 +270,8 @@
 	MYSQLND_RES *		(*list_fields)(MYSQLND *conn, const char *table, const char *achtung_wild
TSRMLS_DC);
 	MYSQLND_RES *		(*list_method)(MYSQLND *conn, const char *query, const char
*achtung_wild, char *par1 TSRMLS_DC);
 
-	mynd_ulonglong		(*get_last_insert_id)(const MYSQLND * const conn);
-	mynd_ulonglong		(*get_affected_rows)(const MYSQLND * const conn);
+	uint64		(*get_last_insert_id)(const MYSQLND * const conn);
+	uint64		(*get_affected_rows)(const MYSQLND * const conn);
 	unsigned int		(*get_warning_count)(const MYSQLND * const conn);
 
 	unsigned int		(*get_field_count)(const MYSQLND * const conn);
@@ -296,17 +295,17 @@
 	mysqlnd_fetch_row_func	fetch_row_normal_buffered; /* private */
 	mysqlnd_fetch_row_func	fetch_row_normal_unbuffered; /* private */
 
-	MYSQLND_RES *		(*use_result)(MYSQLND_RES * const result, zend_bool ps TSRMLS_DC);
+	MYSQLND_RES *		(*use_result)(MYSQLND_RES * const result, zend_bool ps_protocol
TSRMLS_DC);
 	MYSQLND_RES *		(*store_result)(MYSQLND_RES * result, MYSQLND * const conn, zend_bool ps
TSRMLS_DC);
 	MYSQLND_RES *		(*background_store_result)(MYSQLND_RES * result, MYSQLND * const conn,
zend_bool ps TSRMLS_DC);
 	void 				(*fetch_into)(MYSQLND_RES *result, unsigned int flags, zval *return_value,
enum_mysqlnd_extension ext TSRMLS_DC ZEND_FILE_LINE_DC);
 	MYSQLND_ROW_C 		(*fetch_row_c)(MYSQLND_RES *result TSRMLS_DC);
 	void 				(*fetch_all)(MYSQLND_RES *result, unsigned int flags, zval *return_value
TSRMLS_DC ZEND_FILE_LINE_DC);
 	void 				(*fetch_field_data)(MYSQLND_RES *result, unsigned int offset, zval
*return_value TSRMLS_DC);
-	mynd_ulonglong		(*num_rows)(const MYSQLND_RES * const result);
+	uint64		(*num_rows)(const MYSQLND_RES * const result);
 	unsigned int		(*num_fields)(const MYSQLND_RES * const result);
 	enum_func_status	(*skip_result)(MYSQLND_RES * const result TSRMLS_DC);
-	enum_func_status	(*seek_data)(MYSQLND_RES * result, mynd_ulonglong row TSRMLS_DC);
+	enum_func_status	(*seek_data)(MYSQLND_RES * result, uint64 row TSRMLS_DC);
 	MYSQLND_FIELD_OFFSET (*seek_field)(MYSQLND_RES * const result, MYSQLND_FIELD_OFFSET
field_offset);
 	MYSQLND_FIELD_OFFSET (*field_tell)(const MYSQLND_RES * const result);
 	MYSQLND_FIELD *		(*fetch_field)(MYSQLND_RES * const result TSRMLS_DC);
@@ -344,7 +343,7 @@
 	MYSQLND_RES *		(*background_store_result)(MYSQLND_STMT * const stmt TSRMLS_DC);
 	MYSQLND_RES *		(*get_result)(MYSQLND_STMT * const stmt TSRMLS_DC);
 	enum_func_status	(*free_result)(MYSQLND_STMT * const stmt TSRMLS_DC);
-	enum_func_status	(*seek_data)(const MYSQLND_STMT * const stmt, mynd_ulonglong row
TSRMLS_DC);
+	enum_func_status	(*seek_data)(const MYSQLND_STMT * const stmt, uint64 row TSRMLS_DC);
 	enum_func_status	(*reset)(MYSQLND_STMT * const stmt TSRMLS_DC);
 	enum_func_status	(*close)(MYSQLND_STMT * const stmt, zend_bool implicit TSRMLS_DC); /*
private */
 	enum_func_status	(*dtor)(MYSQLND_STMT * const stmt, zend_bool implicit TSRMLS_DC); /*
use this for mysqlnd_stmt_close */
@@ -359,9 +358,9 @@
 	MYSQLND_RES	*		(*get_parameter_metadata)(MYSQLND_STMT * const stmt);
 	MYSQLND_RES	*		(*get_result_metadata)(MYSQLND_STMT * const stmt TSRMLS_DC);
 
-	mynd_ulonglong		(*get_last_insert_id)(const MYSQLND_STMT * const stmt);
-	mynd_ulonglong		(*get_affected_rows)(const MYSQLND_STMT * const stmt);
-	mynd_ulonglong		(*get_num_rows)(const MYSQLND_STMT * const stmt);
+	uint64		(*get_last_insert_id)(const MYSQLND_STMT * const stmt);
+	uint64		(*get_affected_rows)(const MYSQLND_STMT * const stmt);
+	uint64		(*get_num_rows)(const MYSQLND_STMT * const stmt);
 
 	unsigned int		(*get_param_count)(const MYSQLND_STMT * const stmt);
 	unsigned int		(*get_field_count)(const MYSQLND_STMT * const stmt);
@@ -388,7 +387,7 @@
 	char			*passwd;
 	unsigned int	*passwd_len;
 	char			*scheme;
-	mynd_ulonglong	thread_id;
+	uint64	thread_id;
 	char			*server_version;
 	char			*host_info;
 	unsigned char	*scramble;
@@ -496,11 +495,11 @@
 struct st_mysqlnd_background_buffered_result
 {
 	zval				***data;
-	mynd_ulonglong		data_size;
+	uint64		data_size;
 	zval				***data_cursor;
 	MYSQLND_MEMORY_POOL_CHUNK **row_buffers;
-	mynd_ulonglong		row_count;
-	mynd_ulonglong		initialized_rows;
+	uint64		row_count;
+	uint64		initialized_rows;
 	zend_bool			persistent;
 
 	MYSQLND_QCACHE		*qcache;
@@ -523,8 +522,8 @@
 	zval				**data;
 	zval				**data_cursor;
 	MYSQLND_MEMORY_POOL_CHUNK **row_buffers;
-	mynd_ulonglong		row_count;
-	mynd_ulonglong		initialized_rows;
+	uint64		row_count;
+	uint64		initialized_rows;
 	zend_bool			persistent;
 
 	MYSQLND_QCACHE		*qcache;
@@ -540,7 +539,7 @@
 	zval				**last_row_data;
 	MYSQLND_MEMORY_POOL_CHUNK *last_row_buffer;
 
-	mynd_ulonglong		row_count;
+	uint64		row_count;
 	zend_bool			eof_reached;
 };
 

Modified: branches/experimental/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_wireprotocol.c	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/mysqlnd/mysqlnd_wireprotocol.c	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -125,48 +125,48 @@
 
 /* {{{ php_mysqlnd_net_field_length_ll 
    Get next field's length */
-mynd_ulonglong php_mysqlnd_net_field_length_ll(zend_uchar **packet)
+uint64 php_mysqlnd_net_field_length_ll(zend_uchar **packet)
 {
 	register zend_uchar *p= (zend_uchar *)*packet;
 
 	if (*p < 251) {
 		(*packet)++;
-		return (mynd_ulonglong) *p;
+		return (uint64) *p;
 	}
 
 	switch (*p) {
 		case 251:
 			(*packet)++;
-			return (mynd_ulonglong) MYSQLND_NULL_LENGTH;
+			return (uint64) MYSQLND_NULL_LENGTH;
 		case 252:
 			(*packet) += 3;
-			return (mynd_ulonglong) uint2korr(p + 1);
+			return (uint64) uint2korr(p + 1);
 		case 253:
 			(*packet) += 4;
-			return (mynd_ulonglong) uint3korr(p + 1);
+			return (uint64) uint3korr(p + 1);
 		default:
 			(*packet) += 9;
-			return (mynd_ulonglong) uint8korr(p + 1);
+			return (uint64) uint8korr(p + 1);
 	}
 }
 /* }}} */
 
 
 /* {{{ php_mysqlnd_net_store_length */
-zend_uchar *php_mysqlnd_net_store_length(zend_uchar *packet, mynd_ulonglong length)
+zend_uchar *php_mysqlnd_net_store_length(zend_uchar *packet, uint64 length)
 {
-	if (length < (mynd_ulonglong) L64(251)) {
+	if (length < (uint64) L64(251)) {
 		*packet = (zend_uchar) length;
 		return packet + 1;
 	}
 
-	if (length < (mynd_ulonglong) L64(65536)) {
+	if (length < (uint64) L64(65536)) {
 		*packet++ = 252;
 		int2store(packet,(uint) length);
 		return packet + 2;
 	}
 
-	if (length < (mynd_ulonglong) L64(16777216)) {
+	if (length < (uint64) L64(16777216)) {
 		*packet++ = 253;
 		int3store(packet,(ulong) length);
 		return packet + 3;
@@ -479,7 +479,7 @@
 {
 	size_t ret;
 	char *p = (char *)buf;
-	int iter = 0;
+	unsigned int iter = 0;
 	MYSQLND_NET *net = &conn->net;
 	size_t old_chunk_size = net->stream->chunk_size;
 
@@ -501,7 +501,7 @@
 
 #ifdef MYSQLND_DUMP_HEADER_N_BODY_FULL
 	{
-		int i;
+		unsigned int i;
 		DBG_INF_FMT("BODY: requested=%d last_read=%3d", p - (char*)buf, ret);
 		for (i = 0 ; i < p - (char*)buf; i++) {
 			if (i && (i % 30 == 0)) {
@@ -745,7 +745,7 @@
 	zend_uchar buf[1024];
 	zend_uchar *p = buf;
 	zend_uchar *begin = buf;
-	int i;
+	unsigned long i;
 	register php_mysql_packet_ok *packet= (php_mysql_packet_ok *) _packet;
 
 	DBG_ENTER("php_mysqlnd_ok_read");
@@ -1067,7 +1067,8 @@
 	zend_uchar *p = buf;
 	zend_uchar *begin = buf;
 	char *root_ptr;
-	size_t buf_len = conn->net.cmd_buffer.length, len, total_len = 0;
+	size_t buf_len = conn->net.cmd_buffer.length, total_len = 0;
+	unsigned long len;
 	MYSQLND_FIELD *meta;
 	unsigned int i, field_count = sizeof(rset_field_offsets)/sizeof(size_t);
 
@@ -1233,7 +1234,7 @@
 
 static enum_func_status
 php_mysqlnd_read_row_ex(MYSQLND *conn, MYSQLND_MEMORY_POOL_CHUNK **buffer,
-						mynd_ulonglong *data_size, zend_bool persistent_alloc,
+						uint64 *data_size, zend_bool persistent_alloc,
 						unsigned int prealloc_more_bytes TSRMLS_DC)
 {
 	enum_func_status ret = PASS;
@@ -1349,7 +1350,7 @@
 												  0, &p, as_unicode TSRMLS_CC);
 		}
 		if (!((bit<<=1) & 255)) {
-			bit= 1;					/* To next byte */
+			bit = 1;	/* to the following byte */
 			null_ptr++;
 		}
 	}
@@ -1430,23 +1431,23 @@
 				if (perm_bind.pack_len < SIZEOF_LONG)
 				{
 					/* direct conversion */
-					my_int64 v = atoll((char *) p);
+					int64 v = atoll((char *) p);
 					ZVAL_LONG(*current_field, v);
 				} else {
-					my_uint64 v = (my_uint64) atoll((char *) p);
+					uint64 v = (uint64) atoll((char *) p);
 					zend_bool uns = packet->fields_metadata[i].flags & UNSIGNED_FLAG? TRUE:FALSE;
 					/* We have to make it ASCIIZ temporarily */
 #if SIZEOF_LONG==8
 					if (uns == TRUE && v > 9223372036854775807L)
 #elif SIZEOF_LONG==4
 					if ((uns == TRUE && v > L64(2147483647)) || 
-						(uns == FALSE && (( L64(2147483647) < (my_int64) v) ||
-						(L64(-2147483648) > (my_int64) v))))
+						(uns == FALSE && (( L64(2147483647) < (int64) v) ||
+						(L64(-2147483648) > (int64) v))))
 #endif /* SIZEOF */
 					{
 						ZVAL_STRINGL(*current_field, (char *)p, len, 0);
 					} else {
-						ZVAL_LONG(*current_field, (my_int64)v);
+						ZVAL_LONG(*current_field, (int64)v);
 					}
 				}
 				*(p + len) = save;
@@ -1472,7 +1473,7 @@
 				p -= len;
 				if (Z_TYPE_PP(current_field) == IS_LONG) {
 					bit_area += 1 + sprintf((char *)start, MYSQLND_LLU_SPEC,
-											(my_int64) Z_LVAL_PP(current_field));
+											(int64) Z_LVAL_PP(current_field));
 #if PHP_MAJOR_VERSION >= 6
 					if (as_unicode) {
 						ZVAL_UTF8_STRINGL(*current_field, start, bit_area - start - 1, 0);
@@ -1582,7 +1583,7 @@
 	size_t old_chunk_size = net->stream->chunk_size;
 	php_mysql_packet_row *packet= (php_mysql_packet_row *) _packet;
 	size_t post_alloc_for_bit_fields = 0;
-	mynd_ulonglong data_size = 0;
+	uint64 data_size = 0;
 
 	DBG_ENTER("php_mysqlnd_rowp_read");
 

Modified: branches/experimental/mysqlnd/mysqlnd_wireprotocol.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_wireprotocol.h	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/mysqlnd/mysqlnd_wireprotocol.h	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqlnd_wireprotocol.h,v 1.4.2.2 2007/10/05 21:23:56 andrey Exp $ */
+/* $Id: mysqlnd_wireprotocol.h,v 1.6 2008/01/02 21:16:46 andrey Exp $ */
 
 #ifndef MYSQLND_WIREPROTOCOL_H
 #define MYSQLND_WIREPROTOCOL_H
@@ -173,8 +173,8 @@
 typedef struct st_php_mysql_packet_ok {
 	mysqlnd_packet_header		header;
 	mysqlnd_1b		field_count; /* always 0x0 */
-	mynd_ulonglong	affected_rows;
-	mynd_ulonglong	last_insert_id;
+	uint64	affected_rows;
+	uint64	last_insert_id;
 	mysqlnd_2b		server_status;
 	mysqlnd_2b		warning_count;
 	char			*message;
@@ -225,8 +225,8 @@
 	*/
 	mysqlnd_2b			warning_count;
 	mysqlnd_2b			server_status;
-	mynd_ulonglong		affected_rows;
-	mynd_ulonglong		last_insert_id;
+	uint64		affected_rows;
+	uint64		last_insert_id;
 	/* This is for both LOAD DATA or info, when no result set */
 	char				*info_or_local_file;
 	size_t				info_or_local_file_len;
@@ -319,7 +319,7 @@
 void php_mysqlnd_scramble(zend_uchar * const buffer, const zend_uchar * const scramble,
const zend_uchar * const pass);
 
 unsigned long	php_mysqlnd_net_field_length(zend_uchar **packet);
-zend_uchar *	php_mysqlnd_net_store_length(zend_uchar *packet, mynd_ulonglong length);
+zend_uchar *	php_mysqlnd_net_store_length(zend_uchar *packet, uint64 length);
 
 extern char * const mysqlnd_empty_string;
 

Modified: branches/experimental/mysqlnd/php_mysqlnd.h
===================================================================
--- branches/experimental/mysqlnd/php_mysqlnd.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/mysqlnd/php_mysqlnd.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: php_mysqlnd.h,v 1.2.2.2 2007/10/05 21:23:56 andrey Exp $ 
+  $Id: php_mysqlnd.h,v 1.3 2007/12/31 07:12:12 sebastian Exp $ 
 */
 
 #ifndef PHP_MYSQLND_H

Modified: branches/experimental/php5/ext/mysql/config.w32
===================================================================
--- branches/experimental/php5/ext/mysql/config.w32	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php5/ext/mysql/config.w32	2008-01-24 13:56:41 UTC (rev 1212)
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.2.6.1 2007/10/05 21:23:55 andrey Exp $
+// $Id: config.w32,v 1.2.6.2 2008/01/19 18:21:44 andrey Exp $
 // vim:ft=javascript
 
 ARG_WITH("mysql", "MySQL support", "no");
 
 if (PHP_MYSQL != "no") {
-	if (PHP_MYSQLI != "mysqlnd") {
+	if (PHP_MYSQL != "mysqlnd") {
 		if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) &&
 			CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL",
 			PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) {

Modified: branches/experimental/php5/ext/mysql/mysql_mysqlnd.h
===================================================================
--- branches/experimental/php5/ext/mysql/mysql_mysqlnd.h	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php5/ext/mysql/mysql_mysqlnd.h	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |

Modified: branches/experimental/php5/ext/mysql/php_mysql.c
===================================================================
--- branches/experimental/php5/ext/mysql/php_mysql.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php5/ext/mysql/php_mysql.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
  
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.5 2007/11/08 13:29:06 tony2001 Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.8 2008/01/20 14:10:44 bjori Exp $ */
 
 /* TODO:
  *
@@ -643,16 +643,22 @@
 		hashed_details_length = spprintf(&hashed_details, 0, "mysql__%s_", user);
 		client_flags = CLIENT_INTERACTIVE;
 	} else {
-		host_and_port = MySG(default_host);
-		user = MySG(default_user);
-		passwd = MySG(default_password);
-		
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sssll", &host_and_port,
&host_len,
+		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!s!ll", &host_and_port,
&host_len,
 									&user, &user_len, &passwd, &passwd_len, 
 									&new_link, &client_flags)==FAILURE) {
-			WRONG_PARAM_COUNT;
+			return;
 		}
 
+		if (!host_and_port) {
+			host_and_port = MySG(default_host);
+		}
+		if (!user) {
+			user = MySG(default_user);
+		}
+		if (!passwd) {
+			passwd = MySG(default_password);
+		}
+
 		/* mysql_pconnect does not support new_link parameter */
 		if (persistent) {
 			client_flags= new_link;

Modified: branches/experimental/php5/ext/mysql/php_mysql.h
===================================================================
--- branches/experimental/php5/ext/mysql/php_mysql.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php5/ext/mysql/php_mysql.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
 */
 
 
-/* $Id: php_mysql.h,v 1.37.2.1.2.2.2.2 2007/10/08 16:14:56 andrey Exp $ */
+/* $Id: php_mysql.h,v 1.37.2.1.2.2.2.3 2007/12/31 07:17:10 sebastian Exp $ */
 
 #ifndef PHP_MYSQL_H
 #define PHP_MYSQL_H

Modified: branches/experimental/php5/ext/mysql/php_mysql_structs.h
===================================================================
--- branches/experimental/php5/ext/mysql/php_mysql_structs.h	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php5/ext/mysql/php_mysql_structs.h	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
 */
 
 
-/* $Id: php_mysql_structs.h,v 1.1.2.1 2007/10/08 16:14:56 andrey Exp $ */
+/* $Id: php_mysql_structs.h,v 1.1.2.2 2007/12/31 07:17:10 sebastian Exp $ */
 
 #ifndef PHP_MYSQL_STRUCTS_H
 #define PHP_MYSQL_STRUCTS_H

Modified: branches/experimental/php5/ext/mysqli/config.m4
===================================================================
--- branches/experimental/php5/ext/mysqli/config.m4	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php5/ext/mysqli/config.m4	2008-01-24 13:56:41 UTC (rev 1212)
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.22.2.1.2.2.2.2 2007/11/06 10:00:39 jani Exp $
+dnl $Id: config.m4,v 1.22.2.1.2.2.2.3 2007/12/28 15:37:52 andrey Exp $
 dnl config.m4 for extension mysqli
 
 PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -61,8 +61,6 @@
   ],[
     $MYSQLI_LIBLINE
   ])
-
-  mysqli_extra_sources="$mysqli_extra_sources mysqli_repl.c"
 fi
 
 dnl Build extension

Modified: branches/experimental/php5/ext/mysqli/config.w32
===================================================================
--- branches/experimental/php5/ext/mysqli/config.w32	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php5/ext/mysqli/config.w32	2008-01-24 13:56:41 UTC (rev 1212)
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7.6.1 2007/10/05 21:23:56 andrey Exp $
+// $Id: config.w32,v 1.7.6.2 2007/12/28 15:37:52 andrey Exp $
 // vim:ft=javascript
 
 // Note: The extension name is "mysqli", you enable it with "--with-mysqli".
@@ -26,9 +26,7 @@
 			CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + 
 										"\\include;" + PHP_PHP_BUILD +
 										"\\include\\mysql;" + PHP_MYSQLI)) {
-			// No "mysqli_repl.c" when using "mysqlnd"
-			mysqli_extra_sources = "mysqli_repl.c";
-			EXTENSION("mysqli", mysqli_source + " " + mysqli_extra_sources);
+			EXTENSION("mysqli", mysqli_source);
 			AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
 		} else {
 			WARNING("mysqli not enabled; libraries and headers not found");

Modified: branches/experimental/php5/ext/mysqli/mysqli.c
===================================================================
--- branches/experimental/php5/ext/mysqli/mysqli.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php5/ext/mysqli/mysqli.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -15,7 +15,7 @@
   | Author: Georg Richter <georg@stripped>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli.c,v 1.72.2.16.2.17.2.7 2007/11/09 10:56:28 andrey Exp $ 
+  $Id: mysqli.c,v 1.72.2.16.2.17.2.9 2008/01/03 14:33:46 johannes Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -760,13 +760,6 @@
 
 	REGISTER_LONG_CONSTANT("MYSQLI_SET_CHARSET_NAME", MYSQL_SET_CHARSET_NAME, CONST_CS |
CONST_PERSISTENT);
 
-	/* replication */
-#if !defined(HAVE_MYSQLND)
-	REGISTER_LONG_CONSTANT("MYSQLI_RPL_MASTER", MYSQL_RPL_MASTER, CONST_CS |
CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("MYSQLI_RPL_SLAVE", MYSQL_RPL_SLAVE, CONST_CS |
CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("MYSQLI_RPL_ADMIN", MYSQL_RPL_ADMIN, CONST_CS |
CONST_PERSISTENT);
-#endif
-	
 	/* bind support */
 	REGISTER_LONG_CONSTANT("MYSQLI_NO_DATA", MYSQL_NO_DATA, CONST_CS | CONST_PERSISTENT);
 #ifdef MYSQL_DATA_TRUNCATED

Modified: branches/experimental/php5/ext/mysqli/mysqli_api.c
===================================================================
--- branches/experimental/php5/ext/mysqli/mysqli_api.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php5/ext/mysqli/mysqli_api.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_api.c,v 1.118.2.22.2.16.2.8 2007/11/09 10:56:28 andrey Exp $ 
+  $Id: mysqli_api.c,v 1.118.2.22.2.16.2.11 2008/01/01 18:13:14 hholzgra Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -166,7 +166,7 @@
 	if (argc == start) {
 		return PASS;
 	}
-	params = malloc((argc - start) * sizeof(MYSQLND_PARAM_BIND));
+	params = emalloc((argc - start) * sizeof(MYSQLND_PARAM_BIND));
 	for (i = 0; i < (argc - start); i++) {
 		zend_uchar type;
 		switch (types[i]) {
@@ -190,7 +190,7 @@
 				/* We count parameters from 1 */
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Undefined fieldtype %c (parameter %d)",
types[i], i + start + 1);
 				ret = FAIL;
-				free(params);
+				efree(params);
 				goto end;
 		}
 		params[i].zv = *(args[i + start]);
@@ -1621,10 +1621,12 @@
 
 	MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_INITIALIZED);
 
+	/* set some required options */
+	flags |= CLIENT_MULTI_RESULTS; /* needed for mysql_multi_query() */
 	/* remove some insecure options */
 	flags &= ~CLIENT_MULTI_STATEMENTS;   /* don't allow multi_queries via connect
parameter */
 	if (PG(open_basedir) && PG(open_basedir)[0] != '\0') {
-		flags ^= CLIENT_LOCAL_FILES;
+		flags &= ~CLIENT_LOCAL_FILES;
 	}
 
 #if !defined(HAVE_MYSQLND)

Modified: branches/experimental/php5/ext/mysqli/mysqli_driver.c
===================================================================
--- branches/experimental/php5/ext/mysqli/mysqli_driver.c	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php5/ext/mysqli/mysqli_driver.c	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |

Modified: branches/experimental/php5/ext/mysqli/mysqli_embedded.c
===================================================================
--- branches/experimental/php5/ext/mysqli/mysqli_embedded.c	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php5/ext/mysqli/mysqli_embedded.c	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |

Modified: branches/experimental/php5/ext/mysqli/mysqli_exception.c
===================================================================
--- branches/experimental/php5/ext/mysqli/mysqli_exception.c	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php5/ext/mysqli/mysqli_exception.c	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |

Modified: branches/experimental/php5/ext/mysqli/mysqli_fe.c
===================================================================
--- branches/experimental/php5/ext/mysqli/mysqli_fe.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php5/ext/mysqli/mysqli_fe.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -15,7 +15,7 @@
   | Author: Georg Richter <georg@stripped>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.2 2007/10/05 21:23:56 andrey Exp $ 
+  $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.4 2007/12/31 07:17:10 sebastian Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -63,18 +63,6 @@
 	PHP_FE(mysqli_data_seek,							NULL)
 	PHP_FE(mysqli_dump_debug_info,						NULL)
 	PHP_FE(mysqli_debug,								NULL)
-#if !defined(HAVE_MYSQLND)
-	PHP_FE(mysqli_disable_reads_from_master,			NULL)
-	PHP_FE(mysqli_disable_rpl_parse,					NULL)
-	PHP_FE(mysqli_enable_reads_from_master,				NULL)
-	PHP_FE(mysqli_enable_rpl_parse,						NULL)
-	PHP_FE(mysqli_send_query,							NULL)
-	PHP_FE(mysqli_slave_query,							NULL)
-	PHP_FE(mysqli_master_query,							NULL)
-	PHP_FE(mysqli_rpl_parse_enabled,					NULL)
-	PHP_FE(mysqli_rpl_probe,							NULL)
-	PHP_FE(mysqli_rpl_query_type,						NULL)
-#endif
 #if defined(HAVE_EMBEDDED_MYSQLI)
 	PHP_FE(mysqli_embedded_server_end,					NULL)
 	PHP_FE(mysqli_embedded_server_start,				NULL)
@@ -205,17 +193,6 @@
 	PHP_FALIAS(connect,mysqli_connect,NULL)
 	PHP_FALIAS(dump_debug_info,mysqli_dump_debug_info,NULL)
 	PHP_FALIAS(debug,mysqli_debug,NULL)
-#if !defined(HAVE_MYSQLND)
-	PHP_FALIAS(disable_reads_from_master,mysqli_disable_reads_from_master,NULL)
-	PHP_FALIAS(disable_rpl_parse,mysqli_disable_rpl_parse,NULL)
-	PHP_FALIAS(enable_reads_from_master,mysqli_enable_reads_from_master,NULL)
-	PHP_FALIAS(enable_rpl_parse,mysqli_enable_rpl_parse,NULL)
-	PHP_FALIAS(rpl_parse_enabled,mysqli_rpl_parse_enabled,NULL)
-	PHP_FALIAS(rpl_probe,mysqli_rpl_probe,NULL)
-	PHP_FALIAS(rpl_query_type,mysqli_rpl_query_type,NULL)
-	PHP_FALIAS(master_query,mysqli_master_query,NULL)
-	PHP_FALIAS(slave_query,mysqli_slave_query,NULL)
-#endif
 #ifdef HAVE_MYSQLI_GET_CHARSET 
 	PHP_FALIAS(get_charset,mysqli_get_charset,NULL)
 #endif

Modified: branches/experimental/php5/ext/mysqli/mysqli_mysqlnd.h
===================================================================
--- branches/experimental/php5/ext/mysqli/mysqli_mysqlnd.h	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php5/ext/mysqli/mysqli_mysqlnd.h	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |

Modified: branches/experimental/php5/ext/mysqli/mysqli_nonapi.c
===================================================================
--- branches/experimental/php5/ext/mysqli/mysqli_nonapi.c	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php5/ext/mysqli/mysqli_nonapi.c	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.3 2007/11/09 11:06:07 andrey Exp $ 
+  $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.4 2007/12/31 07:17:10 sebastian Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H

Modified: branches/experimental/php5/ext/mysqli/mysqli_prop.c
===================================================================
--- branches/experimental/php5/ext/mysqli/mysqli_prop.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php5/ext/mysqli/mysqli_prop.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -15,7 +15,7 @@
   | Author: Georg Richter <georg@stripped>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.2 2007/10/16 12:55:05 andrey Exp $ 
+  $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.3 2007/12/31 07:17:10 sebastian Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H

Modified: branches/experimental/php5/ext/mysqli/mysqli_report.c
===================================================================
--- branches/experimental/php5/ext/mysqli/mysqli_report.c	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php5/ext/mysqli/mysqli_report.c	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -15,7 +15,7 @@
   | Author: Georg Richter <georg@stripped>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_report.c,v 1.11.2.2.2.2.2.1 2007/10/05 21:23:56 andrey Exp $ 
+  $Id: mysqli_report.c,v 1.11.2.2.2.2.2.2 2007/12/31 07:17:10 sebastian Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H

Modified: branches/experimental/php5/ext/mysqli/mysqli_report.h
===================================================================
--- branches/experimental/php5/ext/mysqli/mysqli_report.h	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php5/ext/mysqli/mysqli_report.h	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -15,7 +15,7 @@
   | Author: Georg Richter <georg@stripped>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_report.h,v 1.5.2.1.2.1 2007/01/01 09:36:03 sebastian Exp $
+  $Id: mysqli_report.h,v 1.5.2.1.2.1.2.1 2007/12/31 07:17:10 sebastian Exp $
 */
 
 #ifndef __HAVE_MYSQLI_PROFILER_H__

Modified: branches/experimental/php5/ext/mysqli/mysqli_warning.c
===================================================================
--- branches/experimental/php5/ext/mysqli/mysqli_warning.c	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php5/ext/mysqli/mysqli_warning.c	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |

Modified: branches/experimental/php5/ext/mysqli/php_mysqli.h
===================================================================
--- branches/experimental/php5/ext/mysqli/php_mysqli.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php5/ext/mysqli/php_mysqli.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: php_mysqli.h,v 1.54.2.7.2.6.2.3 2007/10/08 15:38:47 andrey Exp $ 
+  $Id: php_mysqli.h,v 1.54.2.7.2.6.2.4 2007/12/31 07:17:10 sebastian Exp $ 
 */
 
 #ifndef PHP_MYSQLI_H

Modified: branches/experimental/php5/ext/mysqli/php_mysqli_structs.h
===================================================================
--- branches/experimental/php5/ext/mysqli/php_mysqli_structs.h	2008-01-24 13:11:48 UTC
(rev 1211)
+++ branches/experimental/php5/ext/mysqli/php_mysqli_structs.h	2008-01-24 13:56:41 UTC
(rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -15,7 +15,7 @@
   | Author: Georg Richter <georg@stripped>                                |
   +----------------------------------------------------------------------+
 
-  $Id: php_mysqli_structs.h,v 1.4.2.4 2007/11/09 10:56:28 andrey Exp $ 
+  $Id: php_mysqli_structs.h,v 1.4.2.6 2007/12/31 07:17:10 sebastian Exp $ 
 */
 
 #ifndef PHP_MYSQLI_STRUCTS_H
@@ -403,11 +403,7 @@
 PHP_FUNCTION(mysqli_connect_error);
 PHP_FUNCTION(mysqli_data_seek);
 PHP_FUNCTION(mysqli_debug);
-PHP_FUNCTION(mysqli_disable_reads_from_master);
-PHP_FUNCTION(mysqli_disable_rpl_parse);
 PHP_FUNCTION(mysqli_dump_debug_info);
-PHP_FUNCTION(mysqli_enable_reads_from_master);
-PHP_FUNCTION(mysqli_enable_rpl_parse);
 PHP_FUNCTION(mysqli_errno);
 PHP_FUNCTION(mysqli_error);
 PHP_FUNCTION(mysqli_fetch_all);
@@ -440,7 +436,6 @@
 PHP_FUNCTION(mysqli_kill);
 PHP_FUNCTION(mysqli_set_local_infile_default);
 PHP_FUNCTION(mysqli_set_local_infile_handler);
-PHP_FUNCTION(mysqli_master_query);
 PHP_FUNCTION(mysqli_more_results);
 PHP_FUNCTION(mysqli_multi_query);
 PHP_FUNCTION(mysqli_next_result);
@@ -458,9 +453,6 @@
 PHP_FUNCTION(mysqli_real_escape_string);
 PHP_FUNCTION(mysqli_rollback);
 PHP_FUNCTION(mysqli_row_seek);
-PHP_FUNCTION(mysqli_rpl_parse_enabled);
-PHP_FUNCTION(mysqli_rpl_probe);
-PHP_FUNCTION(mysqli_rpl_query_type);
 PHP_FUNCTION(mysqli_select_db);
 PHP_FUNCTION(mysqli_stmt_attr_get);
 PHP_FUNCTION(mysqli_stmt_attr_set);
@@ -473,10 +465,8 @@
 PHP_FUNCTION(mysqli_stmt_fetch);
 PHP_FUNCTION(mysqli_stmt_param_count);
 PHP_FUNCTION(mysqli_stmt_send_long_data);
-PHP_FUNCTION(mysqli_send_query);
 PHP_FUNCTION(mysqli_embedded_server_end);
 PHP_FUNCTION(mysqli_embedded_server_start);
-PHP_FUNCTION(mysqli_slave_query);
 PHP_FUNCTION(mysqli_sqlstate);
 PHP_FUNCTION(mysqli_ssl_set);
 PHP_FUNCTION(mysqli_stat);

Modified: branches/experimental/php6/ext/mysql/config.w32
===================================================================
--- branches/experimental/php6/ext/mysql/config.w32	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php6/ext/mysql/config.w32	2008-01-24 13:56:41 UTC (rev 1212)
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.4 2007/10/23 10:44:25 andrey Exp $
+// $Id: config.w32,v 1.5 2008/01/19 18:56:19 andrey Exp $
 // vim:ft=javascript
 
 ARG_WITH("mysql", "MySQL support", "no");
 
 if (PHP_MYSQL != "no") {
-	if (PHP_MYSQLI != "mysqlnd") {
+	if (PHP_MYSQL != "mysqlnd") {
 		if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) &&
 			CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL",
 			PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) {

Modified: branches/experimental/php6/ext/mysql/mysql_mysqlnd.h
===================================================================
--- branches/experimental/php6/ext/mysql/mysql_mysqlnd.h	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php6/ext/mysql/mysql_mysqlnd.h	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |

Modified: branches/experimental/php6/ext/mysql/php_mysql.c
===================================================================
--- branches/experimental/php6/ext/mysql/php_mysql.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php6/ext/mysql/php_mysql.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 6                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
  
-/* $Id: php_mysql.c,v 1.247 2007/11/08 13:28:38 tony2001 Exp $ */
+/* $Id: php_mysql.c,v 1.249 2008/01/20 14:10:16 bjori Exp $ */
 
 /* TODO:
  *
@@ -646,7 +646,7 @@
 		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s&s&s&ll",
&host_and_port, &host_len, UG(utf8_conv),
 									&user, &user_len, UG(utf8_conv), &passwd, &passwd_len,
UG(utf8_conv),
 									&new_link, &client_flags)==FAILURE) {
-			WRONG_PARAM_COUNT;
+			return;
 		}
 
 		/* mysql_pconnect does not support new_link parameter */

Modified: branches/experimental/php6/ext/mysql/php_mysql.h
===================================================================
--- branches/experimental/php6/ext/mysql/php_mysql.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php6/ext/mysql/php_mysql.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_mysql.h,v 1.43 2007/10/16 20:58:35 andrey Exp $ */
+/* $Id: php_mysql.h,v 1.44 2007/12/31 07:12:11 sebastian Exp $ */
 
 #ifndef PHP_MYSQL_H
 #define PHP_MYSQL_H

Modified: branches/experimental/php6/ext/mysql/php_mysql_structs.h
===================================================================
--- branches/experimental/php6/ext/mysql/php_mysql_structs.h	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php6/ext/mysql/php_mysql_structs.h	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
+   | Copyright (c) 1997-2008 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_mysql_structs.h,v 1.2 2007/10/16 20:58:35 andrey Exp $ */
+/* $Id: php_mysql_structs.h,v 1.3 2007/12/31 07:12:11 sebastian Exp $ */
 
 #ifndef PHP_MYSQL_STRUCTS_H
 #define PHP_MYSQL_STRUCTS_H

Modified: branches/experimental/php6/ext/mysqli/config.m4
===================================================================
--- branches/experimental/php6/ext/mysqli/config.m4	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php6/ext/mysqli/config.m4	2008-01-24 13:56:41 UTC (rev 1212)
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.29 2007/07/27 01:09:18 jani Exp $
+dnl $Id: config.m4,v 1.30 2007/12/28 15:38:23 andrey Exp $
 dnl config.m4 for extension mysqli
 
 PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -61,8 +61,6 @@
   ],[
     $MYSQLI_LIBLINE
   ])
-
-  mysqli_extra_sources="$mysqli_extra_sources mysqli_repl.c"
 fi
 
 dnl Build extension

Modified: branches/experimental/php6/ext/mysqli/config.w32
===================================================================
--- branches/experimental/php6/ext/mysqli/config.w32	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php6/ext/mysqli/config.w32	2008-01-24 13:56:41 UTC (rev 1212)
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10 2007/10/23 10:44:25 andrey Exp $
+// $Id: config.w32,v 1.11 2007/12/28 15:38:23 andrey Exp $
 // vim:ft=javascript
 
 // Note: The extension name is "mysqli", you enable it with "--with-mysqli".
@@ -26,9 +26,7 @@
 			CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + 
 										"\\include;" + PHP_PHP_BUILD +
 										"\\include\\mysql;" + PHP_MYSQLI)) {
-			// No "mysqli_repl.c" when using "mysqlnd"
-			mysqli_extra_sources = "mysqli_repl.c";
-			EXTENSION("mysqli", mysqli_source + " " + mysqli_extra_sources);
+			EXTENSION("mysqli", mysqli_source);
 			AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
 		} else {
 			WARNING("mysqli not enabled; libraries and headers not found");

Modified: branches/experimental/php6/ext/mysqli/mysqli.c
===================================================================
--- branches/experimental/php6/ext/mysqli/mysqli.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php6/ext/mysqli/mysqli.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli.c,v 1.113 2007/11/09 12:13:15 andrey Exp $ 
+  $Id: mysqli.c,v 1.115 2008/01/03 14:32:52 johannes Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -757,13 +757,6 @@
 
 	REGISTER_LONG_CONSTANT("MYSQLI_SET_CHARSET_NAME", MYSQL_SET_CHARSET_NAME, CONST_CS |
CONST_PERSISTENT);
 
-	/* replication */
-#if !defined(HAVE_MYSQLND)
-	REGISTER_LONG_CONSTANT("MYSQLI_RPL_MASTER", MYSQL_RPL_MASTER, CONST_CS |
CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("MYSQLI_RPL_SLAVE", MYSQL_RPL_SLAVE, CONST_CS |
CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("MYSQLI_RPL_ADMIN", MYSQL_RPL_ADMIN, CONST_CS |
CONST_PERSISTENT);
-#endif
-	
 	/* bind support */
 	REGISTER_LONG_CONSTANT("MYSQLI_NO_DATA", MYSQL_NO_DATA, CONST_CS | CONST_PERSISTENT);
 #ifdef MYSQL_DATA_TRUNCATED

Modified: branches/experimental/php6/ext/mysqli/mysqli_api.c
===================================================================
--- branches/experimental/php6/ext/mysqli/mysqli_api.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php6/ext/mysqli/mysqli_api.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_api.c,v 1.155 2007/11/09 12:13:15 andrey Exp $ 
+  $Id: mysqli_api.c,v 1.157 2007/12/31 07:12:11 sebastian Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -166,7 +166,7 @@
 	if (argc == start) {
 		return PASS;
 	}
-	params = malloc((argc - start) * sizeof(MYSQLND_PARAM_BIND));
+	params = emalloc((argc - start) * sizeof(MYSQLND_PARAM_BIND));
 	for (i = 0; i < (argc - start); i++) {
 		zend_uchar type;
 		switch (types[i]) {
@@ -190,7 +190,7 @@
 				/* We count parameters from 1 */
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Undefined fieldtype %c (parameter %d)",
types[i], i + start + 1);
 				ret = FAIL;
-				free(params);
+				efree(params);
 				goto end;
 		}
 		params[i].zv = *(args[i + start]);
@@ -1696,6 +1696,8 @@
 
 	MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_INITIALIZED);
 
+	/* set some required options */
+	flags |= CLIENT_MULTI_RESULTS; /* needed for mysql_multi_query() */
 	/* remove some insecure options */
 	flags &= ~CLIENT_MULTI_STATEMENTS;   /* don't allow multi_queries via connect
parameter */
 	if (PG(open_basedir) && PG(open_basedir)[0] != '\0') {

Modified: branches/experimental/php6/ext/mysqli/mysqli_driver.c
===================================================================
--- branches/experimental/php6/ext/mysqli/mysqli_driver.c	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php6/ext/mysqli/mysqli_driver.c	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: mysqli_driver.c,v 1.13 2007/10/02 10:43:09 andrey Exp $ */
+/* $Id: mysqli_driver.c,v 1.14 2007/12/31 07:12:11 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

Modified: branches/experimental/php6/ext/mysqli/mysqli_embedded.c
===================================================================
--- branches/experimental/php6/ext/mysqli/mysqli_embedded.c	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php6/ext/mysqli/mysqli_embedded.c	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |

Modified: branches/experimental/php6/ext/mysqli/mysqli_exception.c
===================================================================
--- branches/experimental/php6/ext/mysqli/mysqli_exception.c	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php6/ext/mysqli/mysqli_exception.c	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |

Modified: branches/experimental/php6/ext/mysqli/mysqli_fe.c
===================================================================
--- branches/experimental/php6/ext/mysqli/mysqli_fe.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php6/ext/mysqli/mysqli_fe.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_fe.c,v 1.58 2007/10/02 10:43:09 andrey Exp $ 
+  $Id: mysqli_fe.c,v 1.60 2007/12/31 07:12:11 sebastian Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -65,18 +65,6 @@
 	PHP_FE(mysqli_data_seek,							NULL)
 	PHP_FE(mysqli_dump_debug_info,						NULL)
 	PHP_FE(mysqli_debug,								NULL)
-#if !defined(HAVE_MYSQLND)
-	PHP_FE(mysqli_disable_reads_from_master,			NULL)
-	PHP_FE(mysqli_disable_rpl_parse,					NULL)
-	PHP_FE(mysqli_enable_reads_from_master,				NULL)
-	PHP_FE(mysqli_enable_rpl_parse,						NULL)
-	PHP_FE(mysqli_send_query,							NULL)
-	PHP_FE(mysqli_slave_query,							NULL)
-	PHP_FE(mysqli_master_query,							NULL)
-	PHP_FE(mysqli_rpl_parse_enabled,					NULL)
-	PHP_FE(mysqli_rpl_probe,							NULL)
-	PHP_FE(mysqli_rpl_query_type,						NULL)
-#endif
 #if defined(HAVE_EMBEDDED_MYSQLI)
 	PHP_FE(mysqli_embedded_server_end,					NULL)
 	PHP_FE(mysqli_embedded_server_start,				NULL)
@@ -207,17 +195,6 @@
 	PHP_FALIAS(connect,mysqli_connect,NULL)
 	PHP_FALIAS(dump_debug_info,mysqli_dump_debug_info,NULL)
 	PHP_FALIAS(debug,mysqli_debug,NULL)
-#if !defined(HAVE_MYSQLND)
-	PHP_FALIAS(disable_reads_from_master,mysqli_disable_reads_from_master,NULL)
-	PHP_FALIAS(disable_rpl_parse,mysqli_disable_rpl_parse,NULL)
-	PHP_FALIAS(enable_reads_from_master,mysqli_enable_reads_from_master,NULL)
-	PHP_FALIAS(enable_rpl_parse,mysqli_enable_rpl_parse,NULL)
-	PHP_FALIAS(rpl_parse_enabled,mysqli_rpl_parse_enabled,NULL)
-	PHP_FALIAS(rpl_probe,mysqli_rpl_probe,NULL)
-	PHP_FALIAS(rpl_query_type,mysqli_rpl_query_type,NULL)
-	PHP_FALIAS(master_query,mysqli_master_query,NULL)
-	PHP_FALIAS(slave_query,mysqli_slave_query,NULL)
-#endif
 #ifdef HAVE_MYSQLI_GET_CHARSET 
 	PHP_FALIAS(get_charset,mysqli_get_charset,NULL)
 #endif

Modified: branches/experimental/php6/ext/mysqli/mysqli_mysqlnd.h
===================================================================
--- branches/experimental/php6/ext/mysqli/mysqli_mysqlnd.h	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php6/ext/mysqli/mysqli_mysqlnd.h	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2007 The PHP Group                                |
+  | Copyright (c) 2006-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |

Modified: branches/experimental/php6/ext/mysqli/mysqli_nonapi.c
===================================================================
--- branches/experimental/php6/ext/mysqli/mysqli_nonapi.c	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php6/ext/mysqli/mysqli_nonapi.c	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_nonapi.c,v 1.74 2007/11/09 12:13:15 andrey Exp $ 
+  $Id: mysqli_nonapi.c,v 1.75 2007/12/31 07:12:11 sebastian Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H

Modified: branches/experimental/php6/ext/mysqli/mysqli_prop.c
===================================================================
--- branches/experimental/php6/ext/mysqli/mysqli_prop.c	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php6/ext/mysqli/mysqli_prop.c	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_prop.c,v 1.33 2007/10/16 12:55:38 andrey Exp $ 
+  $Id: mysqli_prop.c,v 1.34 2007/12/31 07:12:11 sebastian Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H

Modified: branches/experimental/php6/ext/mysqli/mysqli_report.c
===================================================================
--- branches/experimental/php6/ext/mysqli/mysqli_report.c	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php6/ext/mysqli/mysqli_report.c	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_report.c,v 1.17 2007/07/24 16:13:26 andrey Exp $ 
+  $Id: mysqli_report.c,v 1.18 2007/12/31 07:12:11 sebastian Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H

Modified: branches/experimental/php6/ext/mysqli/mysqli_report.h
===================================================================
--- branches/experimental/php6/ext/mysqli/mysqli_report.h	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php6/ext/mysqli/mysqli_report.h	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -15,7 +15,7 @@
   | Author: Georg Richter <georg@stripped>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_report.h,v 1.7 2007/01/01 09:29:26 sebastian Exp $
+  $Id: mysqli_report.h,v 1.8 2007/12/31 07:12:11 sebastian Exp $
 */
 
 #ifndef __HAVE_MYSQLI_PROFILER_H__

Modified: branches/experimental/php6/ext/mysqli/mysqli_warning.c
===================================================================
--- branches/experimental/php6/ext/mysqli/mysqli_warning.c	2008-01-24 13:11:48 UTC (rev
1211)
+++ branches/experimental/php6/ext/mysqli/mysqli_warning.c	2008-01-24 13:56:41 UTC (rev
1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_warning.c,v 1.15 2007/10/02 10:43:09 andrey Exp $ 
+  $Id: mysqli_warning.c,v 1.16 2007/12/31 07:12:11 sebastian Exp $ 
 */
 #ifdef HAVE_CONFIG_H
 #include "config.h"

Modified: branches/experimental/php6/ext/mysqli/php_mysqli.h
===================================================================
--- branches/experimental/php6/ext/mysqli/php_mysqli.h	2008-01-24 13:11:48 UTC (rev 1211)
+++ branches/experimental/php6/ext/mysqli/php_mysqli.h	2008-01-24 13:56:41 UTC (rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: php_mysqli.h,v 1.67 2007/10/08 15:40:26 andrey Exp $ 
+  $Id: php_mysqli.h,v 1.68 2007/12/31 07:12:11 sebastian Exp $ 
 */
 
 #ifndef PHP_MYSQLI_H

Modified: branches/experimental/php6/ext/mysqli/php_mysqli_structs.h
===================================================================
--- branches/experimental/php6/ext/mysqli/php_mysqli_structs.h	2008-01-24 13:11:48 UTC
(rev 1211)
+++ branches/experimental/php6/ext/mysqli/php_mysqli_structs.h	2008-01-24 13:56:41 UTC
(rev 1212)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 6                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
+  | Copyright (c) 1997-2008 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -15,7 +15,7 @@
   | Author: Georg Richter <georg@stripped>                                |
   +----------------------------------------------------------------------+
 
-  $Id: php_mysqli_structs.h,v 1.6 2007/11/09 12:13:15 andrey Exp $ 
+  $Id: php_mysqli_structs.h,v 1.8 2007/12/31 07:12:11 sebastian Exp $ 
 */
 
 #ifndef PHP_MYSQLI_STRUCTS_H
@@ -416,11 +416,7 @@
 PHP_FUNCTION(mysqli_connect_error);
 PHP_FUNCTION(mysqli_data_seek);
 PHP_FUNCTION(mysqli_debug);
-PHP_FUNCTION(mysqli_disable_reads_from_master);
-PHP_FUNCTION(mysqli_disable_rpl_parse);
 PHP_FUNCTION(mysqli_dump_debug_info);
-PHP_FUNCTION(mysqli_enable_reads_from_master);
-PHP_FUNCTION(mysqli_enable_rpl_parse);
 PHP_FUNCTION(mysqli_errno);
 PHP_FUNCTION(mysqli_error);
 PHP_FUNCTION(mysqli_fetch_all);
@@ -453,7 +449,6 @@
 PHP_FUNCTION(mysqli_kill);
 PHP_FUNCTION(mysqli_set_local_infile_default);
 PHP_FUNCTION(mysqli_set_local_infile_handler);
-PHP_FUNCTION(mysqli_master_query);
 PHP_FUNCTION(mysqli_more_results);
 PHP_FUNCTION(mysqli_multi_query);
 PHP_FUNCTION(mysqli_next_result);
@@ -471,9 +466,6 @@
 PHP_FUNCTION(mysqli_real_escape_string);
 PHP_FUNCTION(mysqli_rollback);
 PHP_FUNCTION(mysqli_row_seek);
-PHP_FUNCTION(mysqli_rpl_parse_enabled);
-PHP_FUNCTION(mysqli_rpl_probe);
-PHP_FUNCTION(mysqli_rpl_query_type);
 PHP_FUNCTION(mysqli_select_db);
 PHP_FUNCTION(mysqli_stmt_attr_get);
 PHP_FUNCTION(mysqli_stmt_attr_set);
@@ -486,10 +478,8 @@
 PHP_FUNCTION(mysqli_stmt_fetch);
 PHP_FUNCTION(mysqli_stmt_param_count);
 PHP_FUNCTION(mysqli_stmt_send_long_data);
-PHP_FUNCTION(mysqli_send_query);
 PHP_FUNCTION(mysqli_embedded_server_end);
 PHP_FUNCTION(mysqli_embedded_server_start);
-PHP_FUNCTION(mysqli_slave_query);
 PHP_FUNCTION(mysqli_sqlstate);
 PHP_FUNCTION(mysqli_ssl_set);
 PHP_FUNCTION(mysqli_stat);

Thread
PHP mysqlnd svn commit: r1212 - in branches/experimental: mysqlnd php5/ext/mysql php5/ext/mysqli php6/ext/mysql php6/ext/mysqliahristov24 Jan