Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -10/+35 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-09-16 | 1 | -2/+4 |
| |\ | |||||
| | * | MDEV-6526 INFO_SRC and INFO_BIN installed wrong | Sergei Golubchik | 2014-09-12 | 1 | -2/+5 |
| * | | MDEV-6565 search order for my.cnf inconsistent in docs/use, and global overri... | Sergei Golubchik | 2014-09-10 | 1 | -1/+1 |
| * | | MDEV-6579: Properly handle gen_pfs_lex_token when cross-compiling | James Le Cuirot | 2014-08-15 | 1 | -1/+1 |
| * | | MDEV-6562: Fix WITHOUT_SERVER build | James Le Cuirot | 2014-08-11 | 1 | -1/+4 |
| * | | 5.5.39 merge | Sergei Golubchik | 2014-08-07 | 1 | -1/+8 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.39 merge | Sergei Golubchik | 2014-08-02 | 1 | -1/+8 |
| | |\ | |||||
| | | * | Bug#19001781: ADD SUPPORT FOR CMAKE 3 | Jon Olav Hauglid | 2014-06-24 | 1 | -0/+8 |
| | | * | Bug#18972488 Remove packaging/rpm-uln directory from source - Updated CMakeLi... | Balasubramanian Kandasamy | 2014-06-17 | 1 | -1/+0 |
| | | * | Backport of: | Tor Didriksen | 2014-03-05 | 1 | -0/+6 |
| * | | | typo fixed: only use -ggdb3 when it's supported by the compiler | Sergei Golubchik | 2014-08-06 | 1 | -2/+4 |
| * | | | typo in CMakeLists.txt that caused USE_MYSYS_NEW to be set too early and inco... | Sergei Golubchik | 2014-07-08 | 1 | -7/+7 |
| * | | | MDEV-6410 Cross-compile fixes | Sergei Golubchik | 2014-07-08 | 1 | -0/+12 |
| |\ \ \ | |||||
| | * | | | MySQL Bug #61340: Use CMake EXPORT feature to aid cross-compiling. | James Le Cuirot | 2014-04-27 | 1 | -0/+10 |
* | | | | | MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-config | Sergei Golubchik | 2014-10-11 | 1 | -2/+8 |
* | | | | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes) | Sergei Golubchik | 2014-10-11 | 1 | -6/+0 |
* | | | | | don't enable SECURITY_HARDENED on old gcc | Sergei Golubchik | 2014-10-01 | 1 | -1/+6 |
* | | | | | cleanup: galera merge, simple changes | Sergei Golubchik | 2014-10-01 | 1 | -3/+4 |
* | | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+11 |
* | | | | | MDEV-5730 enhance security using special compilation options | Sergei Golubchik | 2014-06-26 | 1 | -0/+2 |
* | | | | | MDEV-5730 enhance security using special compilation options | Sergei Golubchik | 2014-06-26 | 1 | -0/+14 |
* | | | | | cmake cleanup: use MY_CHECK_AND_SET_COMPILER_FLAG. | Sergei Golubchik | 2014-06-26 | 1 | -65/+10 |
* | | | | | cmake GUI cleanup | Sergei Golubchik | 2014-06-23 | 1 | -5/+2 |
* | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2014-06-13 | 1 | -1/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5.38 merge | Sergei Golubchik | 2014-06-06 | 1 | -1/+6 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | cmake: mark AIO_LIBRARY, EVENT_LIBRARY, GROFF, NROFF as advanced; | Sergei Golubchik | 2014-06-03 | 1 | -0/+5 |
| | * | | | MDEV-5645 MariaDB-5.5.35 - references are made to an "EXCEPTIONS-CLIENT" file... | Sergei Golubchik | 2014-05-31 | 1 | -1/+1 |
* | | | | | set version to 10.1.0 | Sergei Golubchik | 2014-05-25 | 1 | -2/+2 |
* | | | | | Merge branch '10.1' of bzr::/usr/home/serg/Abk/mysql into 10.1 | Sergei Golubchik | 2014-05-25 | 1 | -10/+13 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -10/+13 |
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | |||||
| | * | | fix broken -DWITHOUT_SERVER build: move sql-dependent unit test from mysys/ t... | Sergei Golubchik | 2014-05-05 | 1 | -1/+4 |
| | * | | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 1 | -8/+9 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTION | Tor Didriksen | 2014-01-16 | 1 | -11/+9 |
| | | * | Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTION | Tor Didriksen | 2014-01-16 | 1 | -9/+12 |
* | | | | split README into the actual README and third-party licenses | Sergei Golubchik | 2014-05-24 | 1 | -1/+1 |
* | | | | remove now-obsolete "5.5+5.6 merge" TODO file | Sergei Golubchik | 2014-05-24 | 1 | -1/+1 |
|/ / / | |||||
* | | | MDEV-5620 CMake option to compile against an external PCRE library | Sergei Golubchik | 2014-03-04 | 1 | -1/+3 |
* | | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -1/+9 |
|\ \ \ | |||||
| * \ \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -1/+9 |
| |\ \ \ | | |/ / | |||||
| | * | | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -1/+9 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTION | Tor Didriksen | 2013-12-18 | 1 | -0/+9 |
| | | * | Backport 5.5.35 EL6 uln repo rpms | Balasubramanian Kandasamy | 2013-11-25 | 1 | -0/+1 |
* | | | | Automatic merge | Michael Widenius | 2014-02-05 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Fixes to get valgrind to work with jemalloc | Michael Widenius | 2014-01-02 | 1 | -0/+1 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -0/+80 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -0/+75 |
| |\ \ \ | | |/ / | |||||
| | * | | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 1 | -0/+75 |
| | |\ \ | | | |/ | |||||
| | | * | Fix for Bug 17584523 - LICENSE AND DOCUMENTATION FILES MISSING FROM WINDOWS M... | Sreedhar.S | 2013-10-16 | 1 | -1/+2 |
| | | * | Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE LIBR... | Sreedhar.S | 2013-10-09 | 1 | -20/+0 |