Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 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 |
| | * | | | Bump WSREP_PATCH_VERSION to 18 | Philip Stoev | 2017-03-14 | 1 | -1/+1 |
| | * | | | Bump WSREP_PATCH_VERSION to 17 | Philip Stoev | 2017-03-12 | 1 | -1/+1 |
| | * | | | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 3 | -1/+3 |
| | |\ \ \ | |||||
| * | | | | | MDEV-12593: InnoDB page compression should use lz4_compress_default if | Jan Lindström | 2017-05-18 | 1 | -8/+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 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 |
* | | | | | | 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 |
* | | | | | | 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 |