throw out legacy code, that never was used for something

useful. Was added for QC but QC is now a plugin, not part of
the core.

diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index 8cd1d0c1f1d707de760de17436b59fb7e6a5a459..0930987094dac5e053c02ff25b2996587208e674 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -60,7 +60,6 @@ MYSQLND_METHOD(mysqlnd_stmt, store_result)(MYSQLND_STMT * const s TSRMLS_DC)
        enum_func_status ret;
        MYSQLND * conn;
        MYSQLND_RES * result;
-       zend_bool to_cache = FALSE;
 
        DBG_ENTER("mysqlnd_stmt::store_result");
        if (!stmt || !stmt->conn || !stmt->result) {
@@ -99,10 +98,11 @@ MYSQLND_METHOD(mysqlnd_stmt, store_result)(MYSQLND_STMT * const s TSRMLS_DC)
        result->type                    = MYSQLND_RES_PS_BUF;
        result->m.fetch_row             = mysqlnd_fetch_stmt_row_buffered;
        result->m.fetch_lengths = NULL;/* makes no sense */
+       result->m.row_decoder = php_mysqlnd_rowp_read_binary_protocol;
 
        result->result_set_memory_pool = mysqlnd_mempool_create(MYSQLND_G(mempool_default_size) TSRMLS_CC);
 
-       ret = result->m.store_result_fetch_data(conn, result, result->meta, TRUE, to_cache TSRMLS_CC);
+       ret = result->m.store_result_fetch_data(conn, result, result->meta, TRUE TSRMLS_CC);
 
        if (PASS == ret) {
                /* libmysql API docs say it should be so for SELECT statements */
@@ -732,7 +732,6 @@ mysqlnd_fetch_stmt_row_buffered(MYSQLND_RES *result, void *param, unsigned int f
                                                                                                current_row,
                                                                                                meta->field_count,
                                                                                                meta->fields,
-                                                                                               result->stored_data->persistent,
                                                                                                result->conn->options.numeric_and_datetime_as_unicode,
                                                                                                result->conn->options.int_and_float_native,
                                                                                                result->conn->stats TSRMLS_CC);
@@ -852,7 +851,6 @@ mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int
                                                                        result->unbuf->last_row_data,
                                                                        row_packet->field_count,
                                                                        row_packet->fields_metadata,
-                                                                       FALSE,
                                                                        result->conn->options.numeric_and_datetime_as_unicode,
                                                                        result->conn->options.int_and_float_native,
                                                                        result->conn->stats TSRMLS_CC))
@@ -1037,7 +1035,6 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, unsigned int fla
                                                                          result->unbuf->last_row_data,
                                                                          row_packet->field_count,
                                                                          row_packet->fields_metadata,
-                                                                         FALSE,
                                                                          result->conn->options.numeric_and_datetime_as_unicode,
                                                                          result->conn->options.int_and_float_native,
                                                                          result->conn->stats TSRMLS_CC))

diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index ecad9b1d726d3ee71bdf9a33371dafc175c12473..21de866c0e026e7b2e1cdeb6309afd154d347bd8 100644 (file)
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -56,7 +56,6 @@ MYSQLND_METHOD(mysqlnd_res, initialize_result_set_rest)(MYSQLND_RES * const resu
                                                                        data_cursor,
                                                                        result->meta->field_count,
                                                                        result->meta->fields,
-                                                                       result->stored_data->persistent,
                                                                        result->conn->options.numeric_and_datetime_as_unicode,
                                                                        result->conn->options.int_and_float_native,
                                                                        result->conn->stats TSRMLS_CC);
@@ -224,18 +223,18 @@ MYSQLND_METHOD(mysqlnd_res, free_buffered_data)(MYSQLND_RES * result TSRMLS_DC)
 
                MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_COPY_ON_WRITE_PERFORMED, copy_on_write_performed,
                                                                                          STAT_COPY_ON_WRITE_SAVED, copy_on_write_saved);
-               mnd_pefree(set->data, set->persistent);
+               mnd_efree(set->data);
                set->data = NULL;
        }
 
        if (set->row_buffers) {
-               mnd_pefree(set->row_buffers, set->persistent);
+               mnd_efree(set->row_buffers);
                set->row_buffers        = NULL;
        }
        set->data_cursor = NULL;
        set->row_count  = 0;
 
-       mnd_pefree(set, set->persistent);
+       mnd_efree(set);
 
        DBG_VOID_RETURN;
 }
@@ -672,7 +671,6 @@ mysqlnd_fetch_row_unbuffered_c(MYSQLND_RES * result TSRMLS_DC)
                                                                                  result->unbuf->last_row_data,
                                                                                  row_packet->field_count,
                                                                                  row_packet->fields_metadata,
-                                                                                 FALSE,
                                                                                  result->conn->options.numeric_and_datetime_as_unicode,
                                                                                  result->conn->options.int_and_float_native,
                                                                                  result->conn->stats TSRMLS_CC);
@@ -788,7 +786,6 @@ mysqlnd_fetch_row_unbuffered(MYSQLND_RES * result, void *param, unsigned int fla
                                                                                        result->unbuf->last_row_data,
                                                                                        field_count,
                                                                                        row_packet->fields_metadata,
-                                                                                       FALSE,
                                                                                        result->conn->options.numeric_and_datetime_as_unicode,
                                                                                        result->conn->options.int_and_float_native,
                                                                                        result->conn->stats TSRMLS_CC);
@@ -956,7 +953,6 @@ mysqlnd_fetch_row_buffered_c(MYSQLND_RES * result TSRMLS_DC)
                                                                                        current_row,
                                                                                        result->meta->field_count,
                                                                                        result->meta->fields,
-                                                                                       FALSE,
                                                                                        result->conn->options.numeric_and_datetime_as_unicode,
                                                                                        result->conn->options.int_and_float_native,
                                                                                        result->conn->stats TSRMLS_CC);
@@ -1030,7 +1026,6 @@ mysqlnd_fetch_row_buffered(MYSQLND_RES * result, void *param, unsigned int flags
                                                                                        current_row,
                                                                                        result->meta->field_count,
                                                                                        result->meta->fields,
-                                                                                       result->stored_data->persistent,
                                                                                        result->conn->options.numeric_and_datetime_as_unicode,
                                                                                        result->conn->options.int_and_float_native,
                                                                                        result->conn->stats TSRMLS_CC);
@@ -1112,8 +1107,7 @@ mysqlnd_fetch_row_buffered(MYSQLND_RES * result, void *param, unsigned int flags
 enum_func_status
 MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND * const conn, MYSQLND_RES * result,
                                                                                                        MYSQLND_RES_METADATA *meta,
-                                                                                                       zend_bool binary_protocol,
-                                                                                                       zend_bool to_cache TSRMLS_DC)
+                                                                                                       zend_bool binary_protocol TSRMLS_DC)
 {
        enum_func_status ret;
        MYSQLND_PACKET_ROW *row_packet = NULL;
@@ -1122,26 +1116,22 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND * const conn, MYSQL
 
        DBG_ENTER("mysqlnd_res::store_result_fetch_data");
 
-       result->stored_data     = set = mnd_pecalloc(1, sizeof(MYSQLND_RES_BUFFERED), to_cache);
+       result->stored_data     = set = mnd_ecalloc(1, sizeof(MYSQLND_RES_BUFFERED));
        if (!set) {
                SET_OOM_ERROR(conn->error_info);
                ret = FAIL;
                goto end;
        }
        if (free_rows) {
-               set->row_buffers = mnd_pemalloc((size_t)(free_rows * sizeof(MYSQLND_MEMORY_POOL_CHUNK *)), to_cache);
+               set->row_buffers = mnd_emalloc((size_t)(free_rows * sizeof(MYSQLND_MEMORY_POOL_CHUNK *)));
                if (!set->row_buffers) {
                        SET_OOM_ERROR(conn->error_info);
                        ret = FAIL;
                        goto end;
                }
        }
-       set->persistent = to_cache;
        set->references = 1;
 
-       result->m.row_decoder = binary_protocol? php_mysqlnd_rowp_read_binary_protocol:
-                                                                                        php_mysqlnd_rowp_read_text_protocol;
-
        /* non-persistent */
        row_packet = conn->protocol->m.get_row_packet(conn->protocol, FALSE TSRMLS_CC);
        if (!row_packet) {
@@ -1170,9 +1160,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND * const conn, MYSQL
                                ret = FAIL;
                                goto end;
                        }
-                       new_row_buffers = mnd_perealloc(set->row_buffers,
-                                                                                       (size_t)(total_allocated_rows * sizeof(MYSQLND_MEMORY_POOL_CHUNK *)),
-                                                                                       set->persistent);
+                       new_row_buffers = mnd_erealloc(set->row_buffers, (size_t)(total_allocated_rows * sizeof(MYSQLND_MEMORY_POOL_CHUNK *)));
                        if (!new_row_buffers) {
                                SET_OOM_ERROR(conn->error_info);
                                ret = FAIL;
@@ -1205,7 +1193,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND * const conn, MYSQL
                        goto end;
                }
                /* if pecalloc is used valgrind barks gcc version 4.3.1 20080507 (prerelease) [gcc-4_3-branch revision 135036] (SUSE Linux) */
-               set->data = mnd_pemalloc((size_t)(set->row_count * meta->field_count * sizeof(zval *)), to_cache);
+               set->data = mnd_emalloc((size_t)(set->row_count * meta->field_count * sizeof(zval *)));
                if (!set->data) {
                        SET_OOM_ERROR(conn->error_info);
                        ret = FAIL;
@@ -1232,9 +1220,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND * const conn, MYSQL
                        ret = FAIL;
                        goto end;
                }
-               set->row_buffers = mnd_perealloc(set->row_buffers,
-                                                                                (size_t) (set->row_count * sizeof(MYSQLND_MEMORY_POOL_CHUNK *)),
-                                                                                set->persistent);
+               set->row_buffers = mnd_erealloc(set->row_buffers, (size_t) (set->row_count * sizeof(MYSQLND_MEMORY_POOL_CHUNK *)));
        }
 
        if (conn->upsert_status.server_status & SERVER_MORE_RESULTS_EXISTS) {
@@ -1269,7 +1255,6 @@ MYSQLND_METHOD(mysqlnd_res, store_result)(MYSQLND_RES * result,
                                                                                  zend_bool ps_protocol TSRMLS_DC)
 {
        enum_func_status ret;
-       zend_bool to_cache = FALSE;
 
        DBG_ENTER("mysqlnd_res::store_result");
 
@@ -1278,9 +1263,12 @@ MYSQLND_METHOD(mysqlnd_res, store_result)(MYSQLND_RES * result,
        result->type                    = MYSQLND_RES_NORMAL;
        result->m.fetch_row             = result->m.fetch_row_normal_buffered;
        result->m.fetch_lengths = mysqlnd_fetch_lengths_buffered;
+       result->m.row_decoder = ps_protocol? php_mysqlnd_rowp_read_binary_protocol:
+                                                                                php_mysqlnd_rowp_read_text_protocol;
 
        result->result_set_memory_pool = mysqlnd_mempool_create(MYSQLND_G(mempool_default_size) TSRMLS_CC);
        result->lengths = mnd_ecalloc(result->field_count, sizeof(unsigned long));
+
        if (!result->result_set_memory_pool || !result->lengths) {
                SET_OOM_ERROR(conn->error_info);
                DBG_RETURN(NULL);
@@ -1288,7 +1276,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result)(MYSQLND_RES * result,
 
        CONN_SET_STATE(conn, CONN_FETCHING_DATA);
 
-       ret = result->m.store_result_fetch_data(conn, result, result->meta, ps_protocol, to_cache TSRMLS_CC);
+       ret = result->m.store_result_fetch_data(conn, result, result->meta, ps_protocol TSRMLS_CC);
        if (FAIL == ret) {
                if (result->stored_data) {
                        conn->error_info = result->stored_data->error_info;

diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index c5bdb1fd0b79434b4ce9fd57d6665fca81a85ae9..edea2e895c105cecf593019a87179fd2eeeff1f8 100644 (file)
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -517,7 +517,7 @@ typedef const MYSQLND_FIELD *(*func_mysqlnd_res__fetch_fields)(MYSQLND_RES * con
 
 typedef enum_func_status       (*func_mysqlnd_res__read_result_metadata)(MYSQLND_RES *result, MYSQLND * conn TSRMLS_DC);
 typedef unsigned long *                (*func_mysqlnd_res__fetch_lengths)(MYSQLND_RES * const result TSRMLS_DC);
-typedef enum_func_status       (*func_mysqlnd_res__store_result_fetch_data)(MYSQLND * const conn, MYSQLND_RES *result, MYSQLND_RES_METADATA *meta, zend_bool binary_protocol, zend_bool to_cache TSRMLS_DC);
+typedef enum_func_status       (*func_mysqlnd_res__store_result_fetch_data)(MYSQLND * const conn, MYSQLND_RES *result, MYSQLND_RES_METADATA *meta, zend_bool binary_protocol TSRMLS_DC);
 typedef enum_func_status       (*func_mysqlnd_res__initialize_result_set_rest)(MYSQLND_RES * const result TSRMLS_DC);
 
 typedef void                           (*func_mysqlnd_res__free_result_buffers)(MYSQLND_RES * result TSRMLS_DC);       /* private */
@@ -530,7 +530,6 @@ typedef void                                (*func_mysqlnd_res__unbuffered_free_last_data)(MYSQLND_RES *resu
        /* for decoding - binary or text protocol */
 typedef enum_func_status       (*func_mysqlnd_res__row_decoder)(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields,
                                                                        unsigned int field_count, MYSQLND_FIELD *fields_metadata,
-                                                                       zend_bool persistent,
                                                                        zend_bool as_unicode, zend_bool as_int_or_float,
                                                                        MYSQLND_STATS * stats TSRMLS_DC);
 
@@ -839,7 +838,6 @@ struct st_mysqlnd_buffered_result
        MYSQLND_MEMORY_POOL_CHUNK **row_buffers;
        uint64_t                        row_count;
        uint64_t                        initialized_rows;
-       zend_bool                       persistent;
 
        unsigned int            references;
 

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index c05b1e2462e716538993fac7b5b81f2898116e47..87855c85c5b037daca53701af5b4518f17325ded 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -1390,7 +1390,6 @@ php_mysqlnd_read_row_ex(MYSQLND * conn, MYSQLND_MEMORY_POOL * result_set_memory_
 enum_func_status
 php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields,
                                                                          unsigned int field_count, MYSQLND_FIELD *fields_metadata,
-                                                                         zend_bool persistent,
                                                                          zend_bool as_unicode, zend_bool as_int_or_float,
                                                                          MYSQLND_STATS * stats TSRMLS_DC)
 {
@@ -1490,7 +1489,6 @@ php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zv
 enum_func_status
 php_mysqlnd_rowp_read_text_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields,
                                                                        unsigned int field_count, MYSQLND_FIELD *fields_metadata,
-                                                                       zend_bool persistent,
                                                                        zend_bool as_unicode, zend_bool as_int_or_float,
                                                                        MYSQLND_STATS * stats TSRMLS_DC)
 {

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h
index 7ce5ca16e1da2be7c972cd72996fa59d646dfe61..3c7bb1ec62c6f3d8a96892b634b2d40a79efcf01 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.h
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.h
@@ -296,14 +296,12 @@ PHPAPI const extern char * const mysqlnd_empty_string;
 
 enum_func_status php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields,
                                                                                 unsigned int field_count, MYSQLND_FIELD *fields_metadata,
-                                                                                zend_bool persistent,
                                                                                 zend_bool as_unicode, zend_bool as_int_or_float,
                                                                                 MYSQLND_STATS * stats TSRMLS_DC);
 
 
 enum_func_status php_mysqlnd_rowp_read_text_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields,
                                                                                 unsigned int field_count, MYSQLND_FIELD *fields_metadata,
-                                                                                zend_bool persistent,
                                                                                 zend_bool as_unicode, zend_bool as_int_or_float,
                                                                                 MYSQLND_STATS * stats TSRMLS_DC);