summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.2' into 10.2-mdev9864Galina Shalygina2016-05-087-9/+16
* MDEV-9811 LOAD DATA INFILE does not work well with gbk in some casesAlexander Barkov2016-03-311-0/+4
* MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_differenceAlexander Barkov2016-03-313-10/+15
* Fixing the return data type of my_charlen() from "uint" to "int",Alexander Barkov2016-03-251-1/+1
* Removing my_strnncoll_mb_bin() and my_strnncollsp_mb_bin(),Alexander Barkov2016-03-251-10/+0
* Merge branch '10.1' into 10.2Sergei Golubchik2016-03-232-2/+2
|\
| * Merge branch '10.0' into 10.1Sergei Golubchik2016-03-212-2/+2
| |\
| | * Update AskMonty and Atlassian references to MariaDBiangilfillan2016-03-081-1/+1
| | * Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-1/+1
* | | Make step bigger to reflect modern needs.Oleksandr Byelkin2016-03-231-1/+1
* | | MDEV-9058: protocol: COM_MULTI command (part 2)Oleksandr Byelkin2016-03-181-1/+4
* | | MDEV-9058: protocol: COM_MULTI command (part 1)Oleksandr Byelkin2016-03-182-1/+6
* | | MDEV-9665 Remove cs->cset->ismbchar()Alexander Barkov2016-03-161-3/+36
* | | MDEV-9651 - Simplify audit event dispatchingSergey Vojtovich2016-03-082-2/+2
* | | Merge branch '10.1' into 10.2Sergei Golubchik2016-02-259-24/+46
|\ \ \ | |/ /
| * | Fix to ensure updates in gtid_slave_state table do not get binlogged.Nirbhay Choubey2016-02-241-3/+3
| * | Merge branch 'bb-10.1-serg' into 10.1Sergei Golubchik2016-02-245-19/+17
| |\ \
| | * \ 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
| | | |\ \ \ \ | | | | |/ / /
| * | | | | | MDEV-7231 Field ROUTINE_DEFINITION in INFORMATION_SCHEMA.`ROUTINES`Alexander Barkov2016-02-241-0/+13
| |/ / / / /
| * | | | | cleanupSergei Golubchik2016-02-231-0/+9
| * | | | | Fixes needed to compile with musl C libraryMonty2016-02-071-2/+4
* | | | | | Fix compilation10.2-sslVladislav Vaintroub2016-02-101-1/+1
* | | | | | Changed my_thread_id to int64 to fix compilation problem withMonty2016-02-081-1/+1
* | | | | | MDEV-6150 Speed up connection speed by moving creation of THD to new threadMonty2016-02-073-4/+6
* | | | | | Optimized intkorr() and intstore(functions) for intel 64 bits.Monty2016-02-072-24/+85
* | | | | | Merge branch '10.1' into 10.2Monty2016-02-063-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | MDEV-9117: Client Server capability negotiation for MariaDB specific function...Oleksandr Byelkin2016-02-021-5/+15