Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-10877 xxx_unicode_nopad_ci collations | Alexander Barkov | 2016-09-23 | 1 | -0/+2 |
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 1 | -0/+1 |
|\ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -0/+1 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -0/+1 |
| | |\ | |||||
| | | * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-08-03 | 1 | -0/+1 |
| | | |\ | |||||
| | | | * | BUG#23080148 - BACKPORT BUG 14653594 AND BUG 20683959 TO | Thayumanavar S | 2016-06-20 | 1 | -0/+1 |
* | | | | | MDEV-9711 NO PAD collations | Alexander Barkov | 2016-09-06 | 1 | -0/+11 |
* | | | | | MDEV-10743 LDML: a new syntax to reuse sort order from another 8bit simple co... | Alexander Barkov | 2016-09-06 | 2 | -0/+27 |
* | | | | | LDML refactoring for "MDEV-9711 NO PAD collations" | Alexander Barkov | 2016-09-03 | 3 | -0/+150 |
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -0/+10 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-8686 A user defined collation utf8_confusables doesn't work | Alexander Barkov | 2016-06-23 | 1 | -0/+10 |
* | | | | | MDEV-7563 Support CHECK constraint as in (or close to) SQL Standard | Michael Widenius | 2016-06-30 | 3 | -0/+0 |
* | | | | | Merge commit 'd5822a3ad0657040114cdc185c6387b9eb3a12b2' into 10.2 | Monty | 2016-04-28 | 6 | -0/+213 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-9383: Server fails to read master.info after upgrade 10.0 -> 10.1 | Kristian Nielsen | 2016-04-08 | 6 | -0/+213 |
* | | | | | MDEV-9874 LOAD XML INFILE does not handle well broken multi-byte characters | Alexander Barkov | 2016-04-06 | 1 | -0/+1 |
* | | | | | MDEV-9823 LOAD DATA INFILE silently truncates incomplete byte sequences | Alexander Barkov | 2016-04-06 | 2 | -0/+23 |
* | | | | | MDEV-9842 LOAD DATA INFILE does not work well with a TEXT column when using sjis | Alexander Barkov | 2016-04-02 | 1 | -0/+1 |
* | | | | | MDEV-9811 LOAD DATA INFILE does not work well with gbk in some cases | Alexander Barkov | 2016-03-31 | 2 | -0/+2 |
|/ / / / | |||||
* | | | | Add an empty file to std_data for future testing purposes | Vicențiu Ciorbaru | 2016-03-22 | 1 | -0/+0 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 5 | -0/+112 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 5 | -0/+112 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-02-09 | 5 | -0/+112 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #22295186: CERTIFICATE VALIDATION BUG IN MYSQL MAY ALLOW MITM | Yashwant Sahu | 2016-01-11 | 5 | -0/+112 |
* | | | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-11-19 | 5 | -0/+94 |
|\ \ \ \ | |||||
| * \ \ \ | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 2 | -0/+71 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Galera MTR Tests: Instruct xtrabackup SST's socat to use 1024-bit DH keys to ... | Philip Stoev | 2015-09-09 | 1 | -0/+6 |
| * | | | | Galera MTR Tests: Tests for GRA*.log files, replication bundle, preordered ev... | Philip Stoev | 2015-09-09 | 1 | -0/+0 |
| * | | | | Galera MTR Tests: various tests and test fixes | Philip Stoev | 2015-09-09 | 3 | -0/+88 |
| * | | | | Merge tag 'mariadb-10.0.20' into 10.0-galera | Nirbhay Choubey | 2015-06-21 | 3 | -0/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 15 | -525/+496 |
| |\ \ \ \ \ | |||||
| * | | | | | | Merge galera tests from github.com/codership/mysql-wsrep | Nirbhay Choubey | 2015-05-08 | 3 | -0/+147 |
* | | | | | | | MDEV-9011: Redo log encryption does not work | Jan Lindström | 2015-10-30 | 1 | -0/+2 |
* | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-10-12 | 2 | -0/+71 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-10-09 | 2 | -0/+71 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge remote-tracking branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2015-10-08 | 2 | -0/+71 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Bug #16171518 - LOAD XML DOES NOT HANDLE EMPTY ELEMENTS | Shishir Jaiswal | 2015-08-18 | 2 | -0/+71 |
* | | | | | | Merge branch '10.0-galera' into 10.1 | Nirbhay Choubey | 2015-07-14 | 3 | -0/+147 |
* | | | | | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 3 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 3 | -0/+1 |
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | | | |||||
| | * | | | MDEV-7269 mysqlbinlog Don't know how to handle column type=0 meta=0 (0000)# | Alexander Barkov | 2015-06-04 | 3 | -0/+1 |
* | | | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 15 | -525/+496 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 15 | -525/+496 |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | |||||
| | * | | Merge branch 'openquery/MDEV-6916-maria-5.5-check_view-r4408' into 5.5 | Sergei Golubchik | 2015-04-28 | 8 | -0/+76 |
| | |\ \ | |||||
| | | * | | Update tests for mysql_upgrade_view | Daniel Black | 2015-04-14 | 1 | -0/+15 |
| | | * | | Add mysql-test/std_data/mysql_upgrade/* for MDEV-6916 | Oleksandr Byelkin | 2015-04-13 | 7 | -0/+61 |
| | * | | | MDEV-7859 SSL hostname verification fails for long subject names | Sergei Golubchik | 2015-04-27 | 7 | -525/+420 |
| | |/ / | |||||
* | | | | MDEV-8238: Tables with encryption=yes using file_key_management plugin are no... | Jan Lindström | 2015-05-27 | 2 | -0/+13 |
* | | | | tests for file_key_management plugin key file parser | Sergei Golubchik | 2015-04-08 | 1 | -3/+9 |
* | | | | completely rewrote file_key_management plugin | Sergei Golubchik | 2015-04-08 | 1 | -6/+6 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-03-07 | 7 | -411/+525 |
|\ \ \ \ | |/ / / |