summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-241-0/+9
|\
| * Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-236-21/+14
| |\
* | \ Merge branch '10.0' into 10.1Sergei Golubchik2016-02-234-19/+8
|\ \ \ | | |/ | |/|
| * | Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24Sergei Golubchik2016-02-173-18/+7
| |\ \
| | * | MDEV-9308 Fix build errors with recent gcc (isfinite)Sergei Golubchik2016-02-171-0/+3
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-153-18/+4
| | |\ \
| | | * | dtrace in cmakeSergei Golubchik2016-02-151-0/+0
| | | * | better inline checkSergei Golubchik2016-02-151-14/+0
| | | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-091-3/+3
| | | |\ \
| | | | * | Updated copyright year in user visible textBjorn Munch2016-01-111-2/+2
| | | | * | Bug#21770366 backport bug#21657078 to 5.5 and 5.6Ajo Robert2016-01-071-8/+4
| | | | * | Bug #21221862 NEWEST RHEL/CENTOS OPENSSL UPDATE BREAKS MYSQL DHE CIPHERSV S Murthy Sidagam2015-06-191-2/+2
| | | | * | Raise version number after cloning 5.5.42Bala2015-01-051-2/+2
| | | * | | MDEV-9024 Build fails with VS2015Sergei Golubchik2016-02-061-0/+2
| | | * | | MDEV-9466 : Exception handler on Windows does not output any text,Vladislav Vaintroub2016-02-031-1/+1
| * | | | | MDEV-9511 Valgrind warnings 'Invalid read' in Field_newdate::cmp and Field_ne...Alexander Barkov2016-02-171-1/+1
| |/ / / /
| * | | | Merge MDEV-9112 into 10.0Kristian Nielsen2016-02-011-1/+1
| |\ \ \ \ | | |/ / /
* | | | | cleanupSergei Golubchik2016-02-231-0/+9
* | | | | Fixes needed to compile with musl C libraryMonty2016-02-071-2/+4
* | | | | Merge MDEV-9112 into 10.1Kristian Nielsen2016-02-011-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | MDEV-9112: Non-blocking client API missing on non-x86 platformsGeorg Richter2016-02-011-1/+1
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-01-251-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | MDEV-9366 : do_shutdown_server fails to detect server shutdown on Windows.Vladislav Vaintroub2016-01-071-1/+1
* | | | | stack too small on labrador (again!)Sergei Golubchik2016-01-251-1/+1
* | | | | Revert "Fixed compilation failure on MacOSX"Vicențiu Ciorbaru2016-01-171-2/+1
* | | | | Fixed compilation failure on MacOSXVicențiu Ciorbaru2016-01-171-1/+2
* | | | | remove HA_ERR_INFO, use ER_ALTER_INFOSergei Golubchik2015-12-232-4/+2
* | | | | Don't send error 0 to my_printf_error()Monty2015-12-232-2/+4
* | | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-222-1/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-197-6/+14
| |\ \ \ \
| * \ \ \ \ Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-319-21/+30
| |\ \ \ \ \
| * | | | | | Add close-on-exec flag to open(), socket(), accept() & fopen().Nirbhay Choubey2015-06-242-1/+29
| * | | | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-219-63/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-097-80/+34
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.17' into 10.0-galeraNirbhay Choubey2015-02-271-1/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2015-02-183-3/+11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ maria-10.0.16 mergeNirbhay Choubey2015-01-264-9/+22
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | MDEV-6891: Addendum, update company name in copyright noticeNirbhay Choubey2014-12-121-1/+1
| * | | | | | | | | | | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-052-10/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-285-38/+63
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-114-11/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Local merge of patch for MDEV-3896 from maria-5.5-galera.Nirbhay Choubey2014-07-211-0/+3
| * | | | | | | | | | | | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-193-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-2110-22/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merging mariadb-10.0.10.Nirbhay Choubey2014-04-0810-13/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).Nirbhay Choubey2014-03-251-1/+1
| * | | | | | | | | | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-2620-98/+159
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | MDEV#5626 : Cannot install InnoDB/XtraDB pluginNirbhay Choubey2014-02-101-6/+0
| * | | | | | | | | | | | | | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-2519-133/+308
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status