[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2008-12-30 Thread Ilia Alshanetsky 
iliaa   Tue Dec 30 19:11:21 2008 UTC

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  
  MFB: Fixed bug #46964 (Fixed pdo_mysql build with older version of MySQL).
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.84r2=1.85diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.84 
php-src/ext/pdo_mysql/mysql_driver.c:1.85
--- php-src/ext/pdo_mysql/mysql_driver.c:1.84   Mon Oct 27 18:29:56 2008
+++ php-src/ext/pdo_mysql/mysql_driver.cTue Dec 30 19:11:21 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.84 2008/10/27 18:29:56 johannes Exp $ */
+/* $Id: mysql_driver.c,v 1.85 2008/12/30 19:11:21 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -657,12 +657,12 @@
{
local_infile = 0;
}
-
+#ifdef MYSQL_OPT_LOCAL_INFILE
if (mysql_options(H-server, MYSQL_OPT_LOCAL_INFILE, (const 
char *)local_infile)) {
pdo_mysql_error(dbh);
goto cleanup;
}
-
+#endif
 #ifdef MYSQL_OPT_RECONNECT
/* since 5.0.3, the default for this option is 0 if not 
specified.
 * we want the old behaviour */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c pdo_mysql.c php_pdo_mysql_int.h /ext/pdo_mysql/tests pdo_mysql_class_constants.phpt

2008-10-27 Thread Johannes Schlüter 
johannesMon Oct 27 18:29:57 2008 UTC

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c pdo_mysql.c 
php_pdo_mysql_int.h 
/php-src/ext/pdo_mysql/testspdo_mysql_class_constants.phpt 
  Log:
  Fix #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.83r2=1.84diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.83 
php-src/ext/pdo_mysql/mysql_driver.c:1.84
--- php-src/ext/pdo_mysql/mysql_driver.c:1.83   Tue Oct 14 19:00:11 2008
+++ php-src/ext/pdo_mysql/mysql_driver.cMon Oct 27 18:29:56 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.83 2008/10/14 19:00:11 johannes Exp $ */
+/* $Id: mysql_driver.c,v 1.84 2008/10/27 18:29:56 johannes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -636,6 +636,14 @@
H-max_buffer_size = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_MAX_BUFFER_SIZE, H-max_buffer_size TSRMLS_CC);
 #endif
 
+   if (pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_FOUND_ROWS, 0 
TSRMLS_CC)) {
+   connect_opts |= CLIENT_FOUND_ROWS;
+   }
+
+   if (pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_IGNORE_SPACE, 
0 TSRMLS_CC)) {
+   connect_opts |= CLIENT_IGNORE_SPACE;
+   }
+
if (mysql_options(H-server, MYSQL_OPT_CONNECT_TIMEOUT, (const 
char *)connect_timeout)) {
pdo_mysql_error(dbh);
goto cleanup;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/pdo_mysql.c?r1=1.22r2=1.23diff_format=u
Index: php-src/ext/pdo_mysql/pdo_mysql.c
diff -u php-src/ext/pdo_mysql/pdo_mysql.c:1.22 
php-src/ext/pdo_mysql/pdo_mysql.c:1.23
--- php-src/ext/pdo_mysql/pdo_mysql.c:1.22  Tue Oct 14 19:00:11 2008
+++ php-src/ext/pdo_mysql/pdo_mysql.c   Mon Oct 27 18:29:56 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: pdo_mysql.c,v 1.22 2008/10/14 19:00:11 johannes Exp $ */
+/* $Id: pdo_mysql.c,v 1.23 2008/10/27 18:29:56 johannes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -83,6 +83,8 @@
REGISTER_PDO_CLASS_CONST_LONG(MYSQL_ATTR_COMPRESS, 
(long)PDO_MYSQL_ATTR_COMPRESS);
 #endif
REGISTER_PDO_CLASS_CONST_LONG(MYSQL_ATTR_DIRECT_QUERY, 
(long)PDO_MYSQL_ATTR_DIRECT_QUERY);
+   REGISTER_PDO_CLASS_CONST_LONG(MYSQL_ATTR_FOUND_ROWS, 
(long)PDO_MYSQL_ATTR_FOUND_ROWS);
+   REGISTER_PDO_CLASS_CONST_LONG(MYSQL_ATTR_IGNORE_SPACE, 
(long)PDO_MYSQL_ATTR_IGNORE_SPACE);
 
 #ifdef PDO_USE_MYSQLND
pdo_mysqlnd_zval_cache = 
mysqlnd_palloc_init_cache(PDO_MYSQL_G(cache_size));
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/php_pdo_mysql_int.h?r1=1.25r2=1.26diff_format=u
Index: php-src/ext/pdo_mysql/php_pdo_mysql_int.h
diff -u php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.25 
php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.26
--- php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.25  Tue Oct 14 19:00:11 2008
+++ php-src/ext/pdo_mysql/php_pdo_mysql_int.h   Mon Oct 27 18:29:56 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: php_pdo_mysql_int.h,v 1.25 2008/10/14 19:00:11 johannes Exp $ */
+/* $Id: php_pdo_mysql_int.h,v 1.26 2008/10/27 18:29:56 johannes Exp $ */
 
 #ifndef PHP_PDO_MYSQL_INT_H
 #define PHP_PDO_MYSQL_INT_H
@@ -161,6 +161,8 @@
PDO_MYSQL_ATTR_COMPRESS,
 #endif
PDO_MYSQL_ATTR_DIRECT_QUERY,
+   PDO_MYSQL_ATTR_FOUND_ROWS,
+   PDO_MYSQL_ATTR_IGNORE_SPACE
 };
 
 #endif
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt:1.2 
php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt:1.3
--- php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt:1.2  Tue Oct 
14 19:00:11 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt  Mon Oct 27 
18:29:57 2008
@@ -12,6 +12,8 @@
'MYSQL_ATTR_USE_BUFFERED_QUERY' = true,
'MYSQL_ATTR_LOCAL_INFILE'   
= true,
'MYSQL_ATTR_DIRECT_QUERY'   
= true,
+   'MYSQL_ATTR_FOUND_ROWS' 
= true,
+   'MYSQL_ATTR_IGNORE_SPACE'   
= true,
);
 
if (!MySQLPDOTest::isPDOMySQLnd()) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c pdo_mysql.c php_pdo_mysql_int.h /ext/pdo_mysql/tests pdo_mysql_class_constants.phpt

2008-10-14 Thread Johannes Schlüter 
johannesTue Oct 14 19:00:11 2008 UTC

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c pdo_mysql.c 
php_pdo_mysql_int.h 
/php-src/ext/pdo_mysql/testspdo_mysql_class_constants.phpt 
  Log:
  Add PDO::MYSQL_ATTR_COMPRESS connection flag
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.82r2=1.83diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.82 
php-src/ext/pdo_mysql/mysql_driver.c:1.83
--- php-src/ext/pdo_mysql/mysql_driver.c:1.82   Sun Aug  3 12:12:38 2008
+++ php-src/ext/pdo_mysql/mysql_driver.cTue Oct 14 19:00:11 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.82 2008/08/03 12:12:38 jani Exp $ */
+/* $Id: mysql_driver.c,v 1.83 2008/10/14 19:00:11 johannes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -623,6 +623,7 @@
long local_infile = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_LOCAL_INFILE, 0 TSRMLS_CC);
 #ifndef PDO_USE_MYSQLND
char *init_cmd = NULL, *default_file = NULL, *default_group = 
NULL;
+   long compress = 0;
 #endif
H-buffered = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 1 TSRMLS_CC);
 
@@ -692,6 +693,14 @@
}
efree(default_group);
}
+
+   compress = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_COMPRESS, 0 TSRMLS_CC);
+   if (compress) {
+   if (mysql_options(H-server, MYSQL_OPT_COMPRESS, 0)) {
+   pdo_mysql_error(dbh);
+   goto cleanup;
+   }
+   }
 #endif
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/pdo_mysql.c?r1=1.21r2=1.22diff_format=u
Index: php-src/ext/pdo_mysql/pdo_mysql.c
diff -u php-src/ext/pdo_mysql/pdo_mysql.c:1.21 
php-src/ext/pdo_mysql/pdo_mysql.c:1.22
--- php-src/ext/pdo_mysql/pdo_mysql.c:1.21  Mon Sep 29 21:20:36 2008
+++ php-src/ext/pdo_mysql/pdo_mysql.c   Tue Oct 14 19:00:11 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: pdo_mysql.c,v 1.21 2008/09/29 21:20:36 johannes Exp $ */
+/* $Id: pdo_mysql.c,v 1.22 2008/10/14 19:00:11 johannes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -80,6 +80,7 @@
REGISTER_PDO_CLASS_CONST_LONG(MYSQL_ATTR_INIT_COMMAND, 
(long)PDO_MYSQL_ATTR_INIT_COMMAND);
REGISTER_PDO_CLASS_CONST_LONG(MYSQL_ATTR_READ_DEFAULT_FILE, 
(long)PDO_MYSQL_ATTR_READ_DEFAULT_FILE);
REGISTER_PDO_CLASS_CONST_LONG(MYSQL_ATTR_READ_DEFAULT_GROUP, 
(long)PDO_MYSQL_ATTR_READ_DEFAULT_GROUP);
+   REGISTER_PDO_CLASS_CONST_LONG(MYSQL_ATTR_COMPRESS, 
(long)PDO_MYSQL_ATTR_COMPRESS);
 #endif
REGISTER_PDO_CLASS_CONST_LONG(MYSQL_ATTR_DIRECT_QUERY, 
(long)PDO_MYSQL_ATTR_DIRECT_QUERY);
 
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/php_pdo_mysql_int.h?r1=1.24r2=1.25diff_format=u
Index: php-src/ext/pdo_mysql/php_pdo_mysql_int.h
diff -u php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.24 
php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.25
--- php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.24  Mon Jul 21 13:05:51 2008
+++ php-src/ext/pdo_mysql/php_pdo_mysql_int.h   Tue Oct 14 19:00:11 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: php_pdo_mysql_int.h,v 1.24 2008/07/21 13:05:51 johannes Exp $ */
+/* $Id: php_pdo_mysql_int.h,v 1.25 2008/10/14 19:00:11 johannes Exp $ */
 
 #ifndef PHP_PDO_MYSQL_INT_H
 #define PHP_PDO_MYSQL_INT_H
@@ -158,6 +158,7 @@
PDO_MYSQL_ATTR_READ_DEFAULT_FILE,
PDO_MYSQL_ATTR_READ_DEFAULT_GROUP,
PDO_MYSQL_ATTR_MAX_BUFFER_SIZE,
+   PDO_MYSQL_ATTR_COMPRESS,
 #endif
PDO_MYSQL_ATTR_DIRECT_QUERY,
 };
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt:1.1 
php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt:1.2
--- php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt:1.1  Mon Jul 
21 13:05:51 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt  Tue Oct 14 
19:00:11 2008
@@ -19,7 +19,7 @@
$expected['MYSQL_ATTR_INIT_COMMAND']
= true;
$expected['MYSQL_ATTR_READ_DEFAULT_FILE']   = true;
$expected['MYSQL_ATTR_READ_DEFAULT_GROUP']  = true;
-
+   $expected['MYSQL_ATTR_COMPRESS']= true;
}
 
/*
@@ -75,4 +75,4 @@
 
print done!;
 --EXPECT--
-done!
\ No newline at end of file
+done!



-- 
PHP CVS Mailing List (http://www.php.net/)
To

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c /ext/pdo_oci oci_driver.c /ext/pdo_odbc odbc_driver.c /ext/sqlite pdo_sqlite2.c

2006-12-09 Thread Pierre-Alain Joye 
pajoye  Sun Dec 10 03:12:11 2006 UTC

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
/php-src/ext/pdo_ocioci_driver.c 
/php-src/ext/pdo_odbc   odbc_driver.c 
/php-src/ext/sqlite pdo_sqlite2.c 
  Log:
  - build fix the other driver as well (a macro would be nicer)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.75r2=1.76diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.75 
php-src/ext/pdo_mysql/mysql_driver.c:1.76
--- php-src/ext/pdo_mysql/mysql_driver.c:1.75   Sun Dec  3 23:30:24 2006
+++ php-src/ext/pdo_mysql/mysql_driver.cSun Dec 10 03:12:11 2006
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.75 2006/12/03 23:30:24 iliaa Exp $ */
+/* $Id: mysql_driver.c,v 1.76 2006/12/10 03:12:11 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -97,8 +97,13 @@
 #endif
 
if (!dbh-methods) {
+#if PHP_VERSION_ID  50200
+   zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, 
SQLSTATE[%s] [%d] %s,
+   *pdo_err, einfo-errcode, einfo-errmsg);
+#else
zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0 
TSRMLS_CC, SQLSTATE[%s] [%d] %s,
*pdo_err, einfo-errcode, einfo-errmsg);
+#endif
}
 /* printf(** [%s:%d] %s %s\n, file, line, *pdo_err, einfo-errmsg); */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_driver.c?r1=1.29r2=1.30diff_format=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.29 
php-src/ext/pdo_oci/oci_driver.c:1.30
--- php-src/ext/pdo_oci/oci_driver.c:1.29   Sun Jan  1 13:09:53 2006
+++ php-src/ext/pdo_oci/oci_driver.cSun Dec 10 03:12:11 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_driver.c,v 1.29 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: oci_driver.c,v 1.30 2006/12/10 03:12:11 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -158,7 +158,11 @@
 
/* little mini hack so that we can use this code from the dbh ctor */
if (!dbh-methods) {
+#if PHP_VERSION_ID  50200
+   zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, 
SQLSTATE[%s]: %s, *pdo_err, einfo-errmsg);
+#else
zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0 
TSRMLS_CC, SQLSTATE[%s]: %s, *pdo_err, einfo-errmsg);
+#endif
}
 
return einfo-errcode;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_odbc/odbc_driver.c?r1=1.28r2=1.29diff_format=u
Index: php-src/ext/pdo_odbc/odbc_driver.c
diff -u php-src/ext/pdo_odbc/odbc_driver.c:1.28 
php-src/ext/pdo_odbc/odbc_driver.c:1.29
--- php-src/ext/pdo_odbc/odbc_driver.c:1.28 Fri Aug 12 23:32:31 2005
+++ php-src/ext/pdo_odbc/odbc_driver.c  Sun Dec 10 03:12:11 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: odbc_driver.c,v 1.28 2005/08/12 23:32:31 wez Exp $ */
+/* $Id: odbc_driver.c,v 1.29 2006/12/10 03:12:11 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -87,8 +87,13 @@
strcpy(*pdo_err, einfo-last_state);
 /* printf(@@ SQLSTATE[%s] %s\n, *pdo_err, einfo-last_err_msg); */
if (!dbh-methods) {
+#if PHP_VERSION_ID  50200
+   zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, 
SQLSTATE[%s] %s: %d %s,
+   *pdo_err, what, einfo-last_error, 
einfo-last_err_msg);
+#else
zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0 
TSRMLS_CC, SQLSTATE[%s] %s: %d %s,
*pdo_err, what, einfo-last_error, 
einfo-last_err_msg);
+#endif
}
 }
 /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/pdo_sqlite2.c?r1=1.12r2=1.13diff_format=u
Index: php-src/ext/sqlite/pdo_sqlite2.c
diff -u php-src/ext/sqlite/pdo_sqlite2.c:1.12 
php-src/ext/sqlite/pdo_sqlite2.c:1.13
--- php-src/ext/sqlite/pdo_sqlite2.c:1.12   Sat Sep 16 18:23:05 2006
+++ php-src/ext/sqlite/pdo_sqlite2.cSun Dec 10 03:12:11 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pdo_sqlite2.c,v 1.12 2006/09/16 18:23:05 iliaa Exp $ */
+/* $Id: pdo_sqlite2.c,v 1.13 2006/12/10 03:12:11 pajoye Exp $ */
 #ifdef HAVE_CONFIG_H
 #include config.h
 #endif
@@ -288,8 +288,13 @@
}
 
if (!dbh-methods) {
+#if PHP_VERSION_ID  50200
+   zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, 
SQLSTATE[%s] [%d] %s,
+   *pdo_err, einfo-errcode, einfo-errmsg);
+#else
zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0 
TSRMLS_CC, SQLSTATE[%s] [%d] %s,
*pdo_err, einfo-errcode, einfo-errmsg);
+#endif
}
 
return einfo-errcode;

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2006-12-03 Thread Ilia Alshanetsky 
iliaa   Sun Dec  3 23:30:24 2006 UTC

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  MFB:
Default to buffered queries (much faster)
Default to prepared statement emulation to avoid hitting MySQL bugs
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.74r2=1.75diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.74 
php-src/ext/pdo_mysql/mysql_driver.c:1.75
--- php-src/ext/pdo_mysql/mysql_driver.c:1.74   Mon Oct  2 22:07:58 2006
+++ php-src/ext/pdo_mysql/mysql_driver.cSun Dec  3 23:30:24 2006
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.74 2006/10/02 22:07:58 tony2001 Exp $ */
+/* $Id: mysql_driver.c,v 1.75 2006/12/03 23:30:24 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -467,8 +467,8 @@
long local_infile = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_LOCAL_INFILE, 0 TSRMLS_CC);
char *init_cmd = NULL, *default_file = NULL, *default_group = 
NULL;
 
-   H-buffered = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 0 TSRMLS_CC);
-   H-emulate_prepare = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_DIRECT_QUERY, 0 TSRMLS_CC);
+   H-buffered = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 1 TSRMLS_CC);
+   H-emulate_prepare = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_DIRECT_QUERY, 1 TSRMLS_CC);
H-max_buffer_size = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_MAX_BUFFER_SIZE, H-max_buffer_size TSRMLS_CC);
 
if (mysql_options(H-server, MYSQL_OPT_CONNECT_TIMEOUT, (const 
char *)connect_timeout)) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2006-10-02 Thread Antony Dovgal 
tony2001Mon Oct  2 22:07:58 2006 UTC

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  fix #38996 (PDO_MYSQL doesn't check connections for liveness)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.73r2=1.74diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.73 
php-src/ext/pdo_mysql/mysql_driver.c:1.74
--- php-src/ext/pdo_mysql/mysql_driver.c:1.73   Thu Mar 23 01:37:38 2006
+++ php-src/ext/pdo_mysql/mysql_driver.cMon Oct  2 22:07:58 2006
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.73 2006/03/23 01:37:38 pajoye Exp $ */
+/* $Id: mysql_driver.c,v 1.74 2006/10/02 22:07:58 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -368,6 +368,34 @@
return 1;
 }
 
+static int pdo_mysql_check_liveness(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
+{
+   pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh-driver_data;
+#if MYSQL_VERSION_ID = 32230
+   void (*handler) (int);
+   unsigned int my_errno;
+#endif
+
+#if MYSQL_VERSION_ID  32230
+   if (mysql_ping(H-server)) {
+   return FAILURE;
+   }
+#else /* no mysql_ping() */
+   handler=signal(SIGPIPE, SIG_IGN);
+   mysql_stat(H-server);
+   switch (mysql_errno(H-server)) {
+   case CR_SERVER_GONE_ERROR:
+   /* case CR_SERVER_LOST: I'm not sure this means the same as 
gone for us */
+   signal(SIGPIPE, handler);
+   return FAILURE;
+   default:
+   break;
+   }
+   signal(SIGPIPE, handler);
+#endif /* end mysql_ping() */
+   return SUCCESS;
+} 
+/* }}} */
 
 static struct pdo_dbh_methods mysql_methods = {
mysql_handle_closer,
@@ -381,7 +409,7 @@
pdo_mysql_last_insert_id,
pdo_mysql_fetch_error_func,
pdo_mysql_get_attribute,
-   NULL /* check_liveness: TODO: ping */
+   pdo_mysql_check_liveness
 };
 
 #ifndef PDO_MYSQL_UNIX_ADDR

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2006-03-22 Thread Pierre-Alain Joye 
pajoye  Thu Mar 23 01:37:38 2006 UTC

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  . MFB: Fixed fetching of string value bigger than 128bytes when no options
are used
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.72r2=1.73diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.72 
php-src/ext/pdo_mysql/mysql_driver.c:1.73
--- php-src/ext/pdo_mysql/mysql_driver.c:1.72   Fri Mar 17 00:15:28 2006
+++ php-src/ext/pdo_mysql/mysql_driver.cThu Mar 23 01:37:38 2006
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.72 2006/03/17 00:15:28 iliaa Exp $ */
+/* $Id: mysql_driver.c,v 1.73 2006/03/23 01:37:38 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -431,6 +431,7 @@
}

dbh-driver_data = H;
+   H-max_buffer_size = 1024 * 1024;
 
/* handle MySQL options */
if (driver_options) {
@@ -440,7 +441,7 @@
 
H-buffered = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 0 TSRMLS_CC);
H-emulate_prepare = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_DIRECT_QUERY, 0 TSRMLS_CC);
-   H-max_buffer_size = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_MAX_BUFFER_SIZE, 1024 * 1024 TSRMLS_CC);
+   H-max_buffer_size = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_MAX_BUFFER_SIZE, H-max_buffer_size TSRMLS_CC);
 
if (mysql_options(H-server, MYSQL_OPT_CONNECT_TIMEOUT, (const 
char *)connect_timeout)) {
pdo_mysql_error(dbh);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2006-03-16 Thread Ilia Alshanetsky 
iliaa   Fri Mar 17 00:15:28 2006 UTC

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  MFB51: 
  Allow PDO_MYSQL_ATTR_DIRECT_QUERY to be set via constructor
  Allow getAttribute() to fetch MySQL specific attributes.
  Eliminate unnecessary auto-commit call on connect.
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.71r2=1.72diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.71 
php-src/ext/pdo_mysql/mysql_driver.c:1.72
--- php-src/ext/pdo_mysql/mysql_driver.c:1.71   Sun Mar  5 17:17:04 2006
+++ php-src/ext/pdo_mysql/mysql_driver.cFri Mar 17 00:15:28 2006
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.71 2006/03/05 17:17:04 iliaa Exp $ */
+/* $Id: mysql_driver.c,v 1.72 2006/03/17 00:15:28 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -353,6 +353,14 @@
ZVAL_LONG(return_value, H-buffered);
return 1;
 
+   case PDO_MYSQL_ATTR_DIRECT_QUERY:
+   ZVAL_LONG(return_value, H-emulate_prepare);
+   return 1;
+
+   case PDO_MYSQL_ATTR_MAX_BUFFER_SIZE:
+   ZVAL_LONG(return_value, H-max_buffer_size);
+   return 1;
+
default:
return 0;   
}
@@ -431,7 +439,7 @@
char *init_cmd = NULL, *default_file = NULL, *default_group = 
NULL;
 
H-buffered = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 0 TSRMLS_CC);
-
+   H-emulate_prepare = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_DIRECT_QUERY, 0 TSRMLS_CC);
H-max_buffer_size = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_MAX_BUFFER_SIZE, 1024 * 1024 TSRMLS_CC);
 
if (mysql_options(H-server, MYSQL_OPT_CONNECT_TIMEOUT, (const 
char *)connect_timeout)) {
@@ -488,7 +496,9 @@
goto cleanup;
}
 
-   mysql_handle_autocommit(dbh TSRMLS_CC);
+   if (!dbh-auto_commit) {
+   mysql_handle_autocommit(dbh TSRMLS_CC);
+   }
 
H-attached = 1;
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c pdo_mysql.c php_pdo_mysql_int.h

2006-03-05 Thread Ilia Alshanetsky 
iliaa   Sun Mar  5 17:17:05 2006 UTC

  Modified files:  
/php-src/ext/pdo_mysql  php_pdo_mysql_int.h mysql_driver.c 
pdo_mysql.c 
  Log:
  Fixed bug #36572 (Added PDO::MYSQL_ATTR_DIRECT_QUERY constant that show be
  set when executing internal queries such as show master status via MySQL).
  
  Added missing constant for MAX_BUFFER_SIZE.
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/php_pdo_mysql_int.h?r1=1.19r2=1.20diff_format=u
Index: php-src/ext/pdo_mysql/php_pdo_mysql_int.h
diff -u php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.19 
php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.20
--- php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.19  Tue Feb 14 14:26:27 2006
+++ php-src/ext/pdo_mysql/php_pdo_mysql_int.h   Sun Mar  5 17:17:04 2006
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_pdo_mysql_int.h,v 1.19 2006/02/14 14:26:27 iliaa Exp $ */
+/* $Id: php_pdo_mysql_int.h,v 1.20 2006/03/05 17:17:04 iliaa Exp $ */
 
 #ifndef PHP_PDO_MYSQL_INT_H
 #define PHP_PDO_MYSQL_INT_H
@@ -37,6 +37,7 @@
 
unsigned attached:1;
unsigned buffered:1;
+   unsigned emulate_prepare:1;
unsigned _reserved:31;
unsigned long max_buffer_size;
 
@@ -84,5 +85,6 @@
PDO_MYSQL_ATTR_READ_DEFAULT_FILE,
PDO_MYSQL_ATTR_READ_DEFAULT_GROUP,
PDO_MYSQL_ATTR_MAX_BUFFER_SIZE,
+   PDO_MYSQL_ATTR_DIRECT_QUERY,
 };
 #endif
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.70r2=1.71diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.70 
php-src/ext/pdo_mysql/mysql_driver.c:1.71
--- php-src/ext/pdo_mysql/mysql_driver.c:1.70   Tue Feb 14 14:26:27 2006
+++ php-src/ext/pdo_mysql/mysql_driver.cSun Mar  5 17:17:04 2006
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.70 2006/02/14 14:26:27 iliaa Exp $ */
+/* $Id: mysql_driver.c,v 1.71 2006/03/05 17:17:04 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -160,6 +160,10 @@
stmt-driver_data = S;
stmt-methods = mysql_stmt_methods;
 
+   if (H-emulate_prepare) {
+   goto end;
+   }
+
/* TODO: add runtime check to determine if the server we are talking to 
supports
 * prepared statements; if it doesn't, we should set 
stmt-supports_placeholders
 * to PDO_PLACEHOLDER_NONE, and have the rest of the code look at 
S-stmt to
@@ -221,6 +225,7 @@
 
 fallback:
 #endif
+end:
stmt-supports_placeholders = PDO_PLACEHOLDER_NONE;

return 1;
@@ -303,7 +308,9 @@
case PDO_MYSQL_ATTR_USE_BUFFERED_QUERY:
((pdo_mysql_db_handle *)dbh-driver_data)-buffered = 
Z_BVAL_P(val);
return 1;
-   
+   case PDO_MYSQL_ATTR_DIRECT_QUERY:
+   ((pdo_mysql_db_handle *)dbh-driver_data)-emulate_prepare = 
Z_BVAL_P(val);
+   return 1;
default:
return 0;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/pdo_mysql.c?r1=1.14r2=1.15diff_format=u
Index: php-src/ext/pdo_mysql/pdo_mysql.c
diff -u php-src/ext/pdo_mysql/pdo_mysql.c:1.14 
php-src/ext/pdo_mysql/pdo_mysql.c:1.15
--- php-src/ext/pdo_mysql/pdo_mysql.c:1.14  Sun Jan  1 13:09:53 2006
+++ php-src/ext/pdo_mysql/pdo_mysql.c   Sun Mar  5 17:17:04 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pdo_mysql.c,v 1.14 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: pdo_mysql.c,v 1.15 2006/03/05 17:17:04 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -80,6 +80,8 @@
REGISTER_PDO_CONST_LONG(MYSQL_ATTR_INIT_COMMAND, 
(long)PDO_MYSQL_ATTR_INIT_COMMAND);
REGISTER_PDO_CONST_LONG(MYSQL_ATTR_READ_DEFAULT_FILE, 
(long)PDO_MYSQL_ATTR_READ_DEFAULT_FILE);
REGISTER_PDO_CONST_LONG(MYSQL_ATTR_READ_DEFAULT_GROUP, 
(long)PDO_MYSQL_ATTR_READ_DEFAULT_GROUP);
+   REGISTER_PDO_CONST_LONG(MYSQL_ATTR_MAX_BUFFER_SIZE, 
(long)PDO_MYSQL_ATTR_MAX_BUFFER_SIZE);
+   REGISTER_PDO_CONST_LONG(MYSQL_ATTR_DIRECT_QUERY, 
(long)PDO_MYSQL_ATTR_DIRECT_QUERY);
 
return php_pdo_register_driver(pdo_mysql_driver);
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c mysql_statement.c php_pdo_mysql_int.h

2006-02-14 Thread Ilia Alshanetsky 
iliaa   Tue Feb 14 14:26:27 2006 UTC

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c mysql_statement.c 
php_pdo_mysql_int.h 
  Log:
  MFB51: Fixed bug #36345 (PDO/MySQL problem loading BLOB over 1MB).
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.69r2=1.70diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.69 
php-src/ext/pdo_mysql/mysql_driver.c:1.70
--- php-src/ext/pdo_mysql/mysql_driver.c:1.69   Sun Jan  1 13:09:53 2006
+++ php-src/ext/pdo_mysql/mysql_driver.cTue Feb 14 14:26:27 2006
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.69 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: mysql_driver.c,v 1.70 2006/02/14 14:26:27 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -425,6 +425,8 @@
 
H-buffered = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 0 TSRMLS_CC);
 
+   H-max_buffer_size = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_MAX_BUFFER_SIZE, 1024 * 1024 TSRMLS_CC);
+
if (mysql_options(H-server, MYSQL_OPT_CONNECT_TIMEOUT, (const 
char *)connect_timeout)) {
pdo_mysql_error(dbh);
goto cleanup;
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/mysql_statement.c?r1=1.55r2=1.56diff_format=u
Index: php-src/ext/pdo_mysql/mysql_statement.c
diff -u php-src/ext/pdo_mysql/mysql_statement.c:1.55 
php-src/ext/pdo_mysql/mysql_statement.c:1.56
--- php-src/ext/pdo_mysql/mysql_statement.c:1.55Sun Jan  1 13:09:53 2006
+++ php-src/ext/pdo_mysql/mysql_statement.c Tue Feb 14 14:26:27 2006
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_statement.c,v 1.55 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: mysql_statement.c,v 1.56 2006/02/14 14:26:27 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -71,8 +71,6 @@
return 1;
 }
 
-#define PDO_MYSQL_MAX_BUFFER 1024*1024 /* 1 megabyte */
-
 static int pdo_mysql_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC)
 {
pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt-driver_data;
@@ -144,8 +142,8 @@

S-fields[i].max_length? S-fields[i].max_length:

S-fields[i].length;
/* work-around for 
longtext and alike */
-   if 
(S-bound_result[i].buffer_length  PDO_MYSQL_MAX_BUFFER) {
-   
S-bound_result[i].buffer_length = PDO_MYSQL_MAX_BUFFER;
+   if 
(S-bound_result[i].buffer_length  H-max_buffer_size) {
+   
S-bound_result[i].buffer_length = H-max_buffer_size;
}
}
S-bound_result[i].buffer = 
emalloc(S-bound_result[i].buffer_length);
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/php_pdo_mysql_int.h?r1=1.18r2=1.19diff_format=u
Index: php-src/ext/pdo_mysql/php_pdo_mysql_int.h
diff -u php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.18 
php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.19
--- php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.18  Sun Jan  1 13:09:53 2006
+++ php-src/ext/pdo_mysql/php_pdo_mysql_int.h   Tue Feb 14 14:26:27 2006
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_pdo_mysql_int.h,v 1.18 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: php_pdo_mysql_int.h,v 1.19 2006/02/14 14:26:27 iliaa Exp $ */
 
 #ifndef PHP_PDO_MYSQL_INT_H
 #define PHP_PDO_MYSQL_INT_H
@@ -38,6 +38,7 @@
unsigned attached:1;
unsigned buffered:1;
unsigned _reserved:31;
+   unsigned long max_buffer_size;
 
pdo_mysql_error_info einfo;
 } pdo_mysql_db_handle;
@@ -82,5 +83,6 @@
PDO_MYSQL_ATTR_INIT_COMMAND,
PDO_MYSQL_ATTR_READ_DEFAULT_FILE,
PDO_MYSQL_ATTR_READ_DEFAULT_GROUP,
+   PDO_MYSQL_ATTR_MAX_BUFFER_SIZE,
 };
 #endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2005-12-25 Thread Ilia Alshanetsky 
iliaa   Sun Dec 25 20:30:56 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  MFB51: Make MySQL driver use ANSI complaint quoting style. 
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.67r2=1.68diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.67 
php-src/ext/pdo_mysql/mysql_driver.c:1.68
--- php-src/ext/pdo_mysql/mysql_driver.c:1.67   Fri Nov 25 12:54:18 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cSun Dec 25 20:30:56 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.67 2005/11/25 12:54:18 tony2001 Exp $ */
+/* $Id: mysql_driver.c,v 1.68 2005/12/25 20:30:56 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -257,7 +257,7 @@
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh-driver_data;
*quoted = safe_emalloc(2, unquotedlen, 3);
*quotedlen = mysql_real_escape_string(H-server, *quoted + 1, unquoted, 
unquotedlen);
-   (*quoted)[0] =(*quoted)[++*quotedlen] = '';
+   (*quoted)[0] =(*quoted)[++*quotedlen] = '\'';
(*quoted)[++*quotedlen] = '\0';
return 1;
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2005-11-25 Thread Antony Dovgal 
tony2001Fri Nov 25 07:54:23 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  fix #35391 (pdo_mysql::exec does not return number of affected rows)
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.66r2=1.67ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.66 
php-src/ext/pdo_mysql/mysql_driver.c:1.67
--- php-src/ext/pdo_mysql/mysql_driver.c:1.66   Thu Oct 27 13:33:42 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cFri Nov 25 07:54:18 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.66 2005/10/27 17:33:42 tony2001 Exp $ */
+/* $Id: mysql_driver.c,v 1.67 2005/11/25 12:54:18 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -235,7 +235,7 @@
return -1;
} else {
my_ulonglong c = mysql_affected_rows(H-server);
-   if (c != (my_ulonglong) -1) {
+   if (c == (my_ulonglong) -1) {
pdo_mysql_error(dbh);
return (H-einfo.errcode ? -1 : 0);
} else {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c pdo_mysql.c php_pdo_mysql_int.h

2005-10-27 Thread Antony Dovgal 
tony2001Thu Oct 27 13:33:43 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c pdo_mysql.c 
php_pdo_mysql_int.h 
  Log:
  add MySQL options and corresponding constants
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.65r2=1.66ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.65 
php-src/ext/pdo_mysql/mysql_driver.c:1.66
--- php-src/ext/pdo_mysql/mysql_driver.c:1.65   Wed Sep 14 11:34:42 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cThu Oct 27 13:33:42 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.65 2005/09/14 15:34:42 iliaa Exp $ */
+/* $Id: mysql_driver.c,v 1.66 2005/10/27 17:33:42 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -420,12 +420,50 @@
/* handle MySQL options */
if (driver_options) {
long connect_timeout = pdo_attr_lval(driver_options, 
PDO_ATTR_TIMEOUT, 30 TSRMLS_CC);
+   long local_infile = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_LOCAL_INFILE, 0 TSRMLS_CC);
+   char *init_cmd = NULL, *default_file = NULL, *default_group = 
NULL;
+
H-buffered = pdo_attr_lval(driver_options, 
PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 0 TSRMLS_CC);
 
if (mysql_options(H-server, MYSQL_OPT_CONNECT_TIMEOUT, (const 
char *)connect_timeout)) {
pdo_mysql_error(dbh);
goto cleanup;
}
+   
+   if (mysql_options(H-server, MYSQL_OPT_LOCAL_INFILE, (const 
char *)local_infile)) {
+   pdo_mysql_error(dbh);
+   goto cleanup;
+   }
+
+   init_cmd = pdo_attr_strval(driver_options, 
PDO_MYSQL_ATTR_INIT_COMMAND, NULL TSRMLS_CC);
+   if (init_cmd) {
+   if (mysql_options(H-server, MYSQL_INIT_COMMAND, (const 
char *)init_cmd)) {
+   efree(init_cmd);
+   pdo_mysql_error(dbh);
+   goto cleanup;
+   }
+   efree(init_cmd);
+   }
+   
+   default_file = pdo_attr_strval(driver_options, 
PDO_MYSQL_ATTR_READ_DEFAULT_FILE, NULL TSRMLS_CC);
+   if (default_file) {
+   if (mysql_options(H-server, MYSQL_READ_DEFAULT_FILE, 
(const char *)default_file)) {
+   efree(default_file);
+   pdo_mysql_error(dbh);
+   goto cleanup;
+   }
+   efree(default_file);
+   }
+   
+   default_group= pdo_attr_strval(driver_options, 
PDO_MYSQL_ATTR_READ_DEFAULT_GROUP, NULL TSRMLS_CC);
+   if (default_group) {
+   if (mysql_options(H-server, MYSQL_READ_DEFAULT_GROUP, 
(const char *)default_group)) {
+   efree(default_group);
+   pdo_mysql_error(dbh);
+   goto cleanup;
+   }
+   efree(default_group);
+   }
}
 
dbname = vars[1].optval;
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/pdo_mysql.c?r1=1.10r2=1.11ty=u
Index: php-src/ext/pdo_mysql/pdo_mysql.c
diff -u php-src/ext/pdo_mysql/pdo_mysql.c:1.10 
php-src/ext/pdo_mysql/pdo_mysql.c:1.11
--- php-src/ext/pdo_mysql/pdo_mysql.c:1.10  Mon Sep 19 20:46:06 2005
+++ php-src/ext/pdo_mysql/pdo_mysql.c   Thu Oct 27 13:33:43 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pdo_mysql.c,v 1.10 2005/09/20 00:46:06 iliaa Exp $ */
+/* $Id: pdo_mysql.c,v 1.11 2005/10/27 17:33:43 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -76,6 +76,10 @@
 PHP_MINIT_FUNCTION(pdo_mysql)
 {
REGISTER_PDO_CONST_LONG(MYSQL_ATTR_USE_BUFFERED_QUERY, 
(long)PDO_MYSQL_ATTR_USE_BUFFERED_QUERY);
+   REGISTER_PDO_CONST_LONG(MYSQL_ATTR_LOCAL_INFILE, 
(long)PDO_MYSQL_ATTR_LOCAL_INFILE);
+   REGISTER_PDO_CONST_LONG(MYSQL_ATTR_INIT_COMMAND, 
(long)PDO_MYSQL_ATTR_INIT_COMMAND);
+   REGISTER_PDO_CONST_LONG(MYSQL_ATTR_READ_DEFAULT_FILE, 
(long)PDO_MYSQL_ATTR_READ_DEFAULT_FILE);
+   REGISTER_PDO_CONST_LONG(MYSQL_ATTR_READ_DEFAULT_GROUP, 
(long)PDO_MYSQL_ATTR_READ_DEFAULT_GROUP);
 
return php_pdo_register_driver(pdo_mysql_driver);
 }
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/php_pdo_mysql_int.h?r1=1.16r2=1.17ty=u
Index: php-src/ext/pdo_mysql/php_pdo_mysql_int.h
diff -u php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.16 
php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.17
--- php-src/ext/pdo_mysql/php_pdo_mysql_int.h:1.16  Wed Jul 20 12:22:09 2005
+++

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c /ext/pdo_oci oci_driver.c /ext/pdo_pgsql pgsql_statement.c /ext/pdo_sqlite sqlite_driver.c

2005-09-10 Thread Wez Furlong 
wez Sun Sep 11 01:08:50 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
/php-src/ext/pdo_ocioci_driver.c 
/php-src/ext/pdo_pgsql  pgsql_statement.c 
/php-src/ext/pdo_sqlite sqlite_driver.c 
  Log:
  merge other PDO fixes from 5.1 branch.
  Allow pdo_sqlite to build against 5.0 and 5.1 too.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.63r2=1.64ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.63 
php-src/ext/pdo_mysql/mysql_driver.c:1.64
--- php-src/ext/pdo_mysql/mysql_driver.c:1.63   Tue Aug 30 23:48:01 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cSun Sep 11 01:08:47 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.63 2005/08/31 03:48:01 gschlossnagle Exp $ */
+/* $Id: mysql_driver.c,v 1.64 2005/09/11 05:08:47 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -424,7 +424,7 @@
}
 
dbname = vars[1].optval;
-host = vars[2].optval; 
+   host = vars[2].optval;  
if(vars[3].optval) {
port = atoi(vars[3].optval);
}
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/oci_driver.c?r1=1.26r2=1.27ty=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.26 
php-src/ext/pdo_oci/oci_driver.c:1.27
--- php-src/ext/pdo_oci/oci_driver.c:1.26   Tue Aug 30 15:59:11 2005
+++ php-src/ext/pdo_oci/oci_driver.cSun Sep 11 01:08:49 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_driver.c,v 1.26 2005/08/30 19:59:11 gschlossnagle Exp $ */
+/* $Id: oci_driver.c,v 1.27 2005/09/11 05:08:49 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -144,6 +144,18 @@
}
}
 
+   if (stmt) {
+   /* always propogate the error code back up to the dbh,
+* so that we can catch the error information when execute
+* is called via query.  See Bug #33707 */
+   if (H-einfo.errmsg) {
+   efree(H-einfo.errmsg);
+   }
+   H-einfo = *einfo;
+   H-einfo.errmsg = einfo-errmsg ? estrdup(einfo-errmsg) : NULL;
+   strcpy(dbh-error_code, stmt-error_code);
+   }
+
/* little mini hack so that we can use this code from the dbh ctor */
if (!dbh-methods) {
zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0 
TSRMLS_CC, SQLSTATE[%s]: %s, *pdo_err, einfo-errmsg);
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.32r2=1.33ty=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.32 
php-src/ext/pdo_pgsql/pgsql_statement.c:1.33
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.32Sat Sep  3 19:52:56 2005
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Sun Sep 11 01:08:49 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pgsql_statement.c,v 1.32 2005/09/03 23:52:56 edink Exp $ */
+/* $Id: pgsql_statement.c,v 1.33 2005/09/11 05:08:49 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -203,6 +203,10 @@

Z_TYPE_P(param-parameter) == IS_NULL) {
S-param_values[param-paramno] 
= NULL;

S-param_lengths[param-paramno] = 0;
+   } else if (Z_TYPE_P(param-parameter) 
== IS_BOOL) {
+   S-param_values[param-paramno] 
= Z_BVAL_P(param-parameter) ? t : f;
+   
S-param_lengths[param-paramno] = 1;
+   
S-param_formats[param-paramno] = 1;
} else {

convert_to_string(param-parameter);
S-param_values[param-paramno] 
= Z_STRVAL_P(param-parameter);
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/sqlite_driver.c?r1=1.22r2=1.23ty=u
Index: php-src/ext/pdo_sqlite/sqlite_driver.c
diff -u php-src/ext/pdo_sqlite/sqlite_driver.c:1.22 
php-src/ext/pdo_sqlite/sqlite_driver.c:1.23
--- php-src/ext/pdo_sqlite/sqlite_driver.c:1.22 Mon Aug 22 08:22:11 2005
+++ php-src/ext/pdo_sqlite/sqlite_driver.c  Sun Sep 11 01:08:49 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: sqlite_driver.c,v 1.22 2005/08/22 12:22:11 dmitry Exp $ */
+/* $Id: sqlite_driver.c,v 1.23 2005/09/11 05:08:49 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -457,7 +457,11 @@
char *func_name;
int func_name_len;
long argc = -1;
+#ifdef

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2005-07-13 Thread Wez Furlong 
wez Wed Jul 13 22:09:10 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  keep this as a placeholder for debugging weird regressions
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.57r2=1.58ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.57 
php-src/ext/pdo_mysql/mysql_driver.c:1.58
--- php-src/ext/pdo_mysql/mysql_driver.c:1.57   Tue Jul 12 15:32:13 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cWed Jul 13 22:09:08 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.57 2005/07/12 19:32:13 andrey Exp $ */
+/* $Id: mysql_driver.c,v 1.58 2005/07/14 02:09:08 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -100,6 +100,7 @@
zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, 
SQLSTATE[%s] [%d] %s,
*pdo_err, einfo-errcode, einfo-errmsg);
}
+/* printf(** [%s:%d] %s %s\n, file, line, *pdo_err, einfo-errmsg); */
 
return einfo-errcode;
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2005-07-12 Thread Andrey Hristov 
andrey  Tue Jul 12 15:32:13 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  ok, call pdo_mysql_error() before returning -1
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.56r2=1.57ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.56 
php-src/ext/pdo_mysql/mysql_driver.c:1.57
--- php-src/ext/pdo_mysql/mysql_driver.c:1.56   Tue Jul 12 15:22:05 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cTue Jul 12 15:32:13 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.56 2005/07/12 19:22:05 andrey Exp $ */
+/* $Id: mysql_driver.c,v 1.57 2005/07/12 19:32:13 andrey Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -177,8 +177,7 @@
return 0;
}
 
-   S-stmt = mysql_stmt_init(H-server);
-   if (!S-stmt) {
+   if (!(S-stmt = mysql_stmt_init(H-server))) {
pdo_mysql_error(dbh);
if (nsql) {
efree(nsql);
@@ -226,7 +225,7 @@
return -1;
} else {
my_ulonglong c= mysql_affected_rows(H-server);
-   return c != (my_ulonglong)-1 ? c:-1; 
+   return c != (my_ulonglong)-1 ? c:(pdo_mysql_error(dbh),-1); 
}
 }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2005-07-11 Thread Andrey Hristov 
andrey  Mon Jul 11 09:52:15 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  - mysql_affected_rows() already returns an unsigned long
  - optimize a bit the real_escape
  - handle the situation when libmysql bails out because of lack of memory
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.53r2=1.54ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.53 
php-src/ext/pdo_mysql/mysql_driver.c:1.54
--- php-src/ext/pdo_mysql/mysql_driver.c:1.53   Fri Jul  8 15:25:37 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cMon Jul 11 09:52:13 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.53 2005/07/08 19:25:37 wez Exp $ */
+/* $Id: mysql_driver.c,v 1.54 2005/07/11 13:52:13 andrey Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -225,8 +225,7 @@
pdo_mysql_error(dbh);
return -1;
} else {
-   long c = mysql_affected_rows(H-server);
-   return c 0 ? c : 0;
+   return mysql_affected_rows(H-server);
}
 }
 
@@ -242,11 +241,9 @@
 {
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh-driver_data;
*quoted = emalloc(2*unquotedlen + 3);
-   (*quoted)[0] = '';
*quotedlen = mysql_real_escape_string(H-server, *quoted + 1, unquoted, 
unquotedlen);
-   (*quoted)[*quotedlen + 1] = '';
-   (*quoted)[*quotedlen + 2] = '\0';
-   *quotedlen += 2;
+   (*quoted)[0] =(*quoted)[*quotedlen + 1] = '';
+   (*quoted)[*quotedlen+=2] = '\0';
return 1;
 }
 
@@ -329,7 +326,7 @@
case PDO_ATTR_AUTOCOMMIT:
ZVAL_LONG(return_value, dbh-auto_commit);
return 1;
-
+   
case PDO_MYSQL_ATTR_USE_BUFFERED_QUERY:
ZVAL_LONG(return_value, H-buffered);
return 1;
@@ -398,7 +395,11 @@
/* allocate an environment */

/* handle for the server */
-   H-server = mysql_init(NULL);
+   if (!(H-server = mysql_init(NULL))) {
+   pdo_mysql_error(dbh);
+   goto cleanup;
+   }
+   
dbh-driver_data = H;
 
/* handle MySQL options */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2005-07-11 Thread Ilia Alshanetsky 

Andrey,

According to MySQL C API mysql_affected_rows() can return -1 indicating 
an error, hence the check in the code.


Ilia

Andrey Hristov wrote:

andrey  Mon Jul 11 09:52:15 2005 EDT
-   long c = mysql_affected_rows(H-server);
-   return c 0 ? c : 0;
+   return mysql_affected_rows(H-server);
}
 }



You remove the initial '', but left the trailing one?


@@ -242,11 +241,9 @@
 {
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh-driver_data;
*quoted = emalloc(2*unquotedlen + 3);
-   (*quoted)[0] = '';
*quotedlen = mysql_real_escape_string(H-server, *quoted + 1, unquoted, 
unquotedlen);
-   (*quoted)[*quotedlen + 1] = '';
-   (*quoted)[*quotedlen + 2] = '\0';
-   *quotedlen += 2;
+   (*quoted)[0] =(*quoted)[*quotedlen + 1] = '';
+   (*quoted)[*quotedlen+=2] = '\0';
return 1;
 }


Ilia

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2005-07-11 Thread Ilia Alshanetsky 
iliaa   Mon Jul 11 10:46:03 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  A bit of further tuning.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.54r2=1.55ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.54 
php-src/ext/pdo_mysql/mysql_driver.c:1.55
--- php-src/ext/pdo_mysql/mysql_driver.c:1.54   Mon Jul 11 09:52:13 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cMon Jul 11 10:46:01 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.54 2005/07/11 13:52:13 andrey Exp $ */
+/* $Id: mysql_driver.c,v 1.55 2005/07/11 14:46:01 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -240,10 +240,10 @@
 static int mysql_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, int 
unquotedlen, char **quoted, int *quotedlen, enum pdo_param_type paramtype  
TSRMLS_DC)
 {
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh-driver_data;
-   *quoted = emalloc(2*unquotedlen + 3);
+   *quoted = safe_emalloc(2, unquotedlen, 3);
*quotedlen = mysql_real_escape_string(H-server, *quoted + 1, unquoted, 
unquotedlen);
-   (*quoted)[0] =(*quoted)[*quotedlen + 1] = '';
-   (*quoted)[*quotedlen+=2] = '\0';
+   (*quoted)[0] =(*quoted)[++*quotedlen] = '';
+   (*quoted)[++*quotedlen] = '\0';
return 1;
 }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2005-07-08 Thread Wez Furlong 
wez Fri Jul  8 15:25:38 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  Fix #33618
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.52r2=1.53ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.52 
php-src/ext/pdo_mysql/mysql_driver.c:1.53
--- php-src/ext/pdo_mysql/mysql_driver.c:1.52   Thu Jul  7 12:27:46 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cFri Jul  8 15:25:37 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.52 2005/07/07 16:27:46 iliaa Exp $ */
+/* $Id: mysql_driver.c,v 1.53 2005/07/08 19:25:37 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -233,9 +233,8 @@
 static char *pdo_mysql_last_insert_id(pdo_dbh_t *dbh, const char *name, 
unsigned int *len TSRMLS_DC)
 {
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh-driver_data;
-   char *id = NULL;
-
-   *len = spprintf(id, 0, %lld, mysql_insert_id(H-server));
+   char *id = php_pdo_int64_to_str(mysql_insert_id(H-server) TSRMLS_CC);
+   *len = strlen(id);
return id;
 }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2005-07-07 Thread Ilia Alshanetsky 
iliaa   Thu Jul  7 12:27:47 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  Fixed memory leak
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.51r2=1.52ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.51 
php-src/ext/pdo_mysql/mysql_driver.c:1.52
--- php-src/ext/pdo_mysql/mysql_driver.c:1.51   Sat Jul  2 22:20:08 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cThu Jul  7 12:27:46 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.51 2005/07/03 02:20:08 wez Exp $ */
+/* $Id: mysql_driver.c,v 1.52 2005/07/07 16:27:46 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -194,6 +194,9 @@
}
return 0;
}
+   if (nsql) {
+   efree(nsql);
+   }
 
S-num_params = mysql_stmt_param_count(S-stmt);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2005-06-24 Thread Ilia Alshanetsky 
iliaa   Fri Jun 24 19:58:09 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  Fixed bogus query failure claim, on some queries such as OPTIMIZE table.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.47r2=1.48ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.47 
php-src/ext/pdo_mysql/mysql_driver.c:1.48
--- php-src/ext/pdo_mysql/mysql_driver.c:1.47   Fri Jun 24 15:45:57 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cFri Jun 24 19:58:06 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.47 2005/06/24 19:45:57 iliaa Exp $ */
+/* $Id: mysql_driver.c,v 1.48 2005/06/24 23:58:06 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -151,7 +151,8 @@
pdo_mysql_error(dbh);
return -1;
} else {
-   return mysql_affected_rows(H-server);
+   long c = mysql_affected_rows(H-server);
+   return c 0 ? c : 0;
}
 }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2005-05-17 Thread Ilia Alshanetsky 
iliaa   Tue May 17 15:33:05 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  Fixed type mixup.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.43r2=1.44ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.43 
php-src/ext/pdo_mysql/mysql_driver.c:1.44
--- php-src/ext/pdo_mysql/mysql_driver.c:1.43   Sun Feb 27 15:34:36 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cTue May 17 15:33:03 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.43 2005/02/27 20:34:36 hholzgra Exp $ */
+/* $Id: mysql_driver.c,v 1.44 2005/05/17 19:33:03 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -156,7 +156,7 @@
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh-driver_data;
char *id = NULL;
 
-   *len = spprintf(id, 0, %ld, mysql_insert_id(H-server));
+   *len = spprintf(id, 0, %lld, mysql_insert_id(H-server));
return id;
 }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2005-05-17 Thread Ilia Alshanetsky 
iliaa   Tue May 17 19:23:52 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  Make unix domain sockets work.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.44r2=1.45ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.44 
php-src/ext/pdo_mysql/mysql_driver.c:1.45
--- php-src/ext/pdo_mysql/mysql_driver.c:1.44   Tue May 17 15:33:03 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cTue May 17 19:23:52 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.44 2005/05/17 19:33:03 iliaa Exp $ */
+/* $Id: mysql_driver.c,v 1.45 2005/05/17 23:23:52 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -272,7 +272,7 @@
 };
 
 #ifndef PDO_MYSQL_UNIX_ADDR
-# ifndef PHP_WIN32
+# ifdef PHP_WIN32
 #  define PDO_MYSQL_UNIX_ADDR  MySQL
 # else
 #  define PDO_MYSQL_UNIX_ADDR  /tmp/mysql.sock

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c

2005-02-26 Thread Wez Furlong 
wez Sat Feb 26 20:31:00 2005 EDT

  Modified files:  
/php-src/ext/pdo_mysql  mysql_driver.c 
  Log:
  fix comma
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.39r2=1.40ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.39 
php-src/ext/pdo_mysql/mysql_driver.c:1.40
--- php-src/ext/pdo_mysql/mysql_driver.c:1.39   Sat Feb 26 12:27:51 2005
+++ php-src/ext/pdo_mysql/mysql_driver.cSat Feb 26 20:30:58 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: mysql_driver.c,v 1.39 2005/02/26 17:27:51 wez Exp $ */
+/* $Id: mysql_driver.c,v 1.40 2005/02/27 01:30:58 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -160,7 +160,7 @@
}
 }
 
-static char *pdo_mysql_last_insert_id(pdo_dbh_t *dbh, const char *name, 
unsigned int *len, TSRMLS_DC)
+static char *pdo_mysql_last_insert_id(pdo_dbh_t *dbh, const char *name, 
unsigned int *len TSRMLS_DC)
 {
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh-driver_data;
char *id = NULL;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php