Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2017-09-23 | 2 | -3/+2 |
|\ | |||||
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-09-22 | 1 | -0/+0 |
| |\ | |||||
| | * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-09-21 | 1 | -0/+0 |
| | |\ | |||||
| | | * | remove an empty file with a wrong name | Sergei Golubchik | 2017-09-20 | 1 | -0/+0 |
| * | | | CMake : Do not use FindPkgConfig on Windows | Vladislav Vaintroub | 2017-09-21 | 1 | -3/+2 |
* | | | | MDEV-12583 : Bake the git hash into the binaries. | Vladislav Vaintroub | 2017-09-21 | 1 | -0/+3 |
* | | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2017-09-20 | 6 | -53/+64 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into 10.2 | Vicențiu Ciorbaru | 2017-09-19 | 5 | -48/+57 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-09-19 | 5 | -48/+57 |
| | |\ \ | | | |/ | |||||
| | | * | Build improvements and cleanups. | Vladislav Vaintroub | 2017-09-08 | 5 | -48/+58 |
| * | | | cleanup | Sergei Golubchik | 2017-09-18 | 1 | -2/+2 |
| * | | | bugfix: don't overwrite tokudb.cnf during the build | Sergei Golubchik | 2017-09-18 | 1 | -3/+5 |
* | | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2017-09-01 | 4 | -9/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-08-31 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch 'origin/bb-10.1-jplindst' into 10.1 | Jan Lindström | 2017-08-29 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * \ | Merge remote-tracking branch 'origin/10.0-galera' into 10.1 | Jan Lindström | 2017-08-21 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * | | MW-383 Bumped wsrep patch version | Teemu Ollakka | 2017-08-14 | 1 | -1/+1 |
| | | | * | | Merge tag 'mariadb-10.0.32' into 10.0-galera | Jan Lindström | 2017-08-09 | 2 | -4/+10 |
| | | | |\ \ | |||||
| | | | * \ \ | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 6 | -4/+43 |
| | | | |\ \ \ | |||||
| * | | | | | | | One more attempt to fix dependencies with mysqld import/export libraries | Vladislav Vaintroub | 2017-08-30 | 1 | -4/+0 |
| * | | | | | | | submodules.cmake: git returns 128 if not in a repository | Daniel Black | 2017-08-29 | 1 | -2/+3 |
| * | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-08-29 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-08-28 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Windows compile : make compilation fail on "uninitialized variable used" warn... | Vladislav Vaintroub | 2017-08-24 | 1 | -2/+2 |
| | | | |_|/ | | | |/| | | |||||
* | | | | | | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2017-08-25 | 4 | -19/+38 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 2 | -5/+8 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | allow OpenSSL 0.9.8 again | Sergei Golubchik | 2017-08-13 | 1 | -1/+1 |
| | * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 1 | -3/+4 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Vicențiu Ciorbaru | 2017-07-25 | 1 | -3/+4 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge remote-tracking branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2017-07-18 | 1 | -3/+4 |
| | | | |\ \ \ | |||||
| | | | | * | | | Bug#25942414: SSL VARIABLES USAGE WHEN LIBMYSQL IS COMPILED WITH WITH_SSL=NO | Harin Vadodaria | 2017-04-27 | 2 | -14/+17 |
| | | | | * | | | Bug#25611609 LINK WITH DYNAMIC RUNTIME LIBRARIES ON WINDOWS | Tor Didriksen | 2017-02-27 | 1 | -2/+5 |
| | | | | * | | | Bug#24707666: DEFAULT SETTING FOR SECURE-FILE-PRIV SHOULD BE | Arun Kuruvila | 2016-09-28 | 1 | -8/+248 |
| | | | | * | | | Bug#21770366 backport bug#21657078 to 5.5 and 5.6 | Ajo Robert | 2016-01-07 | 2 | -4/+5 |
| | * | | | | | | disallow invalid values for WITH_SYSTEMD cmake variable. | Sergei Golubchik | 2017-08-08 | 1 | -1/+3 |
| * | | | | | | | cmake: update submodules automatically during the build | Sergei Golubchik | 2017-08-14 | 2 | -14/+30 |
* | | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-07-07 | 3 | -4/+9 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-07-05 | 2 | -2/+7 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge branch 'bb-10.1-vicentiu' into 10.1 | Vicențiu Ciorbaru | 2017-06-27 | 1 | -1/+6 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge remote-tracking branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-06-21 | 1 | -1/+6 |
| | | |\ \ \ \ \ \ | | | | |/ / / / / | |||||
| | | | * | | | | | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-06-20 | 1 | -1/+6 |
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | | | | | / | | | | | |_|_|/ | | | | |/| | | | |||||
| | | | | * | | | MDEV-4646 No mysqld-debug or debuginfo in MariaDB-Server RPM | Sergei Golubchik | 2017-06-18 | 1 | -0/+1 |
| | | | | * | | | Use CPACK_RPM_FILE_NAME="RPM-DEFAULT" | Daniel Black | 2017-06-18 | 1 | -1/+5 |
| | | | | * | | | Attempt to fix strange rpm dependency issue following prior patch | Kristian Nielsen | 2017-04-20 | 1 | -0/+3 |
| | * | | | | | | MDEV-12193 Discontinue support of unsecure and unsupported OpenSSL versions (... | Sergei Golubchik | 2017-06-22 | 1 | -11/+12 |
| | |/ / / / / | |||||
| * | | | | | | MDEV-12938 Discrepancy between mysql_config and mariadb_config | Sergei Golubchik | 2017-07-05 | 1 | -2/+2 |
* | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-06-08 | 1 | -1/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2017-05-26 | 1 | -1/+0 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Bump WSREP_PATCH_VERSION to 19 | Philip Stoev | 2017-03-15 | 1 | -1/+1 |