Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see
ChangeSet
1.2030 05/11/29 15:33:58 jimw (AT) mysql (DOT) com +4 -0
Merge
into
mysql-test/t/union.test
1.92 05/11/29 15:33:54 jimw (AT) mysql (DOT) com +1 -1
Resolve conflict
vio/viosslfactories.c
1.19 05/11/29 15:24:02 jimw (AT) mysql (DOT) com +0 -0
Auto merged
sql/item.cc
1.204 05/11/29 15:24:02 jimw (AT) mysql (DOT) com +0 -0
Auto merged
mysql-test/r/union.result
1.79 05/11/29 15:24:02 jimw (AT) mysql (DOT) com +0 -0
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:jimw
# Host:rama.(none)
# Root:/
1.203/sql/item.cc2005-11-28 21:25:40 -08:00
1.204/sql/item.cc2005-11-29 15:24:02 -08:00
@@ -5812,8 +5812,11 @@
{
int delta1= max_length_orig - decimals_orig;
int delta2= item->max_length - item->decimals;
- max_length= min(max(delta1, delta2) + decimals,
- (fld_type == MYSQL_TYPE_FLAT) ? FLT_DIG+6 : DBL_DIG+7);
+ if (fld_type == MYSQL_TYPE_DECIMAL)
+ max_length= max(delta1, delta2) + decimals;
+ else
+ max_length= min(max(delta1, delta2) + decimals,
+ (fld_type == MYSQL_TYPE_FLAT) ? FLT_DIG+6 : DBL_DIG+7);
}
else
max_length= (fld_type == MYSQL_TYPE_FLAT) ? FLT_DIG+6 : DBL_DIG+7;
1.78/mysql-test/r/union.result2005-10-11 02:58:20 -07:00
1.79/mysql-test/r/union.result2005-11-29 15:24:02 -08:00
@@ -1270,3 +1270,29 @@
5
99
drop table t1;
+create table t1 (f1 decimal(60,25), f2 decimal(60,25));
+insert into t1 values (0.0,0.0);
+select f1 from t1 union all select f2 from t1;
+f1
+0.0000000000000000000000000
+0.0000000000000000000000000
+select 'XXXXXXXXXXXXXXXXXXXX' as description, f1 from t1
+union all
+select 'YYYYYYYYYYYYYYYYYYYY' as description, f2 from t1;
+descriptionf1
+XXXXXXXXXXXXXXXXXXXX0.0000000000000000000000000
+YYYYYYYYYYYYYYYYYYYY0.0000000000000000000000000
+drop table t1;
+create table t1 (f1 decimal(60,24), f2 decimal(60,24));
+insert into t1 values (0.0,0.0);
+select f1 from t1 union all select f2 from t1;
+f1
+0.000000000000000000000000
+0.000000000000000000000000
+select 'XXXXXXXXXXXXXXXXXXXX' as description, f1 from t1
+union all
+select 'YYYYYYYYYYYYYYYYYYYY' as description, f2 from t1;
+descriptionf1
+XXXXXXXXXXXXXXXXXXXX0.000000000000000000000000
+YYYYYYYYYYYYYYYYYYYY0.000000000000000000000000
+drop table t1;
1.91/mysql-test/t/union.test2005-09-23 00:12:05 -07:00
1.92/mysql-test/t/union.test2005-11-29 15:33:54 -08:00
@@ -753,6 +753,24 @@
show columns from t2;
drop table t2, t1;
+#
+# Bug #14216: UNIN + DECIMAL wrong values in result
+#
+create table t1 (f1 decimal(60,25), f2 decimal(60,25));
+insert into t1 values (0.0,0.0);
+select f1 from t1 union all select f2 from t1;
+select 'XXXXXXXXXXXXXXXXXXXX' as description, f1 from t1
+union all
+select 'YYYYYYYYYYYYYYYYYYYY' as description, f2 from t1;
+drop table t1;
+create table t1 (f1 decimal(60,24), f2 decimal(60,24));
+insert into t1 values (0.0,0.0);
+select f1 from t1 union all select f2 from t1;
+select 'XXXXXXXXXXXXXXXXXXXX' as description, f1 from t1
+union all
+select 'YYYYYYYYYYYYYYYYYYYY' as description, f2 from t1;
+drop table t1;
+
#
# Test that union with VARCHAR produces dynamic row tables
#
1.18/vio/viosslfactories.c2005-09-01 02:46:37 -07:00
1.19/vio/viosslfactories.c2005-11-29 15:24:02 -08:00
@@ -191,9 +191,6 @@
/* NetWare SSL initialization */
static void netware_ssl_init()
{
- /* initialize SSL library */
- SSL_library_init();
-
/* cleanup SSL library */
NXVmRegisterExitHandler(netware_ssl_cleanup, NULL);
}
@@ -228,16 +225,17 @@
ptr->ssl_method= 0;
/* FIXME: constants! */
-#ifdef __NETWARE__
- netware_ssl_init();
-#endif
-
if (!ssl_algorithms_added)
{
DBUG_PRINT("info", ("todo: SSL_add_all_algorithms()"));
ssl_algorithms_added = TRUE;
+ SSL_library_init();
SSL_add_all_algorithms();
}
+#ifdef __NETWARE__
+ netware_ssl_init();
+#endif
+
if (!ssl_error_strings_loaded)
{
DBUG_PRINT("info", ("todo:SSL_load_error_strings()"));
@@ -319,17 +317,18 @@
/* FIXME: constants! */
ptr->session_id_context= ptr;
-#ifdef __NETWARE__
- netware_ssl_init();
-#endif
-
if (!ssl_algorithms_added)
{
DBUG_PRINT("info", ("todo: SSL_add_all_algorithms()"));
ssl_algorithms_added = TRUE;
+ SSL_library_init();
SSL_add_all_algorithms();
}
+#ifdef __NETWARE__
+ netware_ssl_init();
+#endif
+
if (!ssl_error_strings_loaded)
{
DBUG_PRINT("info", ("todo: SSL_load_error_strings()"));