3138 Jonas Oreland 2010-03-13 [merge]
merge 62 to 63
modified:
sql/item.cc
3137 Jonas Oreland 2010-03-13
ndb - ndb_tmp_table_and_DDL is not supported in embedded
modified:
mysql-test/suite/ndb/t/ndb_tmp_table_and_DDL.test
3136 Jonas Oreland 2010-03-12 [merge]
ndb - post merge 5.1.44 fixes into 6.3
modified:
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl_ndb/t/disabled.def
sql/sql_yacc.yy
=== modified file 'mysql-test/suite/ndb/t/ndb_tmp_table_and_DDL.test'
--- a/mysql-test/suite/ndb/t/ndb_tmp_table_and_DDL.test 2010-01-22 09:38:21 +0000
+++ b/mysql-test/suite/ndb/t/ndb_tmp_table_and_DDL.test 2010-03-13 08:50:33 +0000
@@ -6,6 +6,8 @@
#
source include/have_ndb.inc;
+# test uses event scheduler, hence not embedded
+source include/not_embedded.inc
LET $ENGINE_TYPE= NDB;
source extra/rpl_tests/rpl_tmp_table_and_DDL.test;
=== modified file 'sql/item.cc'
--- a/sql/item.cc 2010-03-12 06:06:23 +0000
+++ b/sql/item.cc 2010-03-12 14:32:53 +0000
@@ -7113,7 +7113,7 @@ double Item_cache_decimal::val_real()
DBUG_ASSERT(fixed);
double res;
if (!value_cached && !cache_value())
- return NULL;
+ return (double)0;
my_decimal2double(E_DEC_FATAL_ERROR, &decimal_value, &res);
return res;
}
Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20100313085251-t78vq386wd1zoepg.bundle
| Thread |
|---|
| • bzr push into mysql-5.1-telco-6.3 branch (jonas:3136 to 3138) | Jonas Oreland | 13 Mar 2010 |
