Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'mariadb-10.2.6' into bb-10.2-ext | Alexander Barkov | 2017-05-26 | 10 | -61/+186 |
|\ | |||||
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-05-09 | 10 | -45/+67 |
| |\ | |||||
| | * | Merge pull request #362 from grooverdan/10.1-MDEV-XXXX-mysqltest-replace-rege... | Jan Lindström | 2017-05-02 | 1 | -25/+49 |
| | |\ | |||||
| | | * | Add replace_regex to not ignore the regex in "$var /regex/val/" | Daniel Black | 2017-04-18 | 1 | -25/+49 |
| | * | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 10 | -21/+19 |
| | |\ \ | |||||
| | | * \ | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 10 | -23/+20 |
| | | |\ \ | |||||
| | | | * | | MDEV-12276 Missing DBUG_RETURN or DBUG_VOID_RETURN macro in function "do_exec" | Sergei Golubchik | 2017-04-20 | 1 | -10/+10 |
| | | | * | | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55 | Sergei Golubchik | 2017-04-11 | 10 | -13/+10 |
| | | | |\ \ | |||||
| | | | | * | | Bug #25717383: MYSQLDUMP MAY EXECUTE ANY ARBITRARY QUERYmysql-5.5.55 | Bharathy Satish | 2017-03-18 | 1 | -12/+42 |
| | | | | * | | BUG#25575605: SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING ... | Ramil Kalimullin | 2017-03-10 | 10 | -30/+49 |
| * | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-06 | 1 | -16/+119 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | MDEV-9566 prepare mysqltest for mariabackup | Vladislav Vaintroub | 2017-04-27 | 1 | -16/+119 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Fixed compiler warnings and warnings from build.tags | Monty | 2017-05-08 | 1 | -0/+2 |
* | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-05-05 | 1 | -1/+13 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-10431: Please implement mysqldump --add-drop-trigger from MySQL 5.6 | Oleksandr Byelkin | 2017-05-04 | 1 | -1/+13 |
* | | | | | | Fixed compiler warnings and wrong test results | Monty | 2017-04-23 | 1 | -1/+1 |
* | | | | | | Avoid DBUG_ASSERT in mysqlcheck when working with views | Monty | 2017-04-18 | 1 | -2/+17 |
|/ / / / / | |||||
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 8 | -31/+193 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Correct FSF address | iangilfillan | 2017-03-10 | 1 | -1/+1 |
| * | | | | MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade no... | Sergei Golubchik | 2017-03-10 | 1 | -32/+60 |
| * | | | | make mysql_upgrade try to install missing storage engine plugins (MDEV-11942) | Hartmut Holzgraefe | 2017-03-10 | 1 | -2/+48 |
| * | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -2/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.30 | Vicențiu Ciorbaru | 2017-03-06 | 1 | -2/+3 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -2/+3 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | MDEV-11505 wrong databasename in mysqldump comment | Sergei Golubchik | 2017-02-27 | 1 | -2/+3 |
| * | | | | | spelling fixes | klemens | 2017-03-07 | 5 | -16/+16 |
| * | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-03 | 2 | -8/+92 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-11610: mysqladmin flush-X-log options | Daniel Black | 2017-03-02 | 1 | -4/+74 |
| | * | | | | MDEV-11610: Add --local to mysqladmin | Daniel Black | 2017-03-02 | 1 | -3/+17 |
| | |/ / / | |||||
| | * | | | Windows : Fix server compile errors when compile with /Zc:strictStrings option | Vladislav Vaintroub | 2017-02-28 | 1 | -1/+1 |
| * | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-02-08 | 1 | -0/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Set sys_errno upon exec command | Elena Stepanova | 2017-02-01 | 1 | -0/+3 |
* | | | | | cleanup: mysqltest | Sergei Golubchik | 2017-03-29 | 1 | -103/+94 |
* | | | | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 1 | -8/+8 |
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-02-10 | 1 | -2/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -2/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 1 | -2/+4 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-10100 main.pool_of_threads fails sporadically in buildbot | Elena Stepanova | 2017-01-04 | 1 | -0/+8 |
| | | * | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-12-22 | 1 | -2/+4 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug #24496214: MISLEADING ERROR EXECUTING MYSQLADMIN SHUTDOWN AGAINST A SERVER | Georgi Kodinov | 2016-09-08 | 1 | -2/+4 |
| | | | * | Bug#23540182:MYSQLBINLOG DOES NOT FREE THE EXISTING CONNECTION BEFORE OPENING... | Neha Kumari | 2016-08-05 | 1 | -1/+7 |
* | | | | | mysqlbinlog memory leaks | Sergei Golubchik | 2017-01-28 | 1 | -4/+5 |
* | | | | | [MDEV-10570] Add Flashback support | Monty | 2017-01-20 | 2 | -4/+251 |
* | | | | | Fixed issues found by buildbot | Monty | 2017-01-11 | 1 | -0/+1 |
* | | | | | Merge 10.1 to 10.2 | Marko Mäkelä | 2017-01-05 | 1 | -0/+12 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-01-04 | 1 | -0/+12 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-10100 main.pool_of_threads fails sporadically in buildbot | Elena Stepanova | 2017-01-01 | 1 | -0/+12 |
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 4 | -53/+105 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-12-11 | 1 | -5/+21 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-12-09 | 1 | -5/+21 |
| | |\ \ \ | | | |/ / |