Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'mariadb-10.2.6' into bb-10.2-ext | Alexander Barkov | 2017-05-26 | 4 | -3/+14 |
|\ | |||||
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-05-09 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 1 | -1/+1 |
| | |\ | |||||
| | | * | fix "cmake -DWITH_PCRE=bundled" | Sergei Golubchik | 2017-04-21 | 1 | -1/+1 |
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-06 | 3 | -2/+13 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-9566 build mariabackup with libarchive for release | Vladislav Vaintroub | 2017-04-27 | 1 | -0/+4 |
| | * | | MDEV-9566 MariaBackup packaging | Vladislav Vaintroub | 2017-04-27 | 1 | -1/+6 |
| | * | | MDEV-11660 Make encryption plugins "pure" | Vladislav Vaintroub | 2017-04-27 | 1 | -1/+3 |
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-05-05 | 3 | -9/+22 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-04-28 | 3 | -9/+22 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-04-21 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Don't use full path of libtool | Daniel Black | 2017-04-09 | 1 | -1/+1 |
| | * | | OSX: get cache line size | Daniel Black | 2017-04-20 | 1 | -7/+21 |
| | * | | Bump WSREP_PATCH_VERSION to 19 | Philip Stoev | 2017-04-06 | 1 | -1/+1 |
| | * | | Bump WSREP_PATCH_VERSION to 18 | Philip Stoev | 2017-04-06 | 1 | -1/+1 |
| | * | | Bump WSREP_PATCH_VERSION to 17 | Philip Stoev | 2017-04-06 | 1 | -1/+1 |
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-04-13 | 1 | -2/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix building aws_key_management on Linux | Vladislav Vaintroub | 2017-04-06 | 1 | -3/+0 |
| * | | | Merge branch '10.1' into 10.2 | Vladislav Vaintroub | 2017-04-06 | 1 | -5/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | Do not link client plugins to mysqld | Vladislav Vaintroub | 2017-04-06 | 1 | -5/+7 |
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-04-06 | 1 | -1/+8 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-04-06 | 1 | -1/+8 |
| | |\ \ | | | |/ | |||||
| | | * | Compiling, Windows . Avoid unnecessary rebuilds with MSVC. | Vladislav Vaintroub | 2017-04-03 | 1 | -2/+9 |
* | | | | Using the -t command line to bison instead of %name-prefix | Alexander Barkov | 2017-04-07 | 1 | -2/+2 |
* | | | | Adding an alternative grammar file sql_yacc_ora.yy for sql_mode=ORACLE | Alexander Barkov | 2017-04-05 | 1 | -1/+1 |
|/ / / | |||||
* | | | Windows, compiling : Remove _DEBUG preprocessor constant, to fix | Vladislav Vaintroub | 2017-04-04 | 1 | -0/+5 |
* | | | Allow to specify C runtime library used for compilation. | Vladislav Vaintroub | 2017-04-02 | 1 | -8/+21 |
* | | | Merge 10.2 into bb-10.2-mariarocks | Sergei Petrunia | 2017-03-31 | 11 | -207/+44 |
|\ \ \ | |||||
| * \ \ | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 5 | -3/+39 |
| |\ \ \ | | |/ / | |||||
| | * | | disable innodb snappy for release builds | Sergei Golubchik | 2017-03-29 | 1 | -0/+1 |
| | * | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-03-21 | 3 | -0/+32 |
| | |\ \ | | | |/ | |||||
| | | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-03-21 | 3 | -0/+32 |
| | | |\ | |||||
| | | | * | MDEV-12231 MariaDB fails to restart after 10.0.30-1.el7 update | Sergei Golubchik | 2017-03-12 | 1 | -0/+2 |
| | | | * | MDEV-12207 Include windows compatibility manifest into executable to make Get... | Vladislav Vaintroub | 2017-03-08 | 2 | -0/+30 |
| | * | | | small plugin API related fixes | Sergei Golubchik | 2017-03-10 | 1 | -2/+5 |
| | * | | | MDEV-11520 after-merge fix for 10.1: Use sparse files. | Marko Mäkelä | 2017-02-22 | 1 | -1/+1 |
| | * | | | There's no systemd socket activation support yet | Sergey Vojtovich | 2017-02-17 | 1 | -1/+1 |
| * | | | | cleanup: innodb files in cmake/ | Sergei Golubchik | 2017-03-29 | 5 | -202/+0 |
| * | | | | MDEV-12328, attempt to fix windows packaging | Vladislav Vaintroub | 2017-03-26 | 1 | -1/+1 |
| * | | | | Merge pull request #342 from rasmushoj/10.2 | Vladislav Vaintroub | 2017-03-24 | 1 | -1/+4 |
| |\ \ \ \ | |||||
| | * | | | | MDEV-12328, added building of AWS for release builds | Rasmus Johansson | 2017-03-24 | 1 | -1/+4 |
| * | | | | | MDEV-12271 Port MySQL 8.0 Bug#23150562 REMOVE UNIV_MUST_NOT_INLINE AND UNIV_N... | Marko Mäkelä | 2017-03-17 | 1 | -1/+1 |
* | | | | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks | Sergei Petrunia | 2017-03-11 | 4 | -65/+32 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-12125 Use FIND_PACKAGE(OpenSSL) to find openssl | Vladislav Vaintroub | 2017-03-08 | 1 | -58/+12 |
| * | | | | | MDEV-12056 mysql_config outputs non-existing mysqlclient | Vladislav Vaintroub | 2017-02-14 | 1 | -2/+2 |
| * | | | | | MDEV-11849: Fix storage/innobase/* compile warnings | Jan Lindström | 2017-01-26 | 1 | -1/+9 |
| * | | | | | Fixes for using ssl with BUILD scripts. | Monty | 2017-01-11 | 1 | -4/+9 |
* | | | | | | RocksDB : Add lookup / compiling with optional compression libraries. | Vladislav Vaintroub | 2017-02-09 | 2 | -0/+27 |
|/ / / / / | |||||
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 6 | -3/+10 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Fix broken cmake -DBUILD_CONFIG=mysql_release on Windows.mariadb-10.1.20 | Vladislav Vaintroub | 2016-12-14 | 1 | -1/+2 |