Update prepare() prototype.

Attempt to hunt down the cause of a build warning under win32 by adjust the
name of the error function.

diff --git a/ext/pdo_mysql/CREDITS b/ext/pdo_mysql/CREDITS
new file mode 100755 (executable)
index 0000000..0735d9a
--- /dev/null
+++ b/ext/pdo_mysql/CREDITS
@@ -0,0 +1,2 @@
+mySQL 3.x driver for PDO
+George Schlossnagle

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index e217654933fe4dfdd4a4311af1a1329004228c70..948ee5e7d7efa9ceee27e2e9844a406aff6a9e54 100755 (executable)
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -30,7 +30,7 @@
 #include "php_pdo_mysql.h"
 #include "php_pdo_mysql_int.h"
 
-int _mysql_error(char *what, int errno, const char *file, int line TSRMLS_DC) /* {{{ */
+int _pdo_mysql_error(char *what, int errno, const char *file, int line TSRMLS_DC) /* {{{ */
 {
        switch (errno) {
                default:
@@ -59,7 +59,7 @@ static int mysql_handle_closer(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
 }
 /* }}} */
 
-static int mysql_handle_preparer(pdo_dbh_t *dbh, const char *sql, long sql_len, pdo_stmt_t *stmt TSRMLS_DC)
+static int mysql_handle_preparer(pdo_dbh_t *dbh, const char *sql, long sql_len, pdo_stmt_t *stmt, long options, zval *driver_options TSRMLS_DC)
 {
        pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data;
        pdo_mysql_stmt *S = ecalloc(1, sizeof(pdo_mysql_stmt));

diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h
index 057089832dce62f79a4ba95913cac5d9b8a1de7f..f66eb3cdf0d9ed370b1c0c2291c8da59916f74e8 100755 (executable)
--- a/ext/pdo_mysql/php_pdo_mysql_int.h
+++ b/ext/pdo_mysql/php_pdo_mysql_int.h
@@ -26,7 +26,7 @@
 /* stuff we use in a mySQL database handle */
 typedef struct {
        MYSQL           *server;
-       unsigned int    last_err;
+       int     last_err;
        unsigned attached:1;
        unsigned _reserved:31;
 } pdo_mysql_db_handle;
@@ -53,8 +53,8 @@ typedef struct {
 
 extern pdo_driver_t pdo_mysql_driver;
 
-extern int _mysql_error(char *what, int errno, const char *file, int line TSRMLS_DC);
-#define pdo_mysql_error(w,s)   _mysql_error(w, s, __FILE__, __LINE__ TSRMLS_CC)
+extern int _pdo_mysql_error(char *what, int errno, const char *file, int line TSRMLS_DC);
+#define pdo_mysql_error(w,s)   _pdo_mysql_error(w, s, __FILE__, __LINE__ TSRMLS_CC)
 extern int mysql_handle_error(pdo_dbh_t *dbh, pdo_mysql_db_handle *H, int errcode);
 
 extern struct pdo_stmt_methods mysql_stmt_methods;