summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-6403: Temporary tables lost at STOP SLAVE in GTID mode if master has ↵Kristian Nielsen2015-03-045-0/+126
| | | | | | | | | | | | | | | | | | | not rotated binlog since restart The binlog contains specially marked format description events to mark when a master restart happened (which could have caused temporary tables to be silently dropped). Such events also cause slave to close temporary tables. However, there was a bug that if after this, slave re-connects to the master in GTID mode, the master can send an old format description event again. If temporary tables are closed when such event is seen for the second time, it might drop temporary tables created after that event, and cause replication failure. With this patch, the restart flag of the format description event is cleared by the master when it is sent to the slave in a subsequent connection, to avoid the errorneous temp table close.
* MDEV-6589: Incorrect relay log start position when restarting SQL thread ↵Kristian Nielsen2015-03-0410-16/+541
| | | | | | | | | | | | | | | | | | | | | | | | | | | after error in parallel replication The problem occurs in parallel replication in GTID mode, when we are using multiple replication domains. In this case, if the SQL thread stops, the slave GTID position may refer to a different point in the relay log for each domain. The bug was that when the SQL thread was stopped and restarted (but the IO thread was kept running), the SQL thread would resume applying the relay log from the point of the most advanced replication domain, silently skipping all earlier events within other domains. This caused replication corruption. This patch solves the problem by storing, when the SQL thread stops with multiple parallel replication domains active, the current GTID position. Additionally, the current position in the relay logs is moved back to a point known to be earlier than the current position of any replication domain. Then when the SQL thread restarts from the earlier position, GTIDs encountered are compared against the stored GTID position. Any GTID that was already applied before the stop is skipped to avoid duplicate apply. This patch should have no effect if multi-domain GTID parallel replication is not used. Similarly, if both SQL and IO thread are stopped and restarted, the patch has no effect, as in this case the existing relay logs are removed and re-fetched from the master at the current global @@gtid_slave_pos.
* MDEV-5719: Wrong result with GROUP BY and LEFT OUTER JOINmariadb-10.0.16Sergey Petrunya2015-01-253-8/+57
| | | | | | | | | | | Merged revision 5224 from mysql-5.6 and added a test case. .. revno: 5224 committer: Sergey Glukhov <sergey.glukhov@oracle.com> branch nick: mysql-5.6 timestamp: Wed 2013-06-19 14:24:08 +0400 message: Bug#16620047 INCORRECT QUERY RESULT (AFTER SERVER UPGRADE)
* win32-debug build failureSergei Golubchik2015-01-231-0/+5
|
* MDEV-7352: main.kill_processlist-6619 fails sporadically in buildbotKristian Nielsen2015-01-232-2/+9
| | | | | | | | After fix of MDEV-6728, the KILL signal is reset at the start of query execution. This means that in this test case, we need to wait for the to-be-killed query to have started; otherwise the kill signal can be lost, causing the test case to fail.
* 5.5 mergeSergei Golubchik2015-01-231-1/+1
|\
| * update tokudb version after mergeSergei Golubchik2015-01-231-1/+1
| |
* | MDEV-7491: Occasional test failure in ↵Kristian Nielsen2015-01-224-0/+6
| | | | | | | | | | | | | | | | | | | | innodb.group_commit_crash_no_optimize_thread The test case deliberately crashes the server. If this crash happens in the middle of a page write, InnoDB crash recovery recovers the page from the doublewrite buffer, writing a message to the error log that is flagged as a test failure by mysql-test-run. So add a suppression for this.
* | after merge. innodb/xtradb to work on WindowsSergei Golubchik2015-01-224-2/+4
| |
* | connect mergeSergei Golubchik2015-01-2137-145/+4566
|\ \
| * | - Last revision was to add the JSON table type. This one adds a sortOlivier Bertrand2015-01-202-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | on the multiple table result to obtain the same result on Windows and Linux (because files can be retrieved in a different order) modified: storage/connect/mysql-test/connect/r/json.result storage/connect/mysql-test/connect/t/json.test
| * | - Fix compile errors and warnings of LINUX G++Olivier Bertrand2015-01-2021-61/+3958
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added: storage/connect/json.cpp storage/connect/json.h storage/connect/mysql-test/connect/r/json.result storage/connect/mysql-test/connect/std_data/biblio.jsn storage/connect/mysql-test/connect/std_data/expense.jsn storage/connect/mysql-test/connect/std_data/mulexp3.jsn storage/connect/mysql-test/connect/std_data/mulexp4.jsn storage/connect/mysql-test/connect/std_data/mulexp5.jsn storage/connect/mysql-test/connect/t/json.test storage/connect/tabjson.cpp storage/connect/tabjson.h modified: storage/connect/CMakeLists.txt storage/connect/engmsg.h storage/connect/filamtxt.h storage/connect/ha_connect.cc storage/connect/msgid.h storage/connect/mycat.cc storage/connect/plgdbsem.h storage/connect/tabdos.cpp storage/connect/value.cpp storage/connect/value.h
| | * | - Adding the JSON table typeOlivier Bertrand2015-01-1921-50/+3962
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added: storage/connect/json.cpp storage/connect/json.h storage/connect/mysql-test/connect/r/json.result storage/connect/mysql-test/connect/std_data/biblio.jsn storage/connect/mysql-test/connect/std_data/expense.jsn storage/connect/mysql-test/connect/std_data/mulexp3.jsn storage/connect/mysql-test/connect/std_data/mulexp4.jsn storage/connect/mysql-test/connect/std_data/mulexp5.jsn storage/connect/mysql-test/connect/t/json.test storage/connect/tabjson.cpp storage/connect/tabjson.h modified: storage/connect/CMakeLists.txt storage/connect/engmsg.h storage/connect/filamtxt.h storage/connect/ha_connect.cc storage/connect/msgid.h storage/connect/mycat.cc storage/connect/plgdbsem.h storage/connect/tabdos.cpp storage/connect/value.cpp storage/connect/value.h
| | * | - Fix two bugs concerning Discovery of CSV tables:Olivier Bertrand2015-01-171-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sep_char default is now ',' like when discovery is not used If data_charset is UTF8, column names retrieved from the header are no longer converted to UTF8 considering they already are (MDEV-7421) modified: storage/connect/ha_connect.cc
| * | | - Fix two bugs concerning Discovery of CSV tables:Olivier Bertrand2015-01-171-2/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Sep_char default is now ',' like when discovery is not used If data_charset is UTF8, column names retrieved from the header are no longer converted to UTF8 considering they already are. modified: storage/connect/ha_connect.cc
| * | - Add ConnectTimout and QueryTimout options for ODBC tables. ShouldOlivier Bertrand2015-01-136-31/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix MDEV-7415. (To be specified in option_list) modified: storage/connect/ha_connect.cc storage/connect/odbccat.h storage/connect/odbconn.cpp storage/connect/odbconn.h storage/connect/tabodbc.cpp storage/connect/tabodbc.h
| * | - Fix MDEV-7427 by not reallocating the date format in ScanRecord on each ↵Olivier Bertrand2015-01-092-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | inserted row. modified: storage/connect/ha_connect.cc storage/connect/ha_connect.h
| * | - Typo to eliminate some GCC warningsOlivier Bertrand2015-01-062-3/+3
| | | | | | | | | | | | | | | | | | | | | modified: storage/connect/odbconn.cpp storage/connect/plgdbsem.h
| * | - Set connection charset before calling mysql_real_connect for MYSQLOlivier Bertrand2015-01-0614-26/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tables. This should fix bug MDEV-7343. modified: storage/connect/ha_connect.cc storage/connect/myconn.cpp storage/connect/myconn.h storage/connect/reldef.cpp storage/connect/reldef.h storage/connect/table.cpp storage/connect/tabmysql.cpp storage/connect/xtable.h - Prevent double column evaluation when CONNECT does filtering modified: storage/connect/connect.cc - Export CreateFileMap and CloseMemMap (for OEM tables) modified: storage/connect/maputil.h - Add the compute function to be used on VALUE types. Preserve precision for DOUBLE values. modified: storage/connect/value.cpp storage/connect/value.h - Typo (in preparation to the future JSON table type) modified: storage/connect/ha_connect.cc storage/connect/mycat.cc storage/connect/plgdbsem.h
| * | - Temporary fix for MDEV-7304.Olivier Bertrand2014-12-145-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/rcmsg.c - Avoid Memory copying when reading an ODBC table when the entire table is already in the result set. modified: storage/connect/odbconn.cpp storage/connect/odbconn.h storage/connect/tabodbc.cpp storage/connect/tabodbc.h
| * | - Move mktime in TIME_to_localtime because on Linux the hour can be modifiedOlivier Bertrand2014-11-245-19/+23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/value.cpp - These files were commited even not modified (?) modified: storage/connect/ha_connect.cc storage/connect/odbconn.cpp storage/connect/odbconn.h storage/connect/tabodbc.cpp
| | * | - Make the fix for getting day names of dates more generalOlivier Bertrand2014-11-242-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/ha_connect.cc storage/connect/value.cpp
| | * | - Enhance the implementation of ODBC tables when using scrollable cursorOlivier Bertrand2014-11-243-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/odbconn.cpp storage/connect/odbconn.h storage/connect/tabodbc.cpp
| | * | - Fix a bug causing the day always printed as Sunday for date columns withOlivier Bertrand2014-11-232-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a date format specifying DDD or DDDD. modified: storage/connect/ha_connect.cc storage/connect/value.cpp
| | * | - Remove gcc warning (variable n is set and not used)Olivier Bertrand2014-11-201-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/odbconn.cpp
| * | | - Remove gcc warning on variable n set but not usedOlivier Bertrand2014-11-201-4/+2
| |/ / | | | | | | | | | | | | | | | modified: storage/connect/odbconn.cpp
| * | - Implement putting in memory the result set from an ODBC query.Olivier Bertrand2014-11-205-28/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/odbconn.cpp storage/connect/odbconn.h storage/connect/tabodbc.cpp storage/connect/tabodbc.h - Moving the calls to VerifyConnect and GetConnectInfo into the try block in ODBConn::Open (potential crash in case of throw) modified: storage/connect/odbconn.cpp - Handling all ODBC data date types (91, 92, 93) modified: storage/connect/ha_connect.cc storage/connect/odbconn.cpp - Not assuming string results from ODBC catalog functions are zero terminated modified: storage/connect/odbconn.cpp
* | | P_S 5.6.22Sergei Golubchik2015-01-214-9/+291
|\ \ \
| * | | 5.6.22Sergei Golubchik2015-01-194-9/+291
| | | |
* | | | XtraDB 5.6.22-71.0Sergei Golubchik2015-01-2126-273/+781
|\ \ \ \
| * | | | 5.6.22-71.0Sergei Golubchik2015-01-1927-273/+781
| | | | |
* | | | | InnoDB 5.6.22Sergei Golubchik2015-01-2122-248/+745
|\ \ \ \ \
| * | | | | 5.6.22Sergei Golubchik2015-01-1920-247/+743
| | | | | |
* | | | | | after-merge fixesSergei Golubchik2015-01-214-0/+15
| | | | | |
* | | | | | 5.5 mergeSergei Golubchik2015-01-21159-454/+2564
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | MDEV-6671 mysql_server_end breaks OpenSSLSergei Golubchik2015-01-195-1/+7
| | | | | |
| * | | | | MDEV-6220 mysqldump will not backup database with --flush-logs parameter and ↵Sergei Golubchik2015-01-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log_error my.cnf parameter defined some checks were "if [ -n "$err_log" ]", others were "if [ $want_syslog -eq 0 ]", so when both are set, error log file was only partially initialized. To avoid this ambiguity we reset want_syslog when error log file is used.
| * | | | | MDEV-7226 sql-bench test-table-elimination does not executeSergei Golubchik2015-01-191-1/+1
| | | | | |
| * | | | | MDEV-7475 Wrong implementation of checking PLUGIN_VAR_SET conditionSergei Golubchik2015-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | correct the check for PLUGIN_VAR_STR
| * | | | | MDEV-7294 MTR does not use /dev/shm with a out-of-source buildSergei Golubchik2015-01-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtr internally does the following: 1. $default_vardir=.... 2. $opt_vardir=$default_vardir unless $opt_vardir; 3. $opt_vardir=realpath $opt_vardir unless IS_WINDOWS 4. if ($opt_vardir eq $default_vardir) { .... use /dev/shm ... } thus we have to realpath $default_datadir too, otherwise the comparison logic might be broken
| * | | | | MDEV-6347 Build RHEL7 packagesSergei Golubchik2015-01-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | add "mysql-compat-server" alias to MariaDB-server package
| * | | | | restore an incorrectly merged lineSergei Golubchik2015-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's in the dead code (ifdef-ed out) so it doesn't matter what it is. still better to keep it closer to the upstream
| * | | | | MDEV-7448 - mtr may leave stale mysqldSergey Vojtovich2015-01-143-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let mtr handle SIGHUP the same way as SIGINT. This solves stale mysqld processes left after broken/closed ssh connection.
| * | | | | MDEV-7368 : SLES: Failed to start mysql.service: UnitNirbhay Choubey2015-01-142-24/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql.service failed to load Added 'systemctl daemon-reload' command in postin and postun rpm scripts.
| * | | | | MDEV-7404 REPAIR multiple tables crash in MDL_ticket::has_stronger_or_equal_typeSergei Golubchik2015-01-143-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql_alter_table() that is used in mysql_recreate_table() doesn't expect many tables in the TABLE_LIST.
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ TokuDB 7.5.4Sergei Golubchik2015-01-1345-85/+456
| |\ \ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' into releases/tokudb-7.5Rich Prohaska2015-01-041-7/+6
| | | |\ \ \ \ \
| | | | * | | | | DB-787 the tokudb_report_fractal_tree_info_for_db function can leak a db on ↵Rich Prohaska2015-01-041-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an error path where db->open fails
| | | * | | | | | Merge branch 'master' into releases/tokudb-7.5Rich Prohaska2015-01-021-11/+15
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | DB-785 turn off fsync on mariadb for 2PC transactionsRich Prohaska2015-01-021-11/+15
| | | | | | | | |