diff options
| author | bell@sanja.is.com.ua <> | 2005-09-14 17:28:28 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2005-09-14 17:28:28 +0300 |
| commit | d1c4241aa5edb8a21ad27b2db735b7cc3b693259 (patch) | |
| tree | e1648c8e6b6f5bc011724e69fcab5a6e852305cb /sql | |
| parent | 2fce07b08b2aae562f7192b9d6da04d26acceead (diff) | |
| parent | 028e8926819412c4611a7fe0c8b855b80ddd382e (diff) | |
| download | mariadb-git-d1c4241aa5edb8a21ad27b2db735b7cc3b693259.tar.gz | |
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 2 | ||||
| -rw-r--r-- | sql/table.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index b47d7d19fbd..518fb011e0f 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -765,7 +765,7 @@ my_decimal *Item_func_numhybrid::val_decimal(my_decimal *decimal_value) } case REAL_RESULT: { - double result= (double)int_op(); + double result= (double)real_op(); double2my_decimal(E_DEC_FATAL_ERROR, result, decimal_value); break; } diff --git a/sql/table.cc b/sql/table.cc index 6ac5e07daf1..74ffe58e42e 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -287,6 +287,8 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, keynames=(char*) key_part; strpos+= (strmov(keynames, (char *) strpos) - keynames)+1; + share->null_bytes= null_pos - (uchar*) outparam->null_flags + (null_bit_pos + 7) / 8; + share->reclength = uint2korr((head+16)); if (*(head+26) == 1) share->system= 1; /* one-record-database */ |