summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* lp:705210 Compiling with BUILD/compile-pentium64-debug failsSergei Golubchik2011-03-2612-84/+84
|
* fixes for funcs_1 suiteSergei Golubchik2011-03-2417-2442/+2452
|
* mergeVladislav Vaintroub2011-03-241-1/+1
|\
| * lp:740958 5.1-micro can not handle prepared statements with timestamps ↵Sergei Golubchik2011-03-231-4/+3
| | | | | | | | | | | | | | involving nanoseconds fix a typo in the boundary test. simplify make_truncated_value_warning call.
* | Fix compilation on Windows:Vladislav Vaintroub2011-03-249-24/+27
| | | | | | | | | | | | | | | | | | | | - Fixes for type-conversion (time_t is not interchangeable with my_time_t on Windows as time_t s 64 bit while my_time_t is long) - BIGENDIAN-> ARCH_BIGENDIAN . BIGENDIAN constant is defined in winsock2.h (as 0) - added explicit cast for longlong->double conversion in sql/item.h (fixed many warnings) Also, HAVE_SNPRINTF is now defined and snprintf is defined to _snprintf in config-win.h
* | lp:740958 5.1-micro can not handle prepared statements with timestamps ↵Sergei Golubchik2011-03-231-4/+3
|/ | | | | | | involving nanoseconds fix a typo in the boundary test. simplify make_truncated_value_warning call.
* lp:740173 5.1-micro reports incorrect Length metadata for TIME expressionsSergei Golubchik2011-03-233-1/+15
|
* ps-protocol fixSergei Golubchik2011-03-192-6/+0
|
* lp:738091 cast(timestamp() AS time returns NULL for 0000-00-00 00:00:00 in ↵Sergei Golubchik2011-03-193-6/+29
| | | | 5.1-micro
* lp:738067 Crash in get_datetime_value() in 5.1-microSergei Golubchik2011-03-193-0/+9
|
* lp:737496 Assertion `(was_cut & 1) == 0' failed in ↵Sergei Golubchik2011-03-183-3/+17
| | | | | | | Field_temporal::store_TIME_with_warning() in 5.1-micro fix incorrect assert
* lp:737474 Wrong result with DAY(COALESCE(NULL)) in 5.1-microSergei Golubchik2011-03-183-1/+9
| | | | | fix the return value of Item_func_coalesce::get_date()
* lp:737450 Second Assertion `item->null_value' failed in 5.1-microSergei Golubchik2011-03-184-9/+21
| | | | | implement Item_func_min_max::get_date()
* lp:737458 Casting dates and times into integers works differently in 5.1-microSergei Golubchik2011-03-183-1/+16
| | | | | better default for Field::cast_to_int_type()
* number to time comparisonSergei Golubchik2011-03-183-2/+28
|
* lp:737111 Different behavior for TIMESTAMPADD with 0000-00-00 argument in ↵Sergei Golubchik2011-03-184-5/+29
| | | | | | | 5.1-micro respect fuzzydate flags in Item_*::get_date() methods
* lp:737104 Crash in DTCollation::set in 5.1-microSergei Golubchik2011-03-174-2/+25
| | | | | | | | | and a different fix for lp:736370 cache temporal expression in Item_cache_int, not in Item_string. invoke get_datetime_value() to create a correct Item_cache_int. Implement Item_cache_int::clone, as it's a proper constant
* lp:737092 Assertion `item->null_value' failed in get_datetime_value in 5.1-microSergei Golubchik2011-03-174-0/+25
| | | | | Implement Item_func_coalesce::get_date()
* lp:736370 Datetime functions in subquery context cause wrong result and ↵Sergei Golubchik2011-03-173-4/+5
| | | | | | | bogus warnings in mysql-5.1-micro Don't cache temporal value in an Item_string, it is compared differently.
* lp:736791 Crash in make_truncated_value_warningwith LEAST()/GREATEST/COALESCESergei Golubchik2011-03-173-2/+35
| | | | | and a test case for lp:736370 Datetime functions in subquery context cause wrong result
* * fix for ALTER TABLE ... MODIFY timestamp->timestamp.Sergei Golubchik2011-03-177-11/+37
| | | | | | | Use dedicated do_field_temporal() for Copy_field. * check_time_range() needs to know TIME's precision to use the correct max value.
* lp:736358 Unexpected increased timestamp resolution with UNIONSergei Golubchik2011-03-173-0/+36
| | | | | partial fix
* lp:731815 Crash/valgrind warning Item::send with 5.1-microSergei Golubchik2011-03-093-1/+23
| | | | | | | | | Two problems: * Item_func_convert_tz() did not tell args[0] that it needs TIME_NO_ZERO_IN_DATE result * Item_func_timediff did not respect fuzzy_date limitations, truncated seconds when casting to signed long, resulting in invalid time value (hours, seconds = (uint)-1).
* lp:731089 Crash in Field_time_hires::pack_length on CREATE TABLE TIME(3)Sergei Golubchik2011-03-091-0/+3
| | | | | add missing size_of() methods to new Field* classes
* lp:731229 Different results depending on table access method with TIME ↵Sergei Golubchik2011-03-088-10/+83
| | | | | | | column and CURDATE() issue a warning when a datetime is truncated for storing in a TIME column. this automatically prevents optimizer from using indexes when comparing time column to a datetime
* lp:731124 Loss of precision on DISTINCTSergei Golubchik2011-03-0811-32/+64
| | | | | | | | | | | | | | | | | | | | | | | many changes: * NOT_FIXED_DEC now create hires fields, not old ones. As a result, temp tables preserve microseconds (on DISTINCT, GROUP BY) * I_S tables force decimals=0 on temporal types (backward compatibility) * Item_func_coalesce calculates decimals for temporal types * no precision for TIME/DATETIME in CAST means 0, not NOT_FIXED_DEC * addtime/timediff calculate decimals from arguments (not NOT_FIXED_DEC) sql/field.h: NOT_FIXED_DEC now create hires fields, not old ones sql/item.h: force decimals=0 for I_S tables sql/item_cmpfunc.cc: Item_func_coalesce calculates decimals for temporal types sql/item_create.cc: no precision for TIME/DATETIME in CAST means 0, not NOT_FIXED_DEC sql/item_timefunc.cc: addtime calculates decimals from arguments (not NOT_FIXED_DEC) sql/item_timefunc.h: timediff calculates decimals from arguments (not NOT_FIXED_DEC)
* lp:731103 Assertion `maybe_null && item->null_value' failed with ORDER BY ↵Sergei Golubchik2011-03-084-2/+42
| | | | | | LAST_DAY() Item_func_last_day did not set mayby_null=1
* followup for lp:730637Sergei Golubchik2011-03-073-20/+14
| | | | | | | | mysql-test/t/func_time.test: fixed wrong test case sql-common/my_time.c: negative datetime is invalid. fix check_date() to reflect that.
* lp:730637 - Valgrind warnings in 5.1-microSergei Golubchik2011-03-077-11/+46
| | | | | | | | | | | | | | | | | sql/field.cc: initialize ltime completely sql/filesort.cc: don't pack MYSQL_TIME if it's not initialized (safe here, but valgrind complains) sql/item_cmpfunc.cc: don't pack MYSQL_TIME if it's not initialized (safe here, but valgrind complains) sql/item_timefunc.cc: don't check MYSQL_TIME members if it's uninitialized (safe here, but valgrind complains) sql/time.cc: use c_ptr_safe() instead of c_ptr() (make valgrind happy)
* lp:730627 TIME_to_ulonglong: Assertion `0' failed in 5.1-micro on wrong ↵Sergei Golubchik2011-03-073-1/+9
| | | | | | argument to MAKETIME correct the return value of Item_func_maketime::get_date()
* wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-01126-3907/+5656
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and collateral changes. * introduce my_hrtime_t, my_timediff_t, and conversion macros * inroduce TIME_RESULT, but it can only be returned from Item::cmp_type(), never from Item::result_type() * pack_time/unpack_time function for "packed" representation of MYSQL_TIME in a longlong that can be compared * ADDTIME()/SUBTIME()/+- INTERVAL now work with TIME values * numbers aren't quoted in EXPLAIN EXTENDED * new column I_S.COLUMNS.DATETIME_PRECISION * date/time values are compares to anything as date/time, not as strings or numbers. * old timestamp(X) is no longer supported * MYSQL_TIME to string conversion functions take precision as an argument * unified the warnings from Field_timestamp/datetime/time/date/newdate store methods * Field_timestamp_hires, Field_datetime_hires, Field_time_hires * Field_temporal * Lazy_string class to pass a value (string, number, time) polymorphically down the stack * make_truncated_value_warning and Field::set_datetime_warning use Lazy_string as an argument, removed char*/int/double variants * removed Field::can_be_compared_as_longlong(). Use Field::cmp_type() == INT_RESULT instead * introduced Item::cmp_result() instead of Item::is_datetime() and Item::result_as_longlong() * in many cases date/time types are treated like other types, not as special cases * greatly simplified Arg_comparator (regarding date/time/year code) * SEC_TO_TIME is real function, not integer. * microsecond precision in NOW, CURTIME, etc * Item_temporal. All items derived from it only provide get_date, but no val* methods * replication of NOW(6) * Protocol::store(time) now takes the precision as an argument * @@TIMESTAMP is a double client/mysqlbinlog.cc: remove unneded casts include/my_sys.h: introduce my_hrtime_t, my_timediff_t, and conversion macros include/my_time.h: pack_time/unpack_time, etc. convenience functions to work with MYSQL_TIME::second_part libmysql/libmysql.c: str_to_time() is gone. str_to_datetime() does it now. my_TIME_to_str() takes the precision as an argument mysql-test/include/ps_conv.inc: time is not equal to datetime anymore mysql-test/r/distinct.result: a test for an old MySQL bug mysql-test/r/explain.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/func_default.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/func_sapdb.result: when decimals=NOT_FIXED_DEC it means "not fixed" indeed mysql-test/r/func_test.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/func_time.result: ADDTIME()/SUBTIME()/+- INTERVAL now work with TIME values mysql-test/r/having.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/information_schema.result: new column I_S.COLUMNS.DATETIME_PRECISION mysql-test/r/join_outer.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/metadata.result: TIMESTAMP no longer has zerofill flag mysql-test/r/range.result: invalid datetime is not compared with as a string mysql-test/r/select.result: NO_ZERO_IN_DATE, etc only affect storage - according to the manual numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/subselect.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/sysdate_is_now.result: when decimals=NOT_FIXED_DEC it means "not fixed" indeed mysql-test/r/type_blob.result: TIMESTAMP(N) is not deprecated mysql-test/r/type_timestamp.result: old TIMESTAMP(X) semantics is not supported anymore mysql-test/r/union.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/r/varbinary.result: numbers aren't quoted in EXPLAIN EXTENDED mysql-test/t/distinct.test: test for an old MySQL bug mysql-test/t/func_time.test: +- INTERVAL now works with TIME values mysql-test/t/select.test: typo mysql-test/t/subselect.test: only one error per statement, please mysql-test/t/system_mysql_db_fix40123.test: old timestamp(X) is no longer supported mysql-test/t/system_mysql_db_fix50030.test: old timestamp(X) is no longer supported mysql-test/t/system_mysql_db_fix50117.test: old timestamp(X) is no longer supported mysql-test/t/type_blob.test: old timestamp(X) is no longer supported mysql-test/t/type_timestamp.test: old timestamp(X) is no longer supported mysys/my_getsystime.c: functions to get the time with microsecond precision mysys/my_init.c: move the my_getsystime.c initialization code to my_getsystime.c mysys/my_static.c: no need to make these variables extern mysys/my_static.h: no need to make these variables extern scripts/mysql_system_tables.sql: old timestamp(X) is no longer supported scripts/mysql_system_tables_fix.sql: old timestamp(X) is no longer supported scripts/mysqlhotcopy.sh: old timestamp(X) is no longer supported sql-common/my_time.c: * call str_to_time from str_to_datetime, as appropriate * date/time to string conversions take precision as an argument * number_to_time() * TIME_to_double() * pack_time() and unpack_time() sql/event_data_objects.cc: cast is not needed my_datetime_to_str() takes precision as an argument sql/event_db_repository.cc: avoid dangerous downcast (because the pointer is not always Field_timestamp, see events_1.test) sql/event_queue.cc: avoid silly double-work for cond_wait (having an endpoint of wait, subtract the current time to get the timeout, and use set_timespec() macro to fill in struct timespec, by adding the current time to the timeout) sql/field.cc: * remove virtual Field::get_time(), everyone should use only Field::get_date() * remove lots of #ifdef WORDS_BIGENDIAN * unified the warnings from Field_timestamp/datetime/time/date/newdate store methods * Field_timestamp_hires, Field_datetime_hires, Field_time_hires * Field_temporal * make_truncated_value_warning and Field::set_datetime_warning use Lazy_string as an argument, removed char*/int/double variants sql/field.h: * remove virtual Field::get_time(), everyone should use only Field::get_date() * remove lots of #ifdef WORDS_BIGENDIAN * unified the warnings from Field_timestamp/datetime/time/date/newdate store methods * Field_timestamp_hires, Field_datetime_hires, Field_time_hires * Field_temporal * make_truncated_value_warning and Field::set_datetime_warning use Lazy_string as an argument, removed char*/int/double variants * removed Field::can_be_compared_as_longlong(). Use Field::cmp_type() == INT_RESULT instead sql/filesort.cc: TIME_RESULT, cmp_time() sql/item.cc: * numbers aren't quoted in EXPLAIN EXTENDED * Item::cmp_result() instead of Item::is_datetime() and Item::result_as_longlong() * virtual Item::get_time() is gone * Item_param::field_type() is set correctly * Item_datetime, for a datetime constant * time to anything is compared as a time * Item_cache::print() prints the value is available * bug fixed in Item_cache_int::val_str() sql/item.h: * Item::print_value(), to be used from Item_xxx::print() when needed * Item::cmp_result() instead of Item::is_datetime() and Item::result_as_longlong() * virtual Item::get_time() is gone * Item_datetime, for a datetime constant * better default for cast_to_int_type() * Item_cache objects now *always* have the field_type() set sql/item_cmpfunc.cc: * get_year_value, get_time_value are gone. get_datetime_value does it all * get_value_a_func, get_value_b_func are gone * can_compare_as_dates() is gone too, TIME_RESULT is used instead * cmp_type() instead or result_type() when doing a comparison * compare_datetime and compate_e_datetime in the comparator_matrix, is_nulls_eq is gone * Item::cmp_result() instead of Item::is_datetime() and Item::result_as_longlong() sql/item_cmpfunc.h: greatly simplified Arg_comparator sql/item_create.cc: * fix a bug in error messages in CAST sql/item_func.cc: Item::cmp_result() instead of Item::is_datetime() and Item::result_as_longlong() mention all possibitiles in switch over Item_result values, or use default: sql/item_row.h: overwrite the default cmp_type() for Item_row, as no MYSQL_TYPE_xxx value corresponds to ROW_RESULT sql/item_timefunc.cc: rewrite make_datetime to support precision argument SEC_TO_TIME is real function, not integer. many functions that returned temporal values had duplicate code in val_* methods, some of them did not have get_date() which resulted in unnecessary date->str->date conversions. Now they all are derived from Item_temporal_func and *only* provide get_date, not val* methods. many fixes to set decimals (datetime precision) correctly. sql/item_timefunc.h: SEC_TO_TIME is real function, not integer. many functions that returned temporal values had duplicate code in val_* methods, some of them did not have get_date() which resulted in unnecessary date->str->date conversions. Now they all are derived from Item_temporal_func and *only* provide get_date, not val* methods. many fixes to set decimals (datetime precision) correctly. sql/log_event.cc: replication of NOW(6) sql/log_event.h: replication of NOW(6) sql/mysql_priv.h: Lazy_string class to pass a value (string, number, time) polymorphically down the stack. make_truncated_value_warning() that uses it. sql/mysqld.cc: datetime in Arg_comparator::comparator_matrix sql/opt_range.cc: cleanup: don't disable warnings before calling save_in_field_no_warnings() sql/protocol.cc: Protocol::store(time) now takes the precision as an argument sql/protocol.h: Protocol::store(time) now takes the precision as an argument sql/rpl_rli.cc: small cleanup sql/set_var.cc: SET TIMESTAMP=double sql/set_var.h: @@TIMESTAMP is a double sql/share/errmsg.txt: precision and scale are unsigned sql/slave.cc: replication of NOW(6) sql/sp_head.cc: cleanup sql/sql_class.cc: support for NOW(6) sql/sql_class.h: support for NOW(6) sql/sql_insert.cc: support for NOW(6) sql/sql_select.cc: use item->cmp_type(). move a comment where it belongs sql/sql_show.cc: new column I_S.COLUMNS.DATETIME_PRECISION sql/sql_yacc.yy: TIME(X), DATETIME(X), cast, NOW(X), CURTIME(X), etc sql/time.cc: fix date_add_interval() to support MYSQL_TIMESTAMP_TIME argument storage/myisam/ha_myisam.cc: TIMESTAMP no longer carries ZEROFIELD flag, still we keep MYI file compatible. strings/my_vsnprintf.c: warnings tests/mysql_client_test.c: old timestamp(X) does not work anymore datetime is no longer equal to time
* we don't support longlong less than 8 bytesSergei Golubchik2011-02-231-3/+3
|
* missing DBUG_RETURNSergei Golubchik2011-02-231-1/+2
|
* bug in the test case fixedSergei Golubchik2011-02-012-2/+2
| | | | | | | | | | | | | | | mysql-test/suite/binlog/r/binlog_killed.result: bug in the test case fixed: the function *must* be declared as NOT DETERMINISTIC because it has side effects (it waits on the get_lock() when invoked more than once). When declared DETERMINISTIC, MariaDB feels free to cache the result and shortcut the execution, which breaks the test logic mysql-test/suite/binlog/t/binlog_killed.test: bug in the test case fixed: the function *must* be declared as NOT DETERMINISTIC because it has side effects (it waits on the get_lock() when invoked more than once). When declared DETERMINISTIC, MariaDB feels free to cache the result and shortcut the execution, which breaks the test logic
* merge 5.1 to 5.1-securityGeorgi Kodinov2010-11-250-0/+0
|\
| * Merge from mysql-5.1.53-releaseunknown2010-11-18185-741/+6332
| |\
* | \ Merge from mysql-5.0-security.Alexander Nozdrin2010-11-241-294/+246
|\ \ \
| * | | A follow-up for Bug#58339 (Replace Server GPL README file).Alexander Nozdrin2010-11-241-294/+246
| | | | | | | | | | | | | | | | Fix formatting issues in README file.
* | | | Empty merge from mysql-5.0-security.Alexander Nozdrin2010-11-240-0/+0
|\ \ \ \ | |/ / /
| * | | Merge from mysql-5.0-bugteam.Alexander Nozdrin2010-11-2414-25/+19
| |\ \ \
| * \ \ \ Auto-merge with mysql-5.0-bugteam.Ramil Kalimullin2010-11-232-154/+2302
| |\ \ \ \
* | \ \ \ \ Merge from mysql-5.1-bugteam.Alexander Nozdrin2010-11-2413-25/+19
|\ \ \ \ \ \
| * \ \ \ \ \ Merge from mysql-5.0-bugteam.Alexander Nozdrin2010-11-2413-25/+19
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- ↵Alexander Nozdrin2010-11-2414-25/+19
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | remove all EXCEPTIONS-CLIENT from all the places.
* | | | | | binlog.binlog_row_failure_mixing_engines test disabled.Ramil Kalimullin2010-11-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See bug #58416.
* | | | | | Auto-merge with mysql-5.1-bugteam.Ramil Kalimullin2010-11-2313-1321/+2496
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Bug#56862 Execution of a query that uses index merge returns a wrong resultSergey Glukhov2010-11-236-0/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of low memory sort buffer QUICK_INDEX_MERGE_SELECT creates temporary file where is stores row ids which meet QUICK_SELECT ranges except of clustered pk range, clustered range is processed separately. In init_read_record we check if temporary file is used and choose appropriate record access method. It does not take into account that temporary file contains partial result in case of QUICK_INDEX_MERGE_SELECT with clustered pk range. The fix is always to use rr_quick if QUICK_INDEX_MERGE_SELECT with clustered pk range is used. mysql-test/suite/innodb/r/innodb_mysql.result: test case mysql-test/suite/innodb/t/innodb_mysql.test: test case mysql-test/suite/innodb_plugin/r/innodb_mysql.result: test case mysql-test/suite/innodb_plugin/t/innodb_mysql.test: test case sql/opt_range.h: added new method sql/records.cc: The fix is always to use rr_quick if QUICK_INDEX_MERGE_SELECT with clustered pk range is used.
| * | | | | Merge from mysql-5.0-bugteam.Alexander Nozdrin2010-11-222-1313/+2302
| |\ \ \ \ \ | | |/ / / /
| | * | | | Patch for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file).Alexander Nozdrin2010-11-221-119/+0
| | | | | |
| | * | | | Patch for Bug#58339 (Replace Server GPL README file).Alexander Nozdrin2010-11-221-35/+2302
| | | | | |