[BACK]Return to mysqlnd_result_meta.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / ext / mysqlnd

Diff for /embedaddon/php/ext/mysqlnd/mysqlnd_result_meta.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:47:58 version 1.1.1.2, 2012/05/29 12:34:41
Line 12 Line 12
   | obtain it through the world-wide-web, please send a note to          |    | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |    | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+    +----------------------------------------------------------------------+
  | Authors: Georg Richter <georg@mysql.com>                             |  | Authors: Andrey Hristov <andrey@mysql.com>                           |
  |          Andrey Hristov <andrey@mysql.com>                           | 
   |          Ulf Wendel <uwendel@mysql.com>                              |    |          Ulf Wendel <uwendel@mysql.com>                              |
     |          Georg Richter <georg@mysql.com>                             |
   +----------------------------------------------------------------------+    +----------------------------------------------------------------------+
 */  */
   
Line 138  mysqlnd_unicode_is_key_numeric(UChar *key, size_t leng Line 138  mysqlnd_unicode_is_key_numeric(UChar *key, size_t leng
   
 /* {{{ mysqlnd_res_meta::read_metadata */  /* {{{ mysqlnd_res_meta::read_metadata */
 static enum_func_status  static enum_func_status
MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const meta, MYSQLND *conn TSRMLS_DC)MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const meta, MYSQLND_CONN_DATA * conn TSRMLS_DC)
 {  {
         unsigned int i = 0;          unsigned int i = 0;
         MYSQLND_PACKET_RES_FIELD * field_packet;          MYSQLND_PACKET_RES_FIELD * field_packet;
Line 151  MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLN Line 151  MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLN
   
         field_packet = conn->protocol->m.get_result_field_packet(conn->protocol, FALSE TSRMLS_CC);          field_packet = conn->protocol->m.get_result_field_packet(conn->protocol, FALSE TSRMLS_CC);
         if (!field_packet) {          if (!field_packet) {
                SET_OOM_ERROR(conn->error_info);                SET_OOM_ERROR(*conn->error_info);
                 DBG_RETURN(FAIL);                  DBG_RETURN(FAIL);
         }          }
         field_packet->persistent_alloc = meta->persistent;          field_packet->persistent_alloc = meta->persistent;
Line 170  MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLN Line 170  MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLN
                         DBG_RETURN(FAIL);                          DBG_RETURN(FAIL);
                 }                  }
                 if (field_packet->error_info.error_no) {                  if (field_packet->error_info.error_no) {
                        conn->error_info = field_packet->error_info;                        COPY_CLIENT_ERROR(*conn->error_info, field_packet->error_info);
                         /* Return back from CONN_QUERY_SENT */                          /* Return back from CONN_QUERY_SENT */
                         PACKET_FREE(field_packet);                          PACKET_FREE(field_packet);
                         DBG_RETURN(FAIL);                          DBG_RETURN(FAIL);
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>