database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merging fixes

Browse Source
This commit is contained in:
holyfoot/hf@mysql.com/hfmain.(none)
2007-05-11 18:19:47 +05:00
parent b3ee5e878d
commit cc488e9220
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/t/view.test
View File

@ -3213,6 +3213,18 @@ EXPLAIN SELECT * FROM t1 UNION SELECT * FROM v1 ORDER BY a;
DROP VIEW v1; DROP VIEW v1;
DROP TABLE t1; DROP TABLE t1;
#
# Bug #27921 View ignores precision for CAST()
#
CREATE VIEW v1 AS SELECT CAST( 1.23456789 AS DECIMAL( 7,5 ) ) AS col;
SELECT * FROM v1;
DESCRIBE v1;
DROP VIEW v1;
CREATE VIEW v1 AS SELECT CAST(1.23456789 AS DECIMAL(8,0)) AS col;
SHOW CREATE VIEW v1;
DROP VIEW v1;
--echo End of 5.0 tests. --echo End of 5.0 tests.
# #

3
sql/item_create.cc
View File

@ -3947,6 +3947,7 @@ Create_func_master_pos_wait::create_native(THD *thd, LEX_STRING name,
my_error(ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT, MYF(0), name.str); my_error(ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT, MYF(0), name.str);
break; break;
} }
}
return func; return func;
} }
@ -4972,7 +4973,7 @@ find_qualified_function_builder(THD *thd)
Item * Item *
create_func_cast(Item *a, Cast_target cast_type, create_func_cast(THD *thd, Item *a, Cast_target cast_type,
const char *c_len, const char *c_dec, const char *c_len, const char *c_dec,
CHARSET_INFO *cs) CHARSET_INFO *cs)
{ {

11
sql/my_decimal.cc
View File

@ -208,6 +208,17 @@ my_decimal *date2my_decimal(MYSQL_TIME *ltime, my_decimal *dec)
} }
void my_decimal_trim(ulong *precision, uint *scale)
{
if (!(*precision) && !(*scale))
{
*precision= 10;
*scale= 0;
return;
}
}
#ifndef DBUG_OFF #ifndef DBUG_OFF
/* routines for debugging print */ /* routines for debugging print */

10
sql/my_decimal.h
View File

@ -395,15 +395,7 @@ int my_decimal_intg(const my_decimal *a)
} }
void my_decimal_trim(ulong *precision, uint *scale) void my_decimal_trim(ulong *precision, uint *scale);
{
if (!(*precision) && !(*scale))
{
*precision= 10;
*scale= 0;
return;
}
}
#endif /*my_decimal_h*/ #endif /*my_decimal_h*/