diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-10 18:04:46 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-10 18:04:46 +0100 |
| commit | 36bfd749a364ff7754f27917dfaef882e6f7d028 (patch) | |
| tree | 4a548159135a1edb672816f4fd61a5e2348b24c1 /sql/sql_prepare.cc | |
| parent | c7766a95976794bc696bd2254fe5ffe14a29a307 (diff) | |
| parent | 76d98963c71e36ff60ed8e0556aae3c64cadac7d (diff) | |
| download | mariadb-git-36bfd749a364ff7754f27917dfaef882e6f7d028.tar.gz | |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
sql/sql_prepare.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
sql/ha_ndbcluster.h:
SCCS merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 010c1250756..1b9cca9d84f 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -411,7 +411,7 @@ static void set_param_decimal(Item_param *param, uchar **pos, ulong len) { ulong length= get_param_length(pos, len); param->set_decimal((char*)*pos, length); - *pos+= len; + *pos+= length; } #ifndef EMBEDDED_LIBRARY |