database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-13 13:47:59 +03:00
Code Activity

merge with mysql-5.5.21

Browse Source
This commit is contained in:
Sergei Golubchik
2012-03-09 08:06:59 +01:00
parent 97ee59d27d 7009bf411a
commit 4933d21e5d
127 changed files with 3500 additions and 1546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/item_timefunc.h
View File

@@ -419,6 +419,7 @@ public:
decimals= args[0]->decimals;
set_if_smaller(decimals, TIME_SECOND_PART_DIGITS);
max_length=17 + (decimals ? decimals + 1 : 0);
maybe_null= 1;
}
void find_num_type() { hybrid_type= decimals ? DECIMAL_RESULT : INT_RESULT; }
double real_op() { DBUG_ASSERT(0); return 0; }