From 7f3e2dc48d1f40a68b45218642677738a6607370 Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Tue, 27 Sep 2005 15:11:39 +0500
Subject: [PATCH 1/6] Fix for bug #13372 (decimal union)

---
 mysql-test/r/type_decimal.result | 17 ++++++++++++++++-
 mysql-test/r/type_float.result   | 15 +++++++++++++++
 mysql-test/t/type_decimal.test   | 14 +++++++++++++-
 mysql-test/t/type_float.test     | 13 +++++++++++++
 sql/item.cc                      | 24 ++++++++++++++++++++++--
 5 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result
index c3b2d5090ef..de8610f6514 100644
--- a/mysql-test/r/type_decimal.result
+++ b/mysql-test/r/type_decimal.result
@@ -1,4 +1,4 @@
-DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t1, t2, t3;
 SET SQL_WARNINGS=1;
 CREATE TABLE t1 (
 id int(11) NOT NULL auto_increment,
@@ -655,3 +655,18 @@ select * from t1;
 a	b
 123.12345	123.1
 drop table t1;
+create table t1 (d decimal(10,1));
+create table t2 (d decimal(10,9));
+insert into t1 values ("100000000.0");
+insert into t2 values ("1.23456780");
+create table t3 select * from t2 union select * from t1;
+select * from t3;
+d
+1.234567800
+100000000.000000000
+show create table t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `d` decimal(18,9) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1, t2, t3;
diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result
index 319a957498b..2e6642c3fcf 100644
--- a/mysql-test/r/type_float.result
+++ b/mysql-test/r/type_float.result
@@ -235,3 +235,18 @@ select * from t1 where reckey=1.09E2;
 reckey	recdesc
 109	Has 109 as key
 drop table t1;
+create table t1 (d double(10,1));
+create table t2 (d double(10,9));
+insert into t1 values ("100000000.0");
+insert into t2 values ("1.23456780");
+create table t3 select * from t2 union select * from t1;
+select * from t3;
+d
+1.234567800
+100000000.000000000
+show create table t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `d` double(61,9) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1, t2, t3;
diff --git a/mysql-test/t/type_decimal.test b/mysql-test/t/type_decimal.test
index 1f133666910..cc5e9278b12 100644
--- a/mysql-test/t/type_decimal.test
+++ b/mysql-test/t/type_decimal.test
@@ -1,7 +1,7 @@
 # bug in decimal() with negative numbers by kaido@tradenet.ee
 
 --disable_warnings
-DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t1, t2, t3;
 --enable_warnings
 SET SQL_WARNINGS=1;
 
@@ -276,4 +276,16 @@ update t1 set b=a;
 select * from t1;                                                               
 drop table t1;                                                                  
 
+#
+# Bug #13372 (decimal union)
+#
+create table t1 (d decimal(10,1));
+create table t2 (d decimal(10,9));
+insert into t1 values ("100000000.0");
+insert into t2 values ("1.23456780");
+create table t3 select * from t2 union select * from t1;
+select * from t3;
+show create table t3;
+drop table t1, t2, t3;
+
 # End of 4.1 tests
diff --git a/mysql-test/t/type_float.test b/mysql-test/t/type_float.test
index 2d4a90911a1..abaf72ea2ed 100644
--- a/mysql-test/t/type_float.test
+++ b/mysql-test/t/type_float.test
@@ -149,4 +149,17 @@ select * from t1 where reckey=109;
 select * from t1 where reckey=1.09E2;
 drop table t1;
 
+#
+# Bug #13372 (decimal union)
+#
+create table t1 (d double(10,1));
+create table t2 (d double(10,9));
+insert into t1 values ("100000000.0");
+insert into t2 values ("1.23456780");
+create table t3 select * from t2 union select * from t1;
+select * from t3;
+show create table t3;
+drop table t1, t2, t3;
+
+
 # End of 4.1 tests
diff --git a/sql/item.cc b/sql/item.cc
index 010189c321c..ec83cc1f511 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -3205,9 +3205,14 @@ enum_field_types Item_type_holder::get_real_type(Item *item)
 
 bool Item_type_holder::join_types(THD *thd, Item *item)
 {
+  uint max_length_orig= max_length;
+  uint decimals_orig= decimals;
   max_length= max(max_length, display_length(item));
+  decimals= max(decimals, item->decimals);
   fld_type= Field::field_type_merge(fld_type, get_real_type(item));
-  if (Field::result_merge_type(fld_type) == STRING_RESULT)
+  switch (Field::result_merge_type(fld_type))
+  {
+  case STRING_RESULT:
   {
     const char *old_cs, *old_derivation;
     old_cs= collation.collation->name;
@@ -3221,8 +3226,23 @@ bool Item_type_holder::join_types(THD *thd, Item *item)
 	       "UNION");
       return TRUE;
     }
+    break;
   }
-  decimals= max(decimals, item->decimals);
+  case REAL_RESULT:
+  {
+    decimals= max(decimals, item->decimals);
+    if (decimals != NOT_FIXED_DEC)
+    {
+      int delta1= max_length_orig - decimals_orig;
+      int delta2= item->max_length - item->decimals;
+      max_length= max(delta1, delta2) + decimals;
+    }
+    else
+      max_length= (fld_type == MYSQL_TYPE_FLOAT) ? FLT_DIG+6 : DBL_DIG+7;
+    break;
+  }
+  default:;
+  };
   maybe_null|= item->maybe_null;
   get_full_info(item);
   return FALSE;

From 9b88d252470984beb62bf5fd6c1c1da745f22456 Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Tue, 27 Sep 2005 15:31:38 +0500
Subject: [PATCH 2/6] additional fix to the bug #13372 (decimal union)

---
 mysql-test/r/type_float.result | 2 +-
 sql/item.cc                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result
index 2e6642c3fcf..6e381192270 100644
--- a/mysql-test/r/type_float.result
+++ b/mysql-test/r/type_float.result
@@ -247,6 +247,6 @@ d
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `d` double(61,9) default NULL
+  `d` double(22,9) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2, t3;
diff --git a/sql/item.cc b/sql/item.cc
index ec83cc1f511..b3c0e64dec1 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -3230,12 +3230,12 @@ bool Item_type_holder::join_types(THD *thd, Item *item)
   }
   case REAL_RESULT:
   {
-    decimals= max(decimals, item->decimals);
     if (decimals != NOT_FIXED_DEC)
     {
       int delta1= max_length_orig - decimals_orig;
       int delta2= item->max_length - item->decimals;
-      max_length= max(delta1, delta2) + decimals;
+      max_length= min(max(delta1, delta2) + decimals,
+                      (fld_type == MYSQL_TYPE_FLOAT) ? FLT_DIG+6 : DBL_DIG+7);
     }
     else
       max_length= (fld_type == MYSQL_TYPE_FLOAT) ? FLT_DIG+6 : DBL_DIG+7;

From f0dfa1954856a6e49e843f4725101d05eff2c1a5 Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Tue, 27 Sep 2005 16:23:37 +0500
Subject: [PATCH 3/6] additional fix for bug #13372 (decimal union)

---
 mysql-test/r/union.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index a3dd2c5c291..318bfa2cda8 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -565,7 +565,7 @@ a
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` double(53,1) NOT NULL default '0.0'
+  `a` double(21,1) NOT NULL default '0.0'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t2 (it1 tinyint, it2 tinyint not null, i int not null, ib bigint, f float, d double, y year, da date, dt datetime, sc char(10), sv varchar(10), b blob, tx text);

From 4a893c96e37ca2b8cd4469d6d81f4f9309a242b1 Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Thu, 6 Oct 2005 17:37:24 -0700
Subject: [PATCH 4/6] Fix use of "%*s" *printf() specifiers that were really
 meant to be "%.*s". (Bug #13650)

---
 sql/sp.cc       | 31 ++++++++++++++++---------------
 sql/sp_cache.cc |  2 +-
 sql/sp_head.cc  |  4 ++--
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/sql/sp.cc b/sql/sp.cc
index 4f7b544f5c7..8386c5d58a2 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -208,7 +208,7 @@ db_find_routine_aux(THD *thd, int type, sp_name *name, TABLE *table)
 {
   byte key[MAX_KEY_LENGTH];	// db, name, optional key length type
   DBUG_ENTER("db_find_routine_aux");
-  DBUG_PRINT("enter", ("type: %d name: %*s",
+  DBUG_PRINT("enter", ("type: %d name: %.*s",
 		       type, name->m_name.length, name->m_name.str));
 
   /*
@@ -275,7 +275,7 @@ db_find_routine(THD *thd, int type, sp_name *name, sp_head **sphp)
   ulong sql_mode;
   Open_tables_state open_tables_state_backup;
   DBUG_ENTER("db_find_routine");
-  DBUG_PRINT("enter", ("type: %d name: %*s",
+  DBUG_PRINT("enter", ("type: %d name: %.*s",
 		       type, name->m_name.length, name->m_name.str));
 
   *sphp= 0;                                     // In case of errors
@@ -479,7 +479,8 @@ db_create_routine(THD *thd, int type, sp_head *sp)
   char olddb[128];
   bool dbchanged;
   DBUG_ENTER("db_create_routine");
-  DBUG_PRINT("enter", ("type: %d name: %*s",type,sp->m_name.length,sp->m_name.str));
+  DBUG_PRINT("enter", ("type: %d name: %.*s",type,sp->m_name.length,
+                       sp->m_name.str));
 
   dbchanged= FALSE;
   if ((ret= sp_use_new_db(thd, sp->m_db.str, olddb, sizeof(olddb),
@@ -606,7 +607,7 @@ db_drop_routine(THD *thd, int type, sp_name *name)
   TABLE *table;
   int ret;
   DBUG_ENTER("db_drop_routine");
-  DBUG_PRINT("enter", ("type: %d name: %*s",
+  DBUG_PRINT("enter", ("type: %d name: %.*s",
 		       type, name->m_name.length, name->m_name.str));
 
   if (!(table= open_proc_table_for_update(thd)))
@@ -628,7 +629,7 @@ db_update_routine(THD *thd, int type, sp_name *name, st_sp_chistics *chistics)
   int ret;
   bool opened;
   DBUG_ENTER("db_update_routine");
-  DBUG_PRINT("enter", ("type: %d name: %*s",
+  DBUG_PRINT("enter", ("type: %d name: %.*s",
 		       type, name->m_name.length, name->m_name.str));
 
   if (!(table= open_proc_table_for_update(thd)))
@@ -922,7 +923,7 @@ sp_find_procedure(THD *thd, sp_name *name, bool cache_only)
 {
   sp_head *sp;
   DBUG_ENTER("sp_find_procedure");
-  DBUG_PRINT("enter", ("name: %*s.%*s",
+  DBUG_PRINT("enter", ("name: %.*s.%.*s",
 		       name->m_db.length, name->m_db.str,
 		       name->m_name.length, name->m_name.str));
 
@@ -980,7 +981,7 @@ sp_create_procedure(THD *thd, sp_head *sp)
 {
   int ret;
   DBUG_ENTER("sp_create_procedure");
-  DBUG_PRINT("enter", ("name: %*s", sp->m_name.length, sp->m_name.str));
+  DBUG_PRINT("enter", ("name: %.*s", sp->m_name.length, sp->m_name.str));
 
   ret= db_create_routine(thd, TYPE_ENUM_PROCEDURE, sp);
   DBUG_RETURN(ret);
@@ -992,7 +993,7 @@ sp_drop_procedure(THD *thd, sp_name *name)
 {
   int ret;
   DBUG_ENTER("sp_drop_procedure");
-  DBUG_PRINT("enter", ("name: %*s", name->m_name.length, name->m_name.str));
+  DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
 
   ret= db_drop_routine(thd, TYPE_ENUM_PROCEDURE, name);
   if (!ret)
@@ -1006,7 +1007,7 @@ sp_update_procedure(THD *thd, sp_name *name, st_sp_chistics *chistics)
 {
   int ret;
   DBUG_ENTER("sp_update_procedure");
-  DBUG_PRINT("enter", ("name: %*s", name->m_name.length, name->m_name.str));
+  DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
 
   ret= db_update_routine(thd, TYPE_ENUM_PROCEDURE, name, chistics);
   if (!ret)
@@ -1020,7 +1021,7 @@ sp_show_create_procedure(THD *thd, sp_name *name)
 {
   sp_head *sp;
   DBUG_ENTER("sp_show_create_procedure");
-  DBUG_PRINT("enter", ("name: %*s", name->m_name.length, name->m_name.str));
+  DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
 
   if ((sp= sp_find_procedure(thd, name)))
   {
@@ -1072,7 +1073,7 @@ sp_find_function(THD *thd, sp_name *name, bool cache_only)
 {
   sp_head *sp;
   DBUG_ENTER("sp_find_function");
-  DBUG_PRINT("enter", ("name: %*s", name->m_name.length, name->m_name.str));
+  DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
 
   if (!(sp= sp_cache_lookup(&thd->sp_func_cache, name)) &&
       !cache_only)
@@ -1089,7 +1090,7 @@ sp_create_function(THD *thd, sp_head *sp)
 {
   int ret;
   DBUG_ENTER("sp_create_function");
-  DBUG_PRINT("enter", ("name: %*s", sp->m_name.length, sp->m_name.str));
+  DBUG_PRINT("enter", ("name: %.*s", sp->m_name.length, sp->m_name.str));
 
   ret= db_create_routine(thd, TYPE_ENUM_FUNCTION, sp);
   DBUG_RETURN(ret);
@@ -1101,7 +1102,7 @@ sp_drop_function(THD *thd, sp_name *name)
 {
   int ret;
   DBUG_ENTER("sp_drop_function");
-  DBUG_PRINT("enter", ("name: %*s", name->m_name.length, name->m_name.str));
+  DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
 
   ret= db_drop_routine(thd, TYPE_ENUM_FUNCTION, name);
   if (!ret)
@@ -1115,7 +1116,7 @@ sp_update_function(THD *thd, sp_name *name, st_sp_chistics *chistics)
 {
   int ret;
   DBUG_ENTER("sp_update_procedure");
-  DBUG_PRINT("enter", ("name: %*s", name->m_name.length, name->m_name.str));
+  DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
 
   ret= db_update_routine(thd, TYPE_ENUM_FUNCTION, name, chistics);
   if (!ret)
@@ -1129,7 +1130,7 @@ sp_show_create_function(THD *thd, sp_name *name)
 {
   sp_head *sp;
   DBUG_ENTER("sp_show_create_function");
-  DBUG_PRINT("enter", ("name: %*s", name->m_name.length, name->m_name.str));
+  DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
 
   if ((sp= sp_find_function(thd, name)))
   {
diff --git a/sql/sp_cache.cc b/sql/sp_cache.cc
index 495f969eeac..fea6a67f32c 100644
--- a/sql/sp_cache.cc
+++ b/sql/sp_cache.cc
@@ -132,7 +132,7 @@ void sp_cache_insert(sp_cache **cp, sp_head *sp)
       return;                                   // End of memory error
     c->version= Cversion;      // No need to lock when reading long variable
   }
-  DBUG_PRINT("info",("sp_cache: inserting: %*s", sp->m_qname.length,
+  DBUG_PRINT("info",("sp_cache: inserting: %.*s", sp->m_qname.length,
                      sp->m_qname.str));
   c->insert(sp);
   *cp= c;                                       // Update *cp if it was NULL
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 671acbc2a0c..af6acfc7448 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -280,7 +280,7 @@ sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type,
       DBUG_PRINT("info", ("STRING_RESULT: null"));
       goto return_null_item;
     }
-    DBUG_PRINT("info",("STRING_RESULT: %*s",
+    DBUG_PRINT("info",("STRING_RESULT: %.*s",
                        s->length(), s->c_ptr_quick()));
     /*
       Reuse mechanism in sp_eval_func_item() is only employed for assignments
@@ -354,7 +354,7 @@ sp_name::init_qname(THD *thd)
     return;
   m_qname.length= m_sroutines_key.length - 1;
   m_qname.str= m_sroutines_key.str + 1;
-  sprintf(m_qname.str, "%*s.%*s",
+  sprintf(m_qname.str, "%.*s.%.*s",
 	  m_db.length, (m_db.length ? m_db.str : ""),
 	  m_name.length, m_name.str);
 }

From cb7d5f4488104771fe043d3ebc5d355c6c8890fc Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Tue, 11 Oct 2005 16:39:35 +0500
Subject: [PATCH 5/6] Merging

---
 mysql-test/r/type_float.result | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result
index 21886609b5c..c10cb7d71f7 100644
--- a/mysql-test/r/type_float.result
+++ b/mysql-test/r/type_float.result
@@ -225,10 +225,6 @@ select * from t1 where reckey=1.09E2;
 reckey	recdesc
 109	Has 109 as key
 drop table t1;
-create table t1 (s1 float(0,2));
-ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1').
-create table t1 (s1 float(1,2));
-ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1').
 create table t1 (d double(10,1));
 create table t2 (d double(10,9));
 insert into t1 values ("100000000.0");
@@ -244,3 +240,7 @@ t3	CREATE TABLE `t3` (
   `d` double(22,9) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2, t3;
+create table t1 (s1 float(0,2));
+ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1').
+create table t1 (s1 float(1,2));
+ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1').

From d99146ce2cfc202788b519050b4e5628e01e99fe Mon Sep 17 00:00:00 2001
From: "bar@mysql.com" <>
Date: Tue, 11 Oct 2005 16:56:42 +0500
Subject: [PATCH 6/6] complete.c:   Fixed compilation problem on FreeBSD,  
 after discussion with Jani.   Doesn't FreeBSD follow the standard?

---
 cmd-line-utils/readline/complete.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd-line-utils/readline/complete.c b/cmd-line-utils/readline/complete.c
index 41ea22d815e..df0a698b81f 100644
--- a/cmd-line-utils/readline/complete.c
+++ b/cmd-line-utils/readline/complete.c
@@ -21,7 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#ifndef _XOPEN_SOURCE
+#if !defined(_XOPEN_SOURCE) && !defined(__FreeBSD__)
 #define _XOPEN_SOURCE 500
 #endif