Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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 http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-05-11 13:07:53+05:00, holyfoot@hfmain.(none) +10 -0
Merge mysql.com:/home/hf/work/27921/my50-27921
into mysql.com:/home/hf/work/27921/my51-27921
MERGE: 1.1810.2868.34
mysql-test/r/cast.result@stripped, 2007-05-11 12:42:59+05:00, holyfoot@hfmain.(none) +0 -2
Auto merged
MERGE: 1.39.1.11
mysql-test/r/view.result@stripped, 2007-05-11 12:42:59+05:00, holyfoot@hfmain.(none) +0 -1
Auto merged
MERGE: 1.138.1.62
mysql-test/t/view.test@stripped, 2007-05-11 12:48:50+05:00, holyfoot@hfmain.(none) +0 -12
MERGE: 1.126.1.57
sql/field.cc@stripped, 2007-05-11 12:42:59+05:00, holyfoot@hfmain.(none) +0 -0
Auto merged
MERGE: 1.256.1.92
sql/item_create.cc@stripped, 2007-05-11 13:03:25+05:00, holyfoot@hfmain.(none) +13 -18
MERGE: 1.58.1.5
sql/item_create.h@stripped, 2007-05-11 13:05:17+05:00, holyfoot@hfmain.(none) +3 -5
merging
MERGE: 1.43.1.4
sql/item_func.cc@stripped, 2007-05-11 12:42:59+05:00, holyfoot@hfmain.(none) +0 -0
Auto merged
MERGE: 1.270.1.68
sql/item_func.h@stripped, 2007-05-11 12:42:59+05:00, holyfoot@hfmain.(none) +0 -0
Auto merged
MERGE: 1.136.2.30
sql/my_decimal.h@stripped, 2007-05-11 13:05:54+05:00, holyfoot@hfmain.(none) +6 -8
merging
MERGE: 1.10.1.4
sql/sql_yacc.yy@stripped, 2007-05-11 13:07:47+05:00, holyfoot@hfmain.(none) +5 -4
merging
MERGE: 1.371.1.144
# 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: holyfoot
# Host: hfmain.(none)
# Root: /home/hf/work/27921/my51-27921/RESYNC
--- 1.389/sql/field.cc 2007-05-11 13:07:59 +05:00
+++ 1.390/sql/field.cc 2007-05-11 13:07:59 +05:00
@@ -8772,8 +8772,7 @@ bool create_field::init(THD *thd, char *
case MYSQL_TYPE_NULL:
break;
case MYSQL_TYPE_NEWDECIMAL:
- if (!fld_length && !decimals)
- length= 10;
+ my_decimal_trim(&length, &decimals);
if (length > DECIMAL_MAX_PRECISION)
{
my_error(ER_TOO_BIG_PRECISION, MYF(0), length, fld_name,
--- 1.76/sql/item_create.cc 2007-05-11 13:07:59 +05:00
+++ 1.77/sql/item_create.cc 2007-05-11 13:07:59 +05:00
@@ -3916,6 +3916,7 @@ Create_func_master_pos_wait Create_func_
Item*
Create_func_master_pos_wait::create_native(THD *thd, LEX_STRING name,
List<Item> *item_list)
+
{
Item *func= NULL;
int arg_count= 0;
@@ -3946,7 +3947,6 @@ Create_func_master_pos_wait::create_nati
my_error(ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT, MYF(0), name.str);
break;
}
- }
return func;
}
@@ -4970,11 +4970,15 @@ find_qualified_function_builder(THD *thd
return & Create_sp_func::s_singleton;
}
-Item*
-create_func_cast(THD *thd, Item *a, Cast_target cast_type, int len, int dec,
+
+Item *
+create_func_cast(Item *a, Cast_target cast_type,
+ const char *c_len, const char *c_dec,
CHARSET_INFO *cs)
{
Item *res;
+ ulong len;
+ uint dec;
LINT_INIT(res);
switch (cast_type) {
@@ -4998,18 +5002,21 @@ create_func_cast(THD *thd, Item *a, Cast
break;
case ITEM_CAST_DECIMAL:
{
- int tmp_len= (len>0) ? len : 10;
- if (tmp_len < dec)
+ len= c_len ? atoi(c_len) : 0;
+ dec= c_dec ? atoi(c_dec) : 0;
+ my_decimal_trim(&len, &dec);
+ if (len < dec)
{
my_error(ER_M_BIGGER_THAN_D, MYF(0), "");
return 0;
}
- res= new (thd->mem_root) Item_decimal_typecast(a, tmp_len, dec);
+ res= new (thd->mem_root) Item_decimal_typecast(a, len, dec);
break;
}
case ITEM_CAST_CHAR:
{
CHARSET_INFO *real_cs= (cs ? cs : thd->variables.collation_connection);
+ len= c_len ? atoi(c_len) : -1;
res= new (thd->mem_root) Item_char_typecast(a, len, real_cs);
break;
}
@@ -5022,4 +5029,3 @@ create_func_cast(THD *thd, Item *a, Cast
}
return res;
}
-
--- 1.49/sql/item_create.h 2007-05-11 13:07:59 +05:00
+++ 1.50/sql/item_create.h 2007-05-11 13:07:59 +05:00
@@ -159,9 +159,9 @@ protected:
@param dec TODO
@param cs The character set
*/
-Item*
-create_func_cast(THD *thd, Item *a, Cast_target cast_type, int len, int dec,
+Item *
+create_func_cast(THD *thd, Item *a, Cast_target cast_type,
+ const char *len, const char *dec,
CHARSET_INFO *cs);
-
#endif
--- 1.385/sql/item_func.cc 2007-05-11 13:07:59 +05:00
+++ 1.386/sql/item_func.cc 2007-05-11 13:07:59 +05:00
@@ -1080,9 +1080,26 @@ err:
void Item_decimal_typecast::print(String *str)
{
+ char len_buf[20*3 + 1];
+ char *end;
+ CHARSET_INFO *cs= str->charset();
+
+ uint precision= my_decimal_length_to_precision(max_length, decimals,
+ unsigned_flag);
str->append(STRING_WITH_LEN("cast("));
args[0]->print(str);
- str->append(STRING_WITH_LEN(" as decimal)"));
+ str->append(STRING_WITH_LEN(" as decimal("));
+
+ end=int10_to_str(precision, len_buf,10);
+ str->append(len_buf, (uint32) (end - len_buf));
+
+ str->append(',');
+
+ end=int10_to_str(decimals, len_buf,10);
+ str->append(len_buf, (uint32) (end - len_buf));
+
+ str->append(')');
+ str->append(')');
}
--- 1.170/sql/item_func.h 2007-05-11 13:07:59 +05:00
+++ 1.171/sql/item_func.h 2007-05-11 13:07:59 +05:00
@@ -333,8 +333,8 @@ class Item_decimal_typecast :public Item
public:
Item_decimal_typecast(Item *a, int len, int dec) :Item_func(a)
{
- max_length= len + 2;
decimals= dec;
+ max_length= my_decimal_precision_to_length(len, dec, unsigned_flag);
}
String *val_str(String *str);
double val_real();
--- 1.565/sql/sql_yacc.yy 2007-05-11 13:07:59 +05:00
+++ 1.566/sql/sql_yacc.yy 2007-05-11 13:07:59 +05:00
@@ -6477,15 +6477,13 @@ simple_expr:
}
| BINARY simple_expr %prec NEG
{
- $$= create_func_cast(YYTHD, $2, ITEM_CAST_CHAR, -1, 0,
+ $$= create_func_cast(YYTHD, $2, ITEM_CAST_CHAR, NULL, NULL,
&my_charset_bin);
}
| CAST_SYM '(' expr AS cast_type ')'
{
LEX *lex= Lex;
- $$= create_func_cast(YYTHD, $3, $5,
- lex->length ? atoi(lex->length) : -1,
- lex->dec ? atoi(lex->dec) : 0,
+ $$= create_func_cast(YYTHD, $3, $5, lex->length, lex->dec,
lex->charset);
if (!$$)
MYSQL_YYABORT;
@@ -6494,10 +6492,8 @@ simple_expr:
{ $$= new (YYTHD->mem_root) Item_func_case(* $3, $2, $4 ); }
| CONVERT_SYM '(' expr ',' cast_type ')'
{
- $$= create_func_cast(YYTHD, $3, $5,
- Lex->length ? atoi(Lex->length) : -1,
- Lex->dec ? atoi(Lex->dec) : 0,
- Lex->charset);
+ $$= create_func_cast(YYTHD, $3, $5, Lex->length, Lex->dec,
+ Lex->charset);
if (!$$)
MYSQL_YYABORT;
}
--- 1.222/mysql-test/r/view.result 2007-05-11 13:07:59 +05:00
+++ 1.223/mysql-test/r/view.result 2007-05-11 13:07:59 +05:00
@@ -3346,6 +3346,19 @@ id select_type table type possible_keys
NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL Using filesort
DROP VIEW v1;
DROP TABLE t1;
+CREATE VIEW v1 AS SELECT CAST( 1.23456789 AS DECIMAL( 7,5 ) ) AS col;
+SELECT * FROM v1;
+col
+1.23457
+DESCRIBE v1;
+Field Type Null Key Default Extra
+col decimal(7,5) NO 0.00000
+DROP VIEW v1;
+CREATE VIEW v1 AS SELECT CAST(1.23456789 AS DECIMAL(8,0)) AS col;
+SHOW CREATE VIEW v1;
+View Create View
+v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(1.23456789 as decimal(8,0)) AS `col`
+DROP VIEW v1;
End of 5.0 tests.
DROP DATABASE IF EXISTS `d-1`;
CREATE DATABASE `d-1`;
--- 1.15/sql/my_decimal.h 2007-05-11 13:07:59 +05:00
+++ 1.16/sql/my_decimal.h 2007-05-11 13:07:59 +05:00
@@ -395,5 +395,16 @@ int my_decimal_intg(const my_decimal *a)
}
+void my_decimal_trim(ulong *precision, uint *scale)
+{
+ if (!(*precision) && !(*scale))
+ {
+ *precision= 10;
+ *scale= 0;
+ return;
+ }
+}
+
+
#endif /*my_decimal_h*/
| Thread |
|---|
| • bk commit into 5.1 tree (holyfoot:1.2510) | holyfoot | 11 May |
