Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -0/+6 |
|\ | |||||
| * | MDEV-8743: mysqld port/socket - FD_CLOEXEC if no SOCK_CLOEXEC | Daniel Black | 2018-04-19 | 1 | -0/+6 |
| * | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -1/+0 |
| |\ | |||||
| * \ | Merge branch '10.0' into bb-10.0-galera | Sachin Setiya | 2017-03-20 | 1 | -0/+44 |
| |\ \ | |||||
| * \ \ | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 2 | -40/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 3 | -2/+5 |
| |\ \ \ \ | |||||
| * | | | | | Add close-on-exec flag to open(), socket(), accept() & fopen(). | Nirbhay Choubey | 2015-06-24 | 1 | -1/+23 |
* | | | | | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 1 | -1/+0 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 1 | -1/+0 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | MDEV-12230 include/my_sys.h:600:43: error: unknown type name ‘PSI_file_keyâ... | Sergei Golubchik | 2017-04-20 | 1 | -0/+47 |
* | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-03-21 | 1 | -0/+44 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | compiler warning | Sergei Golubchik | 2017-03-16 | 1 | -2/+2 |
| * | | | | | MDEV-12261 build failure without P_S | Sergei Golubchik | 2017-03-15 | 1 | -0/+44 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 2 | -40/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 2 | -40/+1 |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | |||||
| | * | | bugfix: remove my_delete_with_symlink() | Sergei Golubchik | 2017-02-27 | 1 | -41/+0 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 3 | -2/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2015-12-13 | 2 | -0/+3 |
| |\ \ \ | |||||
| | * | | | 5.6.28 | Sergei Golubchik | 2015-12-13 | 2 | -0/+3 |
| * | | | | Correct comments before mysql_socket_{g|s}etfd to refer to the right function | Daniel Black | 2015-12-11 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
* | | | | Fix warning about unused variable if FD_CLOEXEC is not defined | Vladislav Vaintroub | 2015-11-24 | 1 | -0/+2 |
* | | | | compilation failures on Windows | Sergei Golubchik | 2015-07-23 | 1 | -0/+4 |
* | | | | Merge branch '10.0-galera' into 10.1 | Nirbhay Choubey | 2015-07-14 | 1 | -1/+23 |
* | | | | cleanup: safer versions of PSI no-op macros | Sergei Golubchik | 2015-06-27 | 1 | -6/+6 |
* | | | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 2 | -2/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 2 | -2/+0 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | MDEV-8052 abi detection incorrect with clang | Sergei Golubchik | 2015-06-03 | 2 | -2/+0 |
* | | | | MDEV-7956 - handler::rebind_psi() takes 0.07% in OLTP RO | Sergey Vojtovich | 2015-06-19 | 1 | -0/+6 |
|/ / / | |||||
* | | | perfschema 5.6.24 | Sergei Golubchik | 2015-05-05 | 5 | -79/+32 |
|\ \ \ | | |/ | |/| | |||||
| * | | 5.6.24 | Sergei Golubchik | 2015-05-04 | 5 | -79/+32 |
* | | | perfschema 5.6.17 | Sergei Golubchik | 2014-05-07 | 5 | -6/+6 |
|\ \ \ | |/ / | |||||
| * | | 5.6.17 | Sergei Golubchik | 2014-05-07 | 6 | -8/+8 |
* | | | null-merge from perfschema-5.6 merge tree | Sergei Golubchik | 2014-05-07 | 2 | -11/+0 |
|\ \ \ | |/ / | |||||
| * | | perfschema 5.6.10 initial commit. | Sergei Golubchik | 2014-05-07 | 14 | -0/+7835 |
| / | |||||
* | | Merge with 10.0-base | Michael Widenius | 2014-03-13 | 1 | -0/+10 |
|\ \ | |/ | |||||
* | | Fixed MDEV-5780 "create-big fails in 10.0" | Michael Widenius | 2014-03-10 | 1 | -2/+2 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -2/+2 |
| |\ | |||||
| | * | Bug#17702677 WRONG INSTRUMENTATION INTERFACE FOR MYSQL_COND_TIMEDWAIT | Marc Alff | 2013-11-06 | 1 | -2/+2 |
| * | | Buildbot fixes and cleanups: | Michael Widenius | 2013-01-11 | 1 | -4/+13 |
* | | | Client attributes | unknown | 2013-10-03 | 1 | -0/+1 |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 9 | -314/+465 |
|\ \ \ | |||||
| * | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 9 | -308/+457 |
* | | | | remove numerous #ifdef HAVE_PSI_TABLE_INTERFACE | Sergei Golubchik | 2013-04-15 | 1 | -0/+16 |
|/ / / | |||||
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 2 | -2/+2 |
* | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 13 | -816/+4193 |
|/ / | |||||
* | | safe_mutex deadlock detector post-merge fixes | Sergei Golubchik | 2011-10-19 | 1 | -0/+3 |
* | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 2 | -88/+2 |
|\ \ | |/ | |||||
| * | Bug #58699 cannot build with gcc dbg on solaris | Tor Didriksen | 2010-12-21 | 1 | -0/+2 |
| * | A better fix for bug #56405 "Deadlock in the MDL deadlock | Dmitry Lenev | 2010-09-29 | 1 | -88/+0 |