Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 1 | -4/+9 |
|\ | |||||
| * | MDEV-9588 Mariadb client-only build creates a useless mysqld_safe file | Sergei Golubchik | 2016-07-13 | 1 | -5/+10 |
* | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Fixed assert if user table was mailformed. | Monty | 2016-05-01 | 1 | -0/+1 |
* | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-02-25 | 1 | -5/+0 |
|\ \ | |/ | |||||
| * | MDEV-9529 - do not install sql script to BINDIR | Vladislav Vaintroub | 2016-02-22 | 1 | -5/+0 |
* | | Merge branch '10.1' into 10.2 | Monty | 2016-02-06 | 1 | -2/+28 |
|\ \ | |/ | |||||
| * | MDEV-7875 Duplicate maria_add_gis_sp script in the sources. | Alexey Botchkov | 2016-01-25 | 1 | -2/+28 |
* | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Alexander Barkov | 2015-12-29 | 1 | -21/+20 |
|\ \ | |/ | |||||
| * | MDEV-9209 - [PATCH] scripts: Do not prepend the prefix to absolute paths | Sergey Vojtovich | 2015-12-22 | 1 | -21/+20 |
* | | MDEV-7376 - Removal of the tool "mysql_zap" | Sergey Vojtovich | 2015-11-26 | 1 | -1/+0 |
* | | MDEV-8654 - Remove mysqlbug | Sergey Vojtovich | 2015-11-26 | 1 | -36/+0 |
|/ | |||||
* | MDEV-427/MDEV-5713 Add systemd script with notify functionality | Sergey Vojtovich | 2015-10-12 | 1 | -1/+1 |
* | MDEV-427/MDEV-5713 Add systemd script with notify functionality | Daniel Black | 2015-10-12 | 1 | -0/+1 |
* | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -16/+10 |
|\ | |||||
| * | MDEV-7398 mysqld segfaults on FreeBSD 10.1 i386 when built with clang 3.4 | Sergei Golubchik | 2015-06-16 | 1 | -16/+10 |
* | | Installation fix. | Alexey Botchkov | 2015-03-17 | 1 | -0/+2 |
* | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 1 | -7/+0 |
|\ \ | |/ | |||||
| * | 5.5 merge | Sergei Golubchik | 2015-01-21 | 1 | -7/+0 |
| |\ | |||||
| | * | mysql-5.5.41 merge | Sergei Golubchik | 2014-12-19 | 1 | -7/+0 |
| | |\ | |||||
| | | * | Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG | Jon Olav Hauglid | 2014-10-13 | 1 | -4/+8 |
| | * | | remove mariadb.pc file again, it cannot be added in a GA versionmariadb-5.5.40 | Sergei Golubchik | 2014-10-08 | 1 | -0/+51 |
| | * | | MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-config | Sergei Golubchik | 2014-10-02 | 1 | -51/+0 |
* | | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | fix out-of-source builds | Sergei Golubchik | 2014-10-04 | 1 | -0/+1 |
* | | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -1/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5.39 merge | Sergei Golubchik | 2014-08-07 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | mysql-5.5.39 merge | Sergei Golubchik | 2014-08-02 | 1 | -0/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Backport from trunk: | Tor Didriksen | 2014-05-12 | 1 | -0/+1 |
| * | | | MDEV-6485 Hard-coded paths in the source cannot be opt-out | Sergei Golubchik | 2014-08-03 | 1 | -1/+5 |
* | | | | MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-config | Sergei Golubchik | 2014-10-11 | 1 | -51/+0 |
* | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+10 |
* | | | | Fix CMakeLists.txt for cmake Ninja generator | Sergei Golubchik | 2014-06-20 | 1 | -1/+1 |
|/ / / | |||||
* | | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -5/+15 |
|\ \ \ | |/ / | |||||
| * | | MDEV-5152 mysql_config includes -lprobes_mysql but mo such library installed | Sergei Golubchik | 2014-04-08 | 1 | -4/+6 |
| * | | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 1 | -1/+9 |
| |\ \ | | |/ | |||||
| | * | Bug#18235669 MYSQL_CONFIG TO PROVIDE R FLAG ON SOLARIS | Tor Didriksen | 2014-02-25 | 1 | -1/+9 |
* | | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
* | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -1/+8 |
|\ \ \ | |/ / | |||||
| * | | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 1 | -1/+0 |
| |\ \ | | |/ | |||||
| | * | BUG 17560050 - MYSQL_INSTALL_DB SCRIPT FAILING WITH RESOLVEIP ISSUES. | Sreedhar.S | 2013-10-09 | 1 | -8/+14 |
| | * | Bug #16619754 - MYSQL_INSTALL_DB.PL FAILS TO CREATE DATABASE ON WINDOWS. | Sreedhar.S | 2013-09-30 | 1 | -15/+8 |
| * | | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria... | Michael Widenius | 2014-01-22 | 1 | -0/+8 |
* | | | More merge fixes: | Michael Widenius | 2013-06-16 | 1 | -1/+1 |
|/ / | |||||
* | | MDEV-3952 Incompatible change in MariaDB-5.5.28a-client rpm adds mytop when n... | Sergei Golubchik | 2013-01-20 | 1 | -1/+1 |
* | | Fixed problem with failing mysql_upgrade when proc table was not correct. | Michael Widenius | 2013-01-11 | 1 | -2/+4 |
* | | MDEV-286 mytop is not installed in 5.5 | Sergei Golubchik | 2012-08-13 | 1 | -1/+2 |
* | | Building RPMs with CPack | Sergei Golubchik | 2012-05-22 | 1 | -1/+3 |