← 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_dblib/dblib_stmt.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_dblib/dblib_stmt.c
17
17
  +----------------------------------------------------------------------+
18
18
*/
19
19
 
20
 
/* $Id: dblib_stmt.c 295958 2010-03-08 12:39:44Z iliaa $ */
 
20
/* $Id: dblib_stmt.c 302196 2010-08-13 22:12:37Z felipe $ */
21
21
 
22
22
#ifdef HAVE_CONFIG_H
23
23
# include "config.h"
170
170
                                        case SQLMONEY4:
171
171
                                        case SQLMONEYN: {
172
172
                                                DBFLT8 money_value;
173
 
                                                dbconvert(NULL, S->cols[i].coltype, dbdata(H->link, i+1), dbdatlen(H->link, i+1), SQLFLT8, (LPBYTE)&money_value, val->len);
174
 
                                                val->len = spprintf(val->data, 0, "%.4f", money_value);
 
173
                                                dbconvert(NULL, S->cols[i].coltype, dbdata(H->link, i+1), dbdatlen(H->link, i+1), SQLFLT8, (LPBYTE)&money_value, 8);
 
174
                                                val->len = spprintf(&val->data, 0, "%.4f", money_value);
175
175
                                                }
176
176
                                                break;
177
177
                                        default: