summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-10052 Illegal mix of collations with DAYNAME(date_field)<>varchar_fieldAlexander Barkov2016-05-104-4/+51
|
* MDEV-9973 : Do not set permissions for serviceaccount user (Win7 and later)Vladislav Vaintroub2016-04-271-11/+0
| | | | | This appears to break some installation, and it did not do anything useful anyway.
* MDEV-9987 - gen_lex_hash leaks memory, making LeakSanitizer builds failSergey Vojtovich2016-04-261-0/+2
| | | | Fixed memory leaks in gen_lex_hash.
* MDEV-9986 Full-text search of the utf8mb4 column causes crashSergei Golubchik2016-04-263-0/+29
| | | | | take into account that agg_arg_charsets_for_comparison() can replace Item_field's with Item_func_conv_charset
* disable main.wait_timeout_not_windows for embeddedSergei Golubchik2016-04-261-0/+1
|
* MDEV-7775 Wrong error message (Unknown error) when idle sessions are killed ↵Sergei Golubchik2016-04-253-1/+20
| | | | | | after wait_timeout restore the error message that was removed by mistake in ec38c1bbd709
* support SEARCH_RANGE in search_pattern_in_file.incSergei Golubchik2016-04-251-1/+16
| | | | | | | | | | Backport a part of commit 439f75f Author: Kristian Nielsen <knielsen@knielsen-hq.org> Date: Mon Jun 30 13:59:21 2014 +0200 Fix test failures in rpl.rpl_checksum and rpl.rpl_gtid_errorlog.
* MDEV-9975 - main.partition_innodb_plugin fails sporadicallySergey Vojtovich2016-04-241-5/+1
| | | | | | | | | Fixed wait condition to wait for InnoDB to actually acquire row locks instead of waiting for thread to enter "Searching rows for update" state (which happens earlier). Also use default wait timeout, 2 seconds can be too few for threads to enter appropriate state.
* MDEV-9142 :Adding Constraint with no database referenceJan Lindström2016-04-235-7/+113
| | | | | | | results in ERROR 1046 (3D000) at line 13: No database selected. Use database from create table to foreign key database if nothing else is given.
* Fixed compilation failure due to unused var.Sergey Vojtovich2016-04-231-2/+2
|
* MDEV-9970 - main.sp-threads fails sporadicallySergey Vojtovich2016-04-232-9/+9
| | | | | Added proper waiting for thread to enter required state. Also reduced amount of information dumped from processlist.
* bump the VERSIONDaniel Bartholomew2016-04-221-1/+1
|
* MDEV-9372 select 100 between 1 and 9223372036854775808 returns falseAlexander Barkov2016-04-223-2/+20
| | | | | | Integer comparison of INT expressions with different signess in BETWEEN is not safe. Switching to DECIMAL comparison in case if INT arguments have different signess.
* Merge branch 'bb-5.5-serg' into 5.5mariadb-5.5.49Sergei Golubchik2016-04-2072-242/+925
|\
| * Merge branch 'merge-xtradb-5.5' into 5.5Sergei Golubchik2016-04-206-27/+60
| |\
| | * 5.5.48-37.8Sergei Golubchik2016-04-186-19/+62
| | |
| * | use consistent error messaging for IGNORESergei Golubchik2016-04-205-63/+11
| | | | | | | | | | | | | | | | | | | | | | | | 1. the same message text for INSERT and INSERT IGNORE 2. no new warnings in UPDATE IGNORE yet (big change for 5.5) and replace a commonly used expression with a named constant
| * | trivial optimizationSergei Golubchik2016-04-201-2/+4
| | | | | | | | | | | | | | | don't call write_bin_log() when binlog is known to be disable
| * | another test case for ER_DATA_OUT_OF_RANGE on insertSergei Golubchik2016-04-202-0/+13
| | | | | | | | | | | | tests it with a non-const table too
| * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-2048-159/+476
| |\ \
| | * | Bug #22738607: YASSL FUNCTION X509_NAME_GET_INDEX_BY_NID IS NOT WORKING AS ↵mysql-5.5.49Yashwant Sahu2016-02-269-28/+80
| | | | | | | | | | | | | | | | EXPECTED.
| | * | BUG#20574550 MAIN.MERGE TEST CASE FAILS IF BINLOG_FORMAT=ROWVenkatesh Duggirala2016-02-268-10/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main.merge test case was failing when tested using row based binlog format. While analyzing the issue it was found the following issues: a) The server is calling binlog related code even when a statement will not be binlogged; b) The child table list was not present into table structure by the time to generate the create table statement; c) The tables in the child table list will not be opened yet when generating table create info using row based replication; d) CREATE TABLE LIKE TEMP_TABLE does not preserve original table storage engine when using row based replication; This patch addressed all above issues. @ sql/sql_class.h Added a function to determine if the binary log is disabled to the current session. This is related with issue (a) above. @ sql/sql_table.cc Added code to skip binary logging related code if the statement will not be binlogged. This is related with issue (a) above. Added code to add the children to the query list of the table that will have its CREATE TABLE generated. This is related with issue (b) above. Added code to force the storage engine to be generated into the CREATE TABLE. This is related with issue (d) above. @ storage/myisammrg/ha_myisammrg.cc Added a test to skip a table getting info about a child table if the child table is not opened. This is related to issue (c) above.
| | * | (no commit message)Arun Kuruvila2016-02-231-3/+11
| | | |
| | * | (no commit message)Arun Kuruvila2016-02-231-8/+8
| | | |
| | * | (no commit message)Arun Kuruvila2016-02-231-3/+6
| | | |
| | * | WL#9072: Backport WL#8785 to 5.5Ramil Kalimullin2016-02-1918-41/+265
| | | |
| | * | BUG#22037930: INSERT IGNORE FAILS TO IGNORE FOREIGN KEYNisha Gopalakrishnan2016-02-116-13/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONSTRAINT. Analysis ======= INSERT and UPDATE operations using the IGNORE keyword which causes FOREIGN KEY constraint violations reports an error despite using the IGNORE keyword. Foreign key violation errors were not ignored and reported as errors instead of warnings even when IGNORE was set. Fix === Added code to ignore the foreign key violation errors and report them as warnings when the IGNORE keyword is used.
| | * | Bug#22680706: 5.5 DOES NOT BUILD WITH GCC5Jon Olav Hauglid2016-02-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following two build warnings so that 5.5 can be compiled with GCC5. storage/innobase/dict/dict0crea.c:1143:21: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses] ut_a(!node->index == (err != DB_SUCCESS)); ^ storage/innobase/log/log0recv.c:1770:20: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses] ut_ad(!allow_ibuf == mutex_own(&log_sys->mutex)); ^
| | * | Merge branch 'mysql-5.5.48-release' into mysql-5.5Gipson Pulla2016-02-050-0/+0
| | |\ \
| | * | | Bug #18823979: PS: UCS2 + CASE WHEN THEN ELSE CRASH INSreeharsha Ramanavarapu2016-01-292-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ITEM_PARAM::SAFE_CHARSET_CONVERTER ISSUE: ------ Charset conversion on a null parameter is not handled correctly. SOLUTION: --------- Item_param's charset converter does not handle the case where it might have to deal with a null value. This is fine for other charset converters since the value is not supplied to them at runtime. The fix is to check if the parameter is now set to null and return an Item_null object. Also, there is no need to initialize Item_param's cnvitem in the constructor to a string. This can be done in ITEM_PARAM::SAFE_CHARSET_CONVERTER itself. Members of Item_param, cnvbuf and cnvstr, have been removed and cnvitem has been made a local variable in ITEM_PARAM::SAFE_CHARSET_CONVERTER.
| | * | | Bug #16912362 LOAD DATA INFILE CLAIMS TO BE HOLDINGAjo Robert2016-01-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'SYSTEM LOCK' IN PROCESSLIST Analysis ========= Show processlist shows 'System Lock' in 'State' field while LOAD DATA INFILE is running. thd->proc_info update is missing in LOAD DATA INFILE path. Thus any request will get last unpdated status from lock_table() during open_table(). Fix: ======= Update state information from LOAD DATA INFILE path.
| | * | | BUG#22600974 - SYSV INITSCRIPT FOR RHEL DON'T ENABLE MYSQLD SERVICE BY ↵Balasubramanian Kandasamy2016-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEFAULT Enable mysqld service by default in sysv initscrips
| | * | | Followup:BUG#22530768 Innodb freeze running REPLACE statementsShaohua Wang2016-01-271-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Go back to __sync_* operations in TAS on x86. Patch is reviewed by Sunny over IM.
| | * | | Bug#21770366 backport bug#21657078 to 5.5 and 5.6Jon Olav Hauglid2016-01-261-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post-push fix: The problem was that condition variable timeouts could in some cases (slow machines and/or short timeouts) be infinite. When the number of milliseconds to wait is computed, the end time is computed before the now() time. This can result in the now() time being later than the end time, leading to negative timeout. Which after conversion to unsigned becomes ~infinite. This patch fixes the problem by explicitly checking if we get negative timeout and then using 0 if this is the case.
| | * | | Bug#22086528: TEST CODE DISABLED THOUGH THE HISTORIC REASONS - BUGS - ARE FIXEDDeepthi Eranti_Sreenivas2016-01-222-7/+6
| | | | | | | | | | | | | | | | | | | | Post push fix for 5.5 and 5.6.Disabled the test code due to Bug#22587377
| | * | | Bug#22086528 : TEST CODE DISABLED THOUGH THE HISTORIC REASONS - BUGS - ARE FIXEDDeepthi Eranti_Sreenivas2016-01-202-29/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: mysql-test/suite/rpl/t/rpl_killed_ddl.test This test contains code which was disabled because of certain bugs. BUG#44041 declared to be a duplicate of Bug#45516 which was fixed 2010 BUG#43353 fixed 2012 BUG#44171 fixed 2010 Fix: Enabled the test code related to the above mentioned bugs.
| | * | | Bug#21682356: STOP INJECTING DATA ITEMS IN AN ERROR MESSAGEKnut Anders Hatlen2016-01-176-21/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GENERATED BY THE EXP() FUNCTION When generating the error message for numeric overflow, pass a flag to Item::print() that prevents it from expanding constant expressions and parameters to the values they evaluate to. For consistency, also pass the flag to Item::print() when Item_func_spatial_collection::fix_length_and_dec() generates an error message. It doesn't make any difference at the moment, since constant expressions haven't been evaluated yet when this function is called.
| | * | | BUG#22530768 Innodb freeze running REPLACE statementsShaohua Wang2016-01-122-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we can see from the hang stacktrace, srv_monitor_thread is blocked when getting log_sys::mutex, so that sync_arr_wake_threads_if_sema_free cannot get a change to break the mutex deadlock. The fix is simply removing any mutex wait in srv_monitor_thread. Patch is reviewed by Sunny over IM.
| | * | | Raise version number after cloning 5.5.48Bjorn Munch2016-01-111-1/+1
| | | | |
| * | | | fix a couple of dbug tests not to write to /tmpSergei Golubchik2016-04-195-10/+8
| | | | |
| * | | | MDEV-9835 Valid password is not working after server restartSergei Golubchik2016-04-193-5/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On SET PASSWORD if the plugin is mysql_native_password or mysql_old_password, do reset plugin and auth_str fields.
| * | | | MDEV-5982 `make` fail @ ".../libmysql_versions.ld:155:9: invalid use of ↵Sergei Golubchik2016-04-192-18/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VERSION in input file" add a workaround for gold
| * | | | MDEV-9885 Client doesn't start if 'TERM' unknownSergei Golubchik2016-04-191-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | 1. don't exit if setupterm() failed 2. don't use vidattr() if setupterm() failed
| * | | | MDEV-9707 MAX(timestamp(6) column) in correlated sub-query returns ↵Sergei Golubchik2016-04-193-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-existent row data in original table special treatment for temporal values in create_tmp_field_from_item(). old code only did it when result_type() was STRING_RESULT, but Item_cache_temporal::result_type() is INT_RESULT
| * | | | MDEV-9929 MariaDB segfaults on command "mysqld --version" with ignore-db-dir ↵Sergei Golubchik2016-04-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option on /etc/my.cnf don't put command-line arguments into opt_ignore_db_dirs - it is supposed to contain a malloc()'ed accumulated list of all ignored dirs
| * | | | MDEV-9493 --tc-heuristic-recover option values off by oneSergei Golubchik2016-04-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix typelib to match defines: #define TC_HEURISTIC_RECOVER_COMMIT 1 #define TC_HEURISTIC_RECOVER_ROLLBACK 2
| * | | | MDEV-9928 LC_TIME_NAMES=de_AT; unusual name for februarySergei Golubchik2016-04-193-1/+21
| | | | | | | | | | | | | | | | | | | | s/Feber/Februar/
| * | | | MDEV-9748 Include Twin (mysys_err.h is included twice in mysys/my_copy.c)Sergei Golubchik2016-04-191-1/+0
| | | | |
* | | | | MDEV-9836 Connection lost when using SSLVladislav Vaintroub2016-04-204-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't read from socket in yassl in SSL_pending(). Just return size of the buffered processed data. This is what OpenSSL is documented to do too: SSL_pending() returns the number of bytes which have been processed, buffered and are available inside ssl for immediate read.
* | | | | MDEV-9943 - TokuDB fails to compile with gcc 5.2.1Sergey Vojtovich2016-04-201-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason check_cxx_compiler_flag() passes result variable name down to compiler: https://github.com/Kitware/CMake/blob/master/Modules/CheckCXXSourceCompiles.cmake#L57 But compiler doesn't permit dashes in macro name, like in -DHAVE_CXX_-fimplicit-templates. Workarounded by renaming HAVE_CXX_-fimplicit-templates to HAVE_CXX_IMPLICIT_TEMPLAES.