summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-125-81/+96
|\
| * Bug#41084 full-text index added to custom UCA collation not workingAlexander Barkov2009-02-021-2/+2
| * merge: 5.1 -> 5.1-rplLuis Soares2009-01-232-9/+13
| |\
| | * Merge fix for bug 38364.Chad MILLER2009-01-131-3/+5
| | |\
| | | * Bug#38364: gen_lex_hash segmentation fault in debug buildChad MILLER2009-01-121-3/+5
| | * | Bug#31177: Server variables can't be set to their current valuesTatiana A. Nurnberg2009-01-121-6/+8
| | |/
| * | merge: 5.1 -> 5.1-rplLuis Soares2009-01-081-1/+1
| |\ \ | | |/
| | * Merge main 5.1 into 5.1-buildJoerg Bruehe2008-12-104-20/+15
| | |\
| | * \ Merge from mysql-5.1.30-releaseunknown2008-11-271-1/+1
| | |\ \
| | | * | Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-101-1/+1
| * | | | merge 5.1 --> 5.1-rplAlfranio Correia2008-12-134-20/+15
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-r...Andrei Elkin2008-11-122-13/+31
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merging 5.1 main into 5.1-rplMats Kindahl2008-10-232-69/+136
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge 5.1 main -> 5.1-rplHe Zhenxing2008-09-066-54/+64
| |\ \ \ \
| * \ \ \ \ merged 5.1 main to 5.1-rplSven Sandberg2008-08-041-69/+72
| |\ \ \ \ \
| | * \ \ \ \ Merge 5.1 -> 5.1-rplSven Sandberg2008-07-064-3/+587
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge 5.1->5.1-rplMagnus Svensson2008-05-301-1/+1
| | |\ \ \ \ \ \
| | * | | | | | | Fix warnings for 64 bit windowsunknown2008-04-221-2/+2
| | * | | | | | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplunknown2008-04-0325-235/+528
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplunknown2008-03-251-69/+50
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplunknown2008-02-281-69/+50
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Revert change to check proper return value from QueryPerformanceFrequencyunknown2008-02-191-1/+1
| | | | * | | | | | | | Bug#33748 my_getsystime, my_micro_time and my_micro_time_and_time broken on w...unknown2008-01-091-69/+50
* | | | | | | | | | | | compilation fixesSergei Golubchik2009-01-191-1/+1
* | | | | | | | | | | | post-review fixesSergei Golubchik2009-01-155-175/+351
* | | | | | | | | | | | Bug#40990 Maria: failure of maria.test & maria_notemebedded in deadlock detec...Sergei Golubchik2009-01-071-1/+21
* | | | | | | | | | | | Fix for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test:Michael Widenius2008-12-221-1/+2
* | | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-1049-595/+4342
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed warnings and errors discovered by pushbuild2Michael Widenius2008-12-041-0/+2
| * | | | | | | | | | | Merge with base MySQL-5.1-mariaMichael Widenius2008-12-037-108/+196
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Bug#34374: mysql generates incorrect warningSergei Golubchik2008-11-291-2/+1
| | * | | | | | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-214-82/+167
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | * | | | | | | | | | | compile_time_assertSergei Golubchik2008-11-101-0/+2
| | * | | | | | | | | | | don't use #pragma packSergei Golubchik2008-11-032-9/+8
| * | | | | | | | | | | | Add missing file: Testing of mutex-wrong-usage-detectorMichael Widenius2008-12-031-0/+162
| * | | | | | | | | | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de...Michael Widenius2008-12-038-80/+552
| |/ / / / / / / / / / /
| * | | | | | | | | | | wt needs to use its own implementation of rwlocks withSergei Golubchik2008-10-242-57/+107
| * | | | | | | | | | | mergedSergei Golubchik2008-10-2112-231/+891
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Small fixes for pushbuild: compiler warnings, checking that partitioning is e...Guilhem Bichot2008-10-151-2/+2
| | * | | | | | | | | | | Fix for bug#39226 Maria: crash with FLUSH TABLES WITH READ LOCK after LOCK TA...Michael Widenius2008-10-121-1/+2
| | * | | | | | | | | | | Merged 5.1 maria with 5.1 maria team tree. Automerge.Michael Widenius2008-10-112-7/+6
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-1012-231/+890
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| * | | | | | | | | | | | | win32: compilation failures, maria.test failureSergei Golubchik2008-10-211-0/+2
| * | | | | | | | | | | | | fixes for hanging waiting_thread-t.c on windowsSergei Golubchik2008-10-212-3/+3
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | workaround for gcc 4.1.0 strict-aliasing bugSergei Golubchik2008-10-071-1/+1
| * | | | | | | | | | | | Implement conditional building correctly.Sergei Golubchik2008-10-011-6/+5
| |/ / / / / / / / / / /
| * | | | | | | | | | | wt: don't support a key as a union { ulonglong, void* }. Although convenient,Sergei Golubchik2008-09-011-9/+8
| * | | | | | | | | | | fixes for windowsSergei Golubchik2008-08-312-6/+6
| * | | | | | | | | | | added __attribute__((unused))Sergei Golubchik2008-08-291-2/+5
| * | | | | | | | | | | mergeSergei Golubchik2008-08-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \