Fix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this...

diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c
index 115e74c7dc4ab490a16f757175e71fc9df775529..9884c85ae33ef05d1f2b2ee1948292e3c92f5b66 100644 (file)
--- a/ext/pdo_mysql/mysql_statement.c
+++ b/ext/pdo_mysql/mysql_statement.c
@@ -80,13 +80,13 @@ static int pdo_mysql_stmt_dtor(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
 #endif /* PDO_USE_MYSQLND */
 
 #ifdef HAVE_MYSQL_STMT_PREPARE
-       if (S->bound_result) 
+       if (S->bound_result)
        {
                int i;
                for (i = 0; i < stmt->column_count; i++) {
                        pdo_free_bound_result(S->bound_result[i]);
                }
-       
+
                efree(S->bound_result);
                efree(S->out_null);
                efree(S->out_length);
@@ -101,13 +101,13 @@ static int pdo_mysql_stmt_dtor(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
                        if (mysql_next_result(S->H->server) != 0) {
                                break;
                        }
-                       
+
                        res = mysql_store_result(S->H->server);
                        if (res) {
                                mysql_free_result(res);
                        }
                }
-       }       
+       }
 #endif /* HAVE_MYSQL_NEXT_RESULT || PDO_USE_MYSQLND */
 #if PDO_USE_MYSQLND
        if (!S->stmt && S->current_data) {
@@ -186,23 +186,23 @@ static int pdo_mysql_stmt_execute_prepared_libmysql(pdo_stmt_t *stmt TSRMLS_DC)
        }
 
        if (!S->result) {
-               int i; 
-
-               /* figure out the result set format, if any */ 
-               S->result = mysql_stmt_result_metadata(S->stmt); 
-               if (S->result) { 
-                       int calc_max_length = H->buffered && S->max_length == 1; 
-                       S->fields = mysql_fetch_fields(S->result); 
-                       if (S->bound_result) { 
-                               int i; 
-                               for (i = 0; i < stmt->column_count; i++) { 
-                                       efree(S->bound_result[i].buffer);  
-                               } 
-                               efree(S->bound_result); 
-                               efree(S->out_null); 
-                               efree(S->out_length); 
+               int i;
+
+               /* figure out the result set format, if any */
+               S->result = mysql_stmt_result_metadata(S->stmt);
+               if (S->result) {
+                       int calc_max_length = H->buffered && S->max_length == 1;
+                       S->fields = mysql_fetch_fields(S->result);
+                       if (S->bound_result) {
+                               int i;
+                               for (i = 0; i < stmt->column_count; i++) {
+                                       efree(S->bound_result[i].buffer);
+                               }
+                               efree(S->bound_result);
+                               efree(S->out_null);
+                               efree(S->out_length);
                        }
-                       
+
                        stmt->column_count = (int)mysql_num_fields(S->result);
                        S->bound_result = ecalloc(stmt->column_count, sizeof(MYSQL_BIND));
                        S->out_null = ecalloc(stmt->column_count, sizeof(my_bool));
@@ -268,7 +268,7 @@ static int pdo_mysql_stmt_execute_prepared_libmysql(pdo_stmt_t *stmt TSRMLS_DC)
                        }
                }
        }
-       
+
        pdo_mysql_stmt_set_row_count(stmt TSRMLS_CC);
        PDO_DBG_RETURN(1);
 }
@@ -281,9 +281,9 @@ static int pdo_mysql_stmt_execute_prepared_mysqlnd(pdo_stmt_t *stmt TSRMLS_DC) /
        pdo_mysql_stmt *S = stmt->driver_data;
        pdo_mysql_db_handle *H = S->H;
        int i;
-       
+
        PDO_DBG_ENTER("pdo_mysql_stmt_execute_prepared_mysqlnd");
-       
+
        if (mysql_stmt_execute(S->stmt)) {
                pdo_mysql_error_stmt(stmt);
                PDO_DBG_RETURN(0);
@@ -311,7 +311,7 @@ static int pdo_mysql_stmt_execute_prepared_mysqlnd(pdo_stmt_t *stmt TSRMLS_DC) /
                        }
                }
        }
-       
+
        pdo_mysql_stmt_set_row_count(stmt TSRMLS_CC);
        PDO_DBG_RETURN(1);
 }
@@ -330,7 +330,7 @@ static int pdo_mysql_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
                PDO_DBG_RETURN(pdo_mysql_stmt_execute_prepared(stmt));
        }
 #endif
-       
+
        /* ensure that we free any previous unfetched results */
        if (S->result) {
                mysql_free_result(S->result);
@@ -366,8 +366,8 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
                }
 
                if (!mysqlnd_stmt_more_results(S->stmt)) {
-                       /* 
-                       MySQL gives us n + 1 result sets for 
+                       /*
+                       MySQL gives us n + 1 result sets for
                        CALL proc() and n result sets returned by the proc itself.
                        Result set n + 1 is about the procedure call itself.
                        As the PDO emulation does not return it, we skip it as well
@@ -422,7 +422,19 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
        }
 
        ret = mysql_next_result(H->server);
-
+#if PDO_USE_MYSQLND
+       /* for whatever reason mysqlnd breaks with libmysql compatibility at the C level, no -1 */
+       if (PASS != ret) {
+               pdo_mysql_error_stmt(stmt);
+               PDO_DBG_RETURN(0);
+       }
+       if (mysql_more_results(H->server)) {
+               PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt TSRMLS_CC));
+       } else {
+               /* No more results */
+               PDO_DBG_RETURN(0);
+       }
+#else
        if (ret > 0) {
                pdo_mysql_error_stmt(stmt);
                PDO_DBG_RETURN(0);
@@ -432,6 +444,8 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
        } else {
                PDO_DBG_RETURN(pdo_mysql_fill_stmt_from_result(stmt TSRMLS_CC));
        }
+#endif
+
 #else
        strcpy(stmt->error_code, "HYC00");
        PDO_DBG_RETURN(0);
@@ -458,7 +472,7 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da
        PDO_MYSQL_PARAM_BIND *b;
 #endif
 #if HAVE_MYSQL_STMT_PREPARE || PDO_USE_MYSQLND
-       pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data; 
+       pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
 
        PDO_DBG_ENTER("pdo_mysql_stmt_param_hook");
        PDO_DBG_INF_FMT("stmt=%p", S->stmt);
@@ -498,18 +512,18 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da
                                }
 #else
                                b = (PDO_MYSQL_PARAM_BIND*)param->driver_data;
-                               *b->is_null = 0; 
-                               if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_NULL ||  
-                                               Z_TYPE_P(param->parameter) == IS_NULL) { 
-                                       *b->is_null = 1; 
-                                       b->buffer_type = MYSQL_TYPE_STRING; 
-                                       b->buffer = NULL; 
-                                       b->buffer_length = 0; 
-                                       *b->length = 0; 
+                               *b->is_null = 0;
+                               if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_NULL ||
+                                               Z_TYPE_P(param->parameter) == IS_NULL) {
+                                       *b->is_null = 1;
+                                       b->buffer_type = MYSQL_TYPE_STRING;
+                                       b->buffer = NULL;
+                                       b->buffer_length = 0;
+                                       *b->length = 0;
                                        PDO_DBG_RETURN(1);
-                               } 
+                               }
 #endif /* PDO_USE_MYSQLND */
-       
+
                                switch (PDO_PARAM_TYPE(param->param_type)) {
                                        case PDO_PARAM_STMT:
                                                PDO_DBG_RETURN(0);
@@ -533,7 +547,7 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da
                                        default:
                                                ;
                                }
-               
+
 #if PDO_USE_MYSQLND
                                /* Is it really correct to check the zval's type? - But well, that's what the old code below does, too */
                                PDO_DBG_INF_FMT("param->parameter->type=%d", Z_TYPE_P(param->parameter));
@@ -554,9 +568,9 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da
                                        default:
                                                PDO_DBG_RETURN(0);
                                }
-                               
+
                                PDO_DBG_RETURN(1);
-#else  
+#else
                                PDO_DBG_INF_FMT("param->parameter->type=%d", Z_TYPE_P(param->parameter));
                                switch (Z_TYPE_P(param->parameter)) {
                                        case IS_STRING:
@@ -612,7 +626,7 @@ static int pdo_mysql_stmt_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori
 #else
 #      if HAVE_MYSQL_STMT_PREPARE
        int ret;
-       
+
        if (S->stmt) {
                ret = mysql_stmt_fetch(S->stmt);
 
@@ -633,7 +647,7 @@ static int pdo_mysql_stmt_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori
        }
 #      endif /* HAVE_MYSQL_STMT_PREPARE */
 #endif /* PDO_USE_MYSQLND */
-       
+
        if (!S->result) {
                strcpy(stmt->error_code, "HY000");
                PDO_DBG_RETURN(0);
@@ -653,7 +667,7 @@ static int pdo_mysql_stmt_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori
                        pdo_mysql_error_stmt(stmt);
                }
                PDO_DBG_RETURN(0);
-       } 
+       }
 
        S->current_lengths = mysql_fetch_lengths(S->result);
        PDO_DBG_RETURN(1);
@@ -677,8 +691,8 @@ static int pdo_mysql_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC) /* {{{
                PDO_DBG_RETURN(0);
        }
 
-       /* fetch all on demand, this seems easiest 
-       ** if we've been here before bail out 
+       /* fetch all on demand, this seems easiest
+       ** if we've been here before bail out
        */
        if (cols[0].name) {
                PDO_DBG_RETURN(1);
@@ -694,10 +708,10 @@ static int pdo_mysql_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC) /* {{{
                        cols[i].namelen = namelen;
                        cols[i].name = estrndup(S->fields[i].name, namelen);
                }
-               
+
                cols[i].precision = S->fields[i].decimals;
                cols[i].maxlen = S->fields[i].length;
-               
+
 #ifdef PDO_USE_MYSQLND
                if (S->stmt) {
                        cols[i].param_type = PDO_PARAM_ZVAL;
@@ -818,7 +832,7 @@ static int pdo_mysql_stmt_col_meta(pdo_stmt_t *stmt, long colno, zval *return_va
        const MYSQL_FIELD *F;
        zval *flags;
        char *str;
-       
+
        PDO_DBG_ENTER("pdo_mysql_stmt_col_meta");
        PDO_DBG_INF_FMT("stmt=%p", S->stmt);
        if (!S->result) {
@@ -876,7 +890,7 @@ static int pdo_mysql_stmt_col_meta(pdo_stmt_t *stmt, long colno, zval *return_va
                        break;
        }
 #endif
-       
+
        add_assoc_zval(return_value, "flags", flags);
        add_assoc_string(return_value, "table",(char *) (F->table?F->table:""), 1);
        PDO_DBG_RETURN(SUCCESS);

diff --git a/ext/pdo_mysql/tests/bug_41997.phpt b/ext/pdo_mysql/tests/bug_41997.phpt
index ee0cfe9ac2bcd7b01b1a57866588cf1729e5e671..38d55a01906221be1b49f924049bdfe5a8958c57 100644 (file)
--- a/ext/pdo_mysql/tests/bug_41997.phpt
+++ b/ext/pdo_mysql/tests/bug_41997.phpt
@@ -2,12 +2,11 @@
 PDO MySQL Bug #41997 (stored procedure call returning single rowset blocks future queries)
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not loaded');
-require dirname(__FILE__) . '/config.inc';
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-PDOTest::skip();
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::skip();
 
-$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+$db = MySQLPDOTest::factory();
 $row = $db->query('SELECT VERSION() as _version')->fetch(PDO::FETCH_ASSOC);
 $matches = array();
 if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
@@ -20,9 +19,8 @@ if ($version < 50000)
 ?>
 --FILE--
 <?php
-require dirname(__FILE__) . '/config.inc';
-require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+require dirname(__FILE__) . '/mysql_pdo_test.inc';
+$db = MySQLPDOTest::factory();
 
 $db->exec('DROP PROCEDURE IF EXISTS p');
 $db->exec('CREATE PROCEDURE p() BEGIN SELECT 1 AS "one"; END');