summaryrefslogtreecommitdiff
path: root/mysql-test/suite/binlog
Commit message (Expand)AuthorAgeFilesLines
* bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-052-0/+44
|\
| * 5.5 mergeSergei Golubchik2014-11-192-0/+44
| |\
| | * MDEV-3940 Server crash or assertion `item->type() == Item::STRING_ITEM' failu...Sergei Golubchik2014-11-182-0/+42
* | | bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-2/+0
|\ \ \ | |/ /
| * | print binlog unsafe errors at log_warnings level 1, not 2.Sergei Golubchik2014-09-181-1/+1
| * | Don't give warning if there are two unique keys used with INSERT .. ON DUPLIC...Michael Widenius2014-09-162-3/+1
* | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-0/+4
|\ \ \ | |/ /
| * | 5.5.39 mergeSergei Golubchik2014-08-071-0/+4
| |\ \ | | |/
| | * mysql-5.5.39 mergeSergei Golubchik2014-08-021-0/+4
| | |\
| | | * Bug#18949527 SUITE/BINLOG/T/BINLOG_KILLED.TEST FORGETS TO Namit Sharma2014-06-181-0/+8
* | | | Fix for some failing tests.mariadb-galera-10.0.12Nirbhay Choubey2014-06-262-6/+18
|/ / /
* | | 5.5.38 mergeSergei Golubchik2014-06-062-0/+95
|\ \ \ | |/ /
| * | mysql-5.5.38 mergeSergei Golubchik2014-06-032-0/+90
| |\ \ | | |/
| | * Bug#17942050:KILL OF TRUNCATE TABLE WILL LEAD TO BINARY LOGSujatha Sivakumar2014-04-152-0/+89
* | | 5.5 mergeSergei Golubchik2014-05-092-0/+18
|\ \ \ | |/ /
| * | Merge from 5.3.Alexander Barkov2014-04-212-0/+18
| |\ \
| | * | An after-fix forAlexander Barkov2014-04-212-0/+18
| | * | 5.2 mergeSergei Golubchik2014-03-161-6/+7
| | |\ \
| | | * \ 5.1 mergeSergei Golubchik2014-03-161-6/+7
| | | |\ \
| | | | * \ mysql-5.1.73 mergeSergei Golubchik2014-03-151-6/+7
| | | | |\ \
* | | | | | | MDEV-6170 Incorrect ordering with utf8_bin and utf8mb4_bin collationsAlexander Barkov2014-04-252-0/+204
* | | | | | | MDEV-4447 MariaDB sources should have unix-style line endings everywhereSergei Golubchik2014-02-271-2/+2
* | | | | | | fix tests to cleanup after themselvesSergei Golubchik2014-02-062-0/+2
* | | | | | | Merge 10.0-base->10.0Alexander Barkov2013-12-172-0/+68
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge 5.5->10.0-baseAlexander Barkov2013-12-172-0/+68
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WI...Alexander Barkov2013-12-172-0/+68
* | | | | | | | 10.0-base mergeSergei Golubchik2013-12-166-15/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 5.5 mergeSergei Golubchik2013-11-236-15/+15
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | mysql-5.5.34 mergeSergei Golubchik2013-11-196-15/+15
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | BUG#16290902 DROP TEMP TABLE IF EXISTS CAN CAUSE POINTVenkatesh Duggirala2013-07-276-16/+16
* | | | | | | | MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not workSergei Golubchik2013-12-0923-352/+378
* | | | | | | | Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6Alexander Barkov2013-09-232-4/+6
* | | | | | | | 10.0-base merge.Sergei Golubchik2013-09-211-5/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-5/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | mysql-5.5.33 mergeSergei Golubchik2013-09-061-5/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Bug#16765278 DELETE SQL_LOAD_MB* FILE (TEMP FILE) CREATEDVenkatesh Duggirala2013-05-241-5/+4
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Bug#16765278 DELETE SQL_LOAD_MB* FILE (TEMP FILE) CREATEDVenkatesh Duggirala2013-05-241-6/+7
* | | | | | | | 10.0-monty mergeSergei Golubchik2013-07-212-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Post-merge buildbot fixes: Sergey Petrunya2013-07-052-4/+4
* | | | | | | | | 10.0-base mergeSergei Golubchik2013-07-181-0/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | 5.5 mergeSergei Golubchik2013-07-171-0/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | mysql-5.5.32 mergeSergei Golubchik2013-07-161-0/+2
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | Adding support for MySQL-5.6 temporal column types:Alexander Barkov2013-07-102-8/+8
* | | | | | | | | 10.0-base mergeSergei Golubchik2013-06-065-6/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 5.5 mergeSergei Golubchik2013-06-065-6/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | The bugAlexander Barkov2013-05-082-4/+4
| | * | | | | | | mysql-5.5.31 mergeSergei Golubchik2013-05-073-2/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOTVenkatesh Duggirala2013-01-281-2/+2
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOTVenkatesh Duggirala2013-01-281-2/+2
| | | * | | | | | BUG#11761680Astha Pareek2013-01-181-0/+1