← Back to branch summary

~clint-fewbar/ubuntu/precise/php5/php5-5.4-merge

« back to all changes in this revision

Viewing changes to ext/pdo_mysql/mysql_statement.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-02-22 09:46:37 UTC
  • mfrom: (1.1.20) (0.3.18 sid)
  • Revision ID: package-import@ubuntu.com-20110222094637-nlu2tvb7oqgaarl0
Tags: 5.3.5-1ubuntu1
* Merge from debian/unstable. Remaining changes:
 - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions 
      already in universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, sybase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
    * stop mysql instance on clean just in case we failed in tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/pdo_mysql/mysql_statement.c
18
18
  +----------------------------------------------------------------------+
19
19
*/
20
20
 
21
 
/* $Id: mysql_statement.c 299574 2010-05-21 11:09:28Z andrey $ */
 
21
/* $Id: mysql_statement.c 304072 2010-10-05 09:58:15Z kalle $ */
22
22
 
23
23
#ifdef HAVE_CONFIG_H
24
24
#include "config.h"
886
886
#endif
887
887
        
888
888
        add_assoc_zval(return_value, "flags", flags);
889
 
        add_assoc_string(return_value, "table",(F->table?F->table:""), 1);
 
889
        add_assoc_string(return_value, "table",(char *) (F->table?F->table:""), 1);
890
890
        PDO_DBG_RETURN(SUCCESS);
891
891
} /* }}} */
892
892