Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-02-18 | 7 | -411/+525 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42 | Sergei Golubchik | 2015-02-11 | 7 | -411/+525 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#18366947 : VALID DATE RANGE OF DUMMY SSL CERTS IS WAY TOO SHORT | Harin Vadodaria | 2014-12-05 | 7 | -250/+575 |
| | | * | Bug#16395459 TEST AND RESULT FILES WITH EXECUTE BIT | Terje Rosten | 2014-06-27 | 1 | -0/+0 |
| | | * | Bug#11747416 : 32228 A disk full makes binary log corrupt | Andrei Elkin | 2011-09-29 | 1 | -0/+0 |
| | | * | Bug #11766328 59417: TEST BUGS.BUG57108 IS BROKEN:..... | Bjorn Munch | 2011-07-22 | 1 | -95/+0 |
| | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | | |\ | |||||
| | | * | \ | Merge | Magnus Blåudd | 2011-03-25 | 3 | -0/+0 |
| | | |\ \ \ | |||||
| | | | * | | | Bug#60111 storage type for table not saved in .frm | Magnus Blåudd | 2011-03-04 | 3 | -0/+0 |
| | | * | | | | Bug #11755431 (former 47205) | Jon Olav Hauglid | 2011-03-08 | 1 | -0/+0 |
| | | |/ / / | |||||
| | | * | | | Merge fix for bug 56817 from mysql-5.1 to mysql-5.5. | John H. Embretsen | 2011-01-29 | 1 | -0/+97 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Fix for Bug#56817 - mysqlhotcopy tests fail when DBI and DBD-mysql perl modul... | John H. Embretsen | 2011-01-29 | 1 | -0/+97 |
| | | * | | | BUG#57108: mysqld crashes when I attempt to install plugin | Mats Kindahl | 2010-11-04 | 1 | -0/+95 |
| | | * | | | merge | Mattias Jonsson | 2010-10-01 | 1 | -0/+0 |
| | | |\ \ \ | |||||
| | | | * | | | Bug#50036: Inconsistent errors when using TIMESTAMP columns/expressions | Mattias Jonsson | 2010-08-30 | 1 | -0/+0 |
| | | * | | | | merge | Mattias Jonsson | 2010-08-19 | 2 | -0/+0 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| / / | | | | |/ / | |||||
| | | | * | | merge | Mattias Jonsson | 2010-08-19 | 2 | -0/+0 |
| | | | |\ \ | |||||
| | | | | * | | Bug#46086: crash when dropping a partitioned table | Mattias Jonsson | 2010-07-08 | 2 | -0/+0 |