summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-29123-755/+2199
|\
| * Fix msxml6 search in Connect engine on Windows,Vladislav Vaintroub2016-04-271-31/+4
| * after-merge fixes for failures in buildbotSergei Golubchik2016-04-271-4/+2
| * Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-04-2618-112/+591
| |\
| | * - Fix an error causing MYSQL table to fail saying "no result set"Olivier Bertrand2016-04-258-25/+412
| | * - Fix MDEV-9779. Avoid buffer overflow when setting partname.Olivier Bertrand2016-03-252-11/+13
| | * Bigger partname to avoid MDEV-9779Olivier Bertrand2016-03-251-1/+1
| | * - Fix MDEV-9779. Connection was not recognized in the option list.Olivier Bertrand2016-03-243-2/+44
| | * - Fix compile error when copying a string on itself.Olivier Bertrand2016-03-192-16/+15
| | * - Fix crash when sorting a TBL table with thread=yes.Olivier Bertrand2016-03-163-4/+4
| | * - Fix MDEV-9603 compiler error.Olivier Bertrand2016-03-166-40/+93
| | * - Fix to MDEV-9579 be testing for void result.Olivier Bertrand2016-02-201-11/+13
| * | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2016-04-2621-165/+664
| |\ \
| | * | 5.6.29-76.2Sergei Golubchik2016-04-2621-162/+601
| * | | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-04-269-130/+355
| |\ \ \
| | * | | 5.6.30Sergei Golubchik2016-04-268-129/+354
| * | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-04-264-12/+16
| |\ \ \ \
| | * \ \ \ Merge branch 'bb-5.5-serg' into 5.5mariadb-5.5.49Sergei Golubchik2016-04-2011-56/+91
| | |\ \ \ \
| | | * \ \ \ Merge branch 'merge-xtradb-5.5' into 5.5Sergei Golubchik2016-04-206-27/+60
| | | |\ \ \ \
| | | | * | | | 5.5.48-37.8Sergei Golubchik2016-04-186-19/+62
| | | * | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-205-29/+31
| | | |\ \ \ \ \
| | | | * | | | | BUG#20574550 MAIN.MERGE TEST CASE FAILS IF BINLOG_FORMAT=ROWVenkatesh Duggirala2016-02-261-1/+3
| | | | * | | | | (no commit message)Arun Kuruvila2016-02-231-3/+11
| | | | * | | | | (no commit message)Arun Kuruvila2016-02-231-3/+6
| | | | * | | | | Bug#22680706: 5.5 DOES NOT BUILD WITH GCC5Jon Olav Hauglid2016-02-082-4/+4
| | | | * | | | | Followup:BUG#22530768 Innodb freeze running REPLACE statementsShaohua Wang2016-01-271-23/+23
| | | | * | | | | BUG#22530768 Innodb freeze running REPLACE statementsShaohua Wang2016-01-122-17/+21
| | * | | | | | | MDEV-9943 - TokuDB fails to compile with gcc 5.2.1Sergey Vojtovich2016-04-201-8/+10
| | |/ / / / / /
| * | | | | | | MDEV-9610 Trigger on normal table can't insert into CONNECT engine table - Ac...Sergei Golubchik2016-04-264-4/+27
| * | | | | | | Fixed failing test cases and compiler warningsMonty2016-04-253-9/+10
| * | | | | | | MDEV-9617 solaris sparc build fails on 10.0Sergei Golubchik2016-04-249-52/+54
| * | | | | | | Comment from https://github.com/MariaDB/server/pull/153Andrew McDonnell2016-04-241-1/+1
| * | | | | | | Fix for MDEV-8206, as per Jira comments of 2015-11-16 and 2015-11-30Andrew McDonnell2016-04-241-0/+4
| * | | | | | | MDEV-9283 - Debian: the Lintian complains about "shlib-calls-exit" inSergey Vojtovich2016-04-221-0/+22
| * | | | | | | Improve error diagnostics on I/O errors. If node->name is NULLJan Lindström2016-04-222-8/+18
| * | | | | | | MDEV-9918: [ERROR] mysqld got signal 11 during ALTER TABLE `name` COLUMN ADDJan Lindström2016-04-228-82/+298
| * | | | | | | MDEV-9281 - Debian: the Lintian complains about "shlib-calls-exit" in handler...Sergey Vojtovich2016-04-203-23/+1
| * | | | | | | MDEV-9527 build FAILs with GCC 5.1 with release supported "-std=c+11"Sergei Golubchik2016-03-219-50/+50
| * | | | | | | ASAN error in OQGraph engineSergei Golubchik2016-03-211-0/+4
| * | | | | | | ASAN error in CONNECT engineSergei Golubchik2016-03-211-2/+8
| * | | | | | | update tests and resultsSergei Golubchik2016-03-212-0/+6
| * | | | | | | Use /bin/shBernard Spil2016-03-211-2/+2
| * | | | | | | MDEV-9667: Server hangs after select count(distinct name) from t2 where a=836...Jan Lindström2016-03-112-15/+9
| * | | | | | | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-0440-59/+59
| * | | | | | | MDEV-7907 tokudb.cluster_filter_unpack_varchar_hidden fails sporadically in b...Elena Stepanova2016-02-262-4/+4
| * | | | | | | connect engine compiler warningsSergei Golubchik2016-02-182-4/+4
* | | | | | | | Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-2387-3113/+4027
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24Sergei Golubchik2016-02-1772-3014/+3666
| |\ \ \ \ \ \ \
| | * | | | | | | fix InnoDB on WindowsSergei Golubchik2016-02-171-0/+7
| | * | | | | | | Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-02-1627-2557/+2678
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |