Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 2 | -0/+44 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-11-19 | 2 | -0/+44 |
| |\ | |||||
| | * | MDEV-3940 Server crash or assertion `item->type() == Item::STRING_ITEM' failu... | Sergei Golubchik | 2014-11-18 | 2 | -0/+42 |
* | | | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -2/+0 |
|\ \ \ | |/ / | |||||
| * | | print binlog unsafe errors at log_warnings level 1, not 2. | Sergei Golubchik | 2014-09-18 | 1 | -1/+1 |
| * | | Don't give warning if there are two unique keys used with INSERT .. ON DUPLIC... | Michael Widenius | 2014-09-16 | 2 | -3/+1 |
* | | | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | 5.5.39 merge | Sergei Golubchik | 2014-08-07 | 1 | -0/+4 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.39 merge | Sergei Golubchik | 2014-08-02 | 1 | -0/+4 |
| | |\ | |||||
| | | * | Bug#18949527 SUITE/BINLOG/T/BINLOG_KILLED.TEST FORGETS TO | Namit Sharma | 2014-06-18 | 1 | -0/+8 |
* | | | | Fix for some failing tests.mariadb-galera-10.0.12 | Nirbhay Choubey | 2014-06-26 | 2 | -6/+18 |
|/ / / | |||||
* | | | 5.5.38 merge | Sergei Golubchik | 2014-06-06 | 2 | -0/+95 |
|\ \ \ | |/ / | |||||
| * | | mysql-5.5.38 merge | Sergei Golubchik | 2014-06-03 | 2 | -0/+90 |
| |\ \ | | |/ | |||||
| | * | Bug#17942050:KILL OF TRUNCATE TABLE WILL LEAD TO BINARY LOG | Sujatha Sivakumar | 2014-04-15 | 2 | -0/+89 |
* | | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 2 | -0/+18 |
|\ \ \ | |/ / | |||||
| * | | Merge from 5.3. | Alexander Barkov | 2014-04-21 | 2 | -0/+18 |
| |\ \ | |||||
| | * | | An after-fix for | Alexander Barkov | 2014-04-21 | 2 | -0/+18 |
| | * | | 5.2 merge | Sergei Golubchik | 2014-03-16 | 1 | -6/+7 |
| | |\ \ | |||||
| | | * \ | 5.1 merge | Sergei Golubchik | 2014-03-16 | 1 | -6/+7 |
| | | |\ \ | |||||
| | | | * \ | mysql-5.1.73 merge | Sergei Golubchik | 2014-03-15 | 1 | -6/+7 |
| | | | |\ \ | |||||
* | | | | | | | MDEV-6170 Incorrect ordering with utf8_bin and utf8mb4_bin collations | Alexander Barkov | 2014-04-25 | 2 | -0/+204 |
* | | | | | | | MDEV-4447 MariaDB sources should have unix-style line endings everywhere | Sergei Golubchik | 2014-02-27 | 1 | -2/+2 |
* | | | | | | | fix tests to cleanup after themselves | Sergei Golubchik | 2014-02-06 | 2 | -0/+2 |
* | | | | | | | Merge 10.0-base->10.0 | Alexander Barkov | 2013-12-17 | 2 | -0/+68 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge 5.5->10.0-base | Alexander Barkov | 2013-12-17 | 2 | -0/+68 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WI... | Alexander Barkov | 2013-12-17 | 2 | -0/+68 |
* | | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 6 | -15/+15 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | 5.5 merge | Sergei Golubchik | 2013-11-23 | 6 | -15/+15 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | mysql-5.5.34 merge | Sergei Golubchik | 2013-11-19 | 6 | -15/+15 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | * | | | | | BUG#16290902 DROP TEMP TABLE IF EXISTS CAN CAUSE POINT | Venkatesh Duggirala | 2013-07-27 | 6 | -16/+16 |
* | | | | | | | | MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work | Sergei Golubchik | 2013-12-09 | 23 | -352/+378 |
* | | | | | | | | Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6 | Alexander Barkov | 2013-09-23 | 2 | -4/+6 |
* | | | | | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -5/+4 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -5/+4 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -5/+4 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Bug#16765278 DELETE SQL_LOAD_MB* FILE (TEMP FILE) CREATED | Venkatesh Duggirala | 2013-05-24 | 1 | -5/+4 |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
| | | | * | | | | Bug#16765278 DELETE SQL_LOAD_MB* FILE (TEMP FILE) CREATED | Venkatesh Duggirala | 2013-05-24 | 1 | -6/+7 |
* | | | | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Post-merge buildbot fixes: | Sergey Petrunya | 2013-07-05 | 2 | -4/+4 |
* | | | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
* | | | | | | | | | Adding support for MySQL-5.6 temporal column types: | Alexander Barkov | 2013-07-10 | 2 | -8/+8 |
* | | | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 5 | -6/+8 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 5 | -6/+8 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | The bug | Alexander Barkov | 2013-05-08 | 2 | -4/+4 |
| | * | | | | | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 3 | -2/+4 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOT | Venkatesh Duggirala | 2013-01-28 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | |||||
| | | | * | | | | | Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOT | Venkatesh Duggirala | 2013-01-28 | 1 | -2/+2 |
| | | * | | | | | | BUG#11761680 | Astha Pareek | 2013-01-18 | 1 | -0/+1 |