mirror of
https://github.com/MariaDB/server.git
synced 2026-05-10 09:04:29 +02:00
Final fixes for INSERT into MERGE tables.
Move MAX_BLOB_WIDTH to be global Added full support for unsigned BIGINT Fixed spelling errors BUILD/compile-pentium-debug-max: Don't use openssl by default Docs/manual.texi: Cleanup of MERGE tables, Access usage and UDF functions acinclude.m4: Cleanup ssl usage configure.in: Added message when using --with-tools include/mysql_com.h: Move MAX_BLOB_WIDTH to be global myisammrg/myrg_create.c: Fix problem with MERGE TABLES and INSERT myisammrg/myrg_static.c: Fix problem with MERGE TABLES and INSERT mysql-test/r/bigint.result: Added test of unsigned BIGINT mysql-test/r/merge.result: Tests for INSERT mysql-test/r/type_ranges.result: Fixed tests for unsigned bigint mysql-test/t/bigint.test: Added test of unsigned BIGINT mysql-test/t/merge.test: Tests for INSERT mysys/typelib.c: Cleanup sql/field.h: Fixed unsigned BIGINT sql/ha_berkeley.cc: Cleanup sql/ha_gemini.cc: Cleanup sql/ha_myisam.cc: Cleanup sql/ha_myisammrg.cc: Fixed INSERT into MERGE tables sql/item.cc: Fixed unsigned BIGINT sql/item.h: Fixed unsigned BIGINT sql/item_func.cc: Fixed unsigned BIGINT sql/item_strfunc.cc: Fixed spelling errors sql/item_sum.cc: Fixed unsigned BIGINT sql/item_sum.h: Fixed unsigned BIGINT sql/mf_iocache.cc: Fixed spelling errors sql/mysql_priv.h: Moved MAX_BLOB_WIDTH to be global sql/mysqld.cc: Fixed spelling errors sql/opt_range.cc: Fixed spelling errors sql/sql_base.cc: Fixed bug in SHOW OPEN TABLES sql/sql_insert.cc: Fixed spelling errors sql/sql_lex.h: Fixed spelling errors sql/sql_parse.cc: Fixed spelling errors sql/sql_select.cc: Fix for unsigned BIGINT sql/structs.h: Fixed spelling errors sql/time.cc: Fixed spelling errors sql/unireg.cc: Fixed spelling errors
This commit is contained in:
parent
5e0851e1b3
commit
05794bca08
36 changed files with 652 additions and 197 deletions
|
|
@ -271,6 +271,7 @@ class Item_sum_hybrid :public Item_sum
|
|||
protected:
|
||||
String value,tmp_value;
|
||||
double sum;
|
||||
longlong sum_int;
|
||||
Item_result hybrid_type;
|
||||
int cmp_sign;
|
||||
table_map used_table_cache;
|
||||
|
|
@ -286,12 +287,13 @@ class Item_sum_hybrid :public Item_sum
|
|||
void reset()
|
||||
{
|
||||
sum=0.0;
|
||||
sum_int=0;
|
||||
value.length(0);
|
||||
null_value=1;
|
||||
add();
|
||||
}
|
||||
double val();
|
||||
longlong val_int() { return (longlong) val(); } /* Real as default */
|
||||
longlong val_int();
|
||||
void reset_field();
|
||||
String *val_str(String *);
|
||||
void make_const() { used_table_cache=0; }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue