summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-1521-129/+809
* Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-1147-478/+6137
|\
| * MergeIgor Babaev2009-11-0940-414/+6047
| |\
| | * Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-0618-383/+402
| | |\
| | | * Merge with latest MariaDB 5.1 trunk.unknown2009-10-157-3/+34
| | | |\
| | | * \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-1518-383/+402
| | | |\ \
| | | | * \ Merge from mysql-5.1.38-releaseJonathan Perkin2009-09-033-10/+14
| | | | |\ \
| | | | * | | Increase thread stack size on HP-UX when built with debug.Davi Arnaut2009-09-021-1/+6
| | | | * | | Bug#45611: Minor code cleanupDavi Arnaut2009-09-012-6/+5
| | | | * | | Merge from 5.0 for 43414Staale Smedseng2009-08-2814-44/+26
| | | | * | | Fix for a few assorted compiler warnings.Davi Arnaut2009-08-282-330/+357
| | | | * | | Bug#46639: 1030 (HY000): Got error 124 from storage engine onMattias Jonsson2009-08-211-2/+8
| | * | | | | Add federatedx files for buildunknown2009-11-031-1/+1
| | * | | | | Make federated compiling under windowsunknown2009-11-031-1/+7
| | * | | | | Fixed federatedx building under windowsunknown2009-11-021-2/+2
| | * | | | | Merge.Hakan Kuecuekyilmaz2009-11-012-28/+28
| | |\ \ \ \ \
| | | * | | | | Compilation under windows x64 made possible.unknown2009-10-312-28/+28
| | * | | | | | BUILD/compile-dist && make dist was not working due to typos.Hakan Kuecuekyilmaz2009-11-012-1/+1
| | |/ / / / /
| | * | | | | Added federatedx storage engineMichael Widenius2009-10-3020-3/+5611
| * | | | | | Merge of the latest 5.1 changes.Igor Babaev2009-10-266-13/+21
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | MergeIgor Babaev2009-10-177-3/+34
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-167-64/+90
| | |_|/ / / | |/| | | |
* | | | | | Automatic merge with 5.1Michael Widenius2009-10-286-13/+21
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Automatic merge with maria-mergeMichael Widenius2009-10-262-2/+2
| |\ \ \ \ \
| | * | | | | Fixes for binary distribution in tar fileMichael Widenius2009-10-232-2/+2
| * | | | | | Fixed compiler warning messageMichael Widenius2009-10-264-11/+19
| | |_|/ / / | |/| | | |
* | | | | | Merge with 5.1Michael Widenius2009-10-14837-3506/+424732
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Automatic merge with 5.1-mergeMichael Widenius2009-10-147-3/+34
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | Merge Sanja's fix of BUG#39249 into MariaDB 5.1.38 release clone.unknown2009-10-096-2/+33
| | |\ \ \
| | | * \ \ mergeunknown2009-10-066-2/+33
| | | |\ \ \
| | | | * | | BUG#39249 Maria:query cache returns out of date resultsunknown2009-10-066-2/+33
| | * | | | | Add missing PBXT windows file to `make dist`.unknown2009-10-071-1/+1
| * | | | | | Merge a bunch of small fixes from release tree into main lp:maria.unknown2009-10-067-32/+89
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix `make dist` after CMakeLists.txt rename in previous push.unknown2009-10-063-2/+2
| | * | | | | Merge fixes for --big tests and compiler warnings.unknown2009-10-061-5/+5
| | |\ \ \ \ \
| | | * | | | | Fix some compiler warnings cause by GCC bug: http://gcc.gnu.org/bugzilla/show...unknown2009-10-031-5/+5
| | | |/ / / /
| | * | | | | Fix PBXT build on windows by backporting some of their changes (under advise ...Sergey Petrunya2009-10-063-25/+82
| | |/ / / /
| | * | | | Completely disable the innodb plugin.unknown2009-09-301-0/+0
| * | | | | Don't call _ma_decrement_open_count() for ma_extra(HA_EXTRA_PREPARE_FOR_DROP).Michael Widenius2009-10-063-6/+23
| |/ / / /
| * | | | Fixed bug #47455 - a failure with main.myisam_crash_before_flush_keys.testIgor Babaev2009-09-191-1/+4
| * | | | Apply Igor's fix:Sergey Petrunya2009-09-181-1/+1
| * | | | Fix of bug #417751 by Yasufumi Kinoshita.Igor Babaev2009-09-161-2/+14
| * | | | MySQL 5.1 -> Maria 5.1 merge: Fix windows buildSergey Petrunya2009-09-162-5/+7
| * | | | More after-merge fixes for merging MySQL 5.1.38 into MariaDB.unknown2009-09-151-1/+0
| * | | | MySQL 5.1.38 merge into MariaDB.unknown2009-09-153-10/+14
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Apply patch from bug#46834 to install the test suite in RPMs.Jonathan Perkin2009-08-211-1/+2
| | * | | Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.Jonathan Perkin2009-08-142-9/+12
| | * | | Apply build fixJonathan Perkin2009-08-122-2/+2
| * | | | Post-merge fixesSergey Petrunya2009-09-151-2/+0
| * | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-1569-2758/+4684
| |\ \ \ \