diff options
| author | jimw@mysql.com <> | 2005-07-19 11:05:49 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-07-19 11:05:49 -0700 |
| commit | 80c1c6b33f27d37d9bf4e7bba103e10377da5c01 (patch) | |
| tree | 04692d95c000bd65df72b0a4c5c605b71afa5287 /sql/sql_prepare.cc | |
| parent | f40ac0bb9915501f74964c9edcd57deaa241ee61 (diff) | |
| parent | bb6918e3120fbf8d20c11a91c96f3236b4ea387d (diff) | |
| download | mariadb-git-80c1c6b33f27d37d9bf4e7bba103e10377da5c01.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index aa47b506f73..3171b30f161 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -319,7 +319,7 @@ static void set_param_float(Item_param *param, uchar **pos, ulong len) return; float4get(data,*pos); #else - data= *(float*) *pos; + floatget(data, *pos); #endif param->set_double((double) data); *pos+= 4; @@ -333,7 +333,7 @@ static void set_param_double(Item_param *param, uchar **pos, ulong len) return; float8get(data,*pos); #else - data= *(double*) *pos; + doubleget(data, *pos); #endif param->set_double((double) data); *pos+= 8; @@ -601,10 +601,8 @@ static bool insert_params_withlog(Prepared_statement *stmt, uchar *null_array, Item_param **begin= stmt->param_array; Item_param **end= begin + stmt->param_count; uint32 length= 0; - String str; const String *res; - DBUG_ENTER("insert_params_withlog"); if (query->copy(stmt->query, stmt->query_length, default_charset_info)) |