summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* small changes to WL#43:Sergei Golubchik2010-04-306-25/+48
* Merge OQGraph into MariaDB 5.2.unknown2010-05-0625-7/+3356
|\
| * MBug#524625: OQGraph error with binary logging enabledunknown2010-04-124-1/+48
| * Merge Oqgraph with MariaDB 5.2 trunkunknown2010-04-09154-786/+12173
| |\
| * | Fix type in merge, breaking `make dist` for oqgraph.unknown2010-03-311-1/+1
| * | Merge OQGraph into MariaDB 5.2.unknown2010-03-3173-361/+3813
| |\ \
| | * | Fix compiler warningsunknown2010-03-311-2/+4
| | * | OQGraph testsuite was forgotten from `make dist`.unknown2010-03-301-1/+2
| | * | Comment out dtrace stuff for now, as it does not work properly on systems tha...unknown2010-03-302-60/+15
| | * | automergeunknown2010-03-30861-8894/+26422
| | |\ \
| | * | | Require Boost version 1.40.0 to build OQGraph (earlier versions have a bug).unknown2010-03-303-21/+29
| | * | | Fix wrong db_type for OQGraph hton.unknown2010-01-041-1/+1
| | * | | automergeunknown2010-01-041-0/+5
| | |\ \ \
| | * \ \ \ Merge mysql-test-run.pl fix for plugin detection.unknown2010-01-041-54/+61
| | |\ \ \ \
| | * | | | | Test skip due to missing OQGraph early, avoiding errors in log when starting ...unknown2010-01-041-0/+11
| | * | | | | Merge OQGraph into latest MariaDB trunk.unknown2010-01-0420-2/+3329
| | |\ \ \ \ \
| | | * | | | | Import OQGraph engine into MariaDB.unknown2010-01-0420-2/+3329
* | | | | | | | Automerge mariadb 5.1 -> mariadb 5.2unknown2010-05-0516-18/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | Change commit mails to go to commits@mariadb.orgunknown2010-05-051-1/+1
| * | | | | | | | Fix missing bounds check in string conversion.unknown2010-04-292-1/+5
| * | | | | | | | Fix buffer overflow in COM_FIELD_LIST.Kristian Nielsen2010-04-282-12/+26
| * | | | | | | | Fix a bunch of Windows warningsBo Thorsen2010-04-219-2/+35
| * | | | | | | | Remove unnecessary redefinition of TAILQ_EMPTYbo.thorsen2010-04-091-1/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove unnecessary redefinition of TAILQ_EMPTYbo.thorsen2010-04-091-1/+0
| |/ / / / / / / /
| * | | | | | | | Fix Windows compilebo.thorsen2010-04-092-2/+6
* | | | | | | | | don't hide old_password_plugin from embedded, it may be compiled with grant s...Sergei Golubchik2010-04-141-2/+0
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | mergedSergei Golubchik2010-04-081-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fixed a problem of merge from mysql-5.1 baseline.Igor Babaev2010-04-081-0/+6
* | | | | | | | fixes for buildbot:Sergei Golubchik2010-04-085-11/+21
* | | | | | | | fix dialog plugin to work againSergei Golubchik2010-04-081-0/+6
* | | | | | | | Merge with local treeMichael Widenius2010-04-0826-79/+112
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge with 5.1Michael Widenius2010-04-081-33/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fixed race condition in safe_process.cc which may have caused some mysqltests...Michael Widenius2010-04-081-33/+14
| * | | | | | | | Fixed compiler warningsMichael Widenius2010-04-083-5/+6
| * | | | | | | | Merge with 5.1Michael Widenius2010-04-0822-40/+91
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fixed syntax error and some timeing issues in test suiteMichael Widenius2010-04-083-3/+4
| | * | | | | | | Fixed suppression of compiler/test warningsMichael Widenius2010-04-074-13/+36
| | * | | | | | | Removed compiler warningsMichael Widenius2010-04-0716-23/+52
| * | | | | | | | Fixed compiler warningMichael Widenius2010-04-081-1/+1
* | | | | | | | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-0852-168/+1701
|/ / / / / / / /
* | | | | | | | test fix for sol-sparc-32Sergei Golubchik2010-04-071-3/+3
* | | | | | | | more fixes for buildbot failuresSergei Golubchik2010-04-062-14/+19
* | | | | | | | fixes for builbot failures Sergei Golubchik2010-04-063-20/+14
* | | | | | | | keep acl_user->auth_string and acl_user->salt always in syncSergei Golubchik2010-04-061-14/+35
* | | | | | | | fix a warningSergei Golubchik2010-04-061-1/+1
* | | | | | | | Merge of the code for partitioned key cache (mwl#85) into 5.2.Igor Babaev2010-04-0536-333/+8240
|\ \ \ \ \ \ \ \
| * | | | | | | | Post review fixes.Igor Babaev2010-04-055-20/+127
| * | | | | | | | Merge with the latest changes of 5.2.Igor Babaev2010-04-053-20/+84
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | fixed a bug in handling mysql_native_password specified explicitly:Sergei Golubchik2010-04-053-20/+84
| * | | | | | | | Merge with the latest changes of 5.2Igor Babaev2010-04-03105-510/+2461
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |