summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfixknielsen@mysql.com2006-05-161-1/+3
|\
| * Fix two Valgrind memory leak warnings.knielsen@mysql.com2006-05-151-1/+3
* | Rename cmakelists.txt -> CMakeLists.txtmsvensson@neptunus.(none)2006-05-121-1/+1
* | performing a set of bk mv on each CMakeLists.txt file to try and restore the ...reggie@big_geek.2006-05-111-0/+0
* | Merge mysql.com:/home/my/mysql-5.0monty@mysql.com2006-05-041-3/+2
|\ \
| * \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0svoj@april.(none)2006-05-033-20/+139
| |\ \
| * \ \ Merge april.(none):/home/svoj/devel/mysql/BUG18160/mysql-5.0svoj@april.(none)2006-05-031-3/+2
| |\ \ \
| | * | | BUG#18160 - Memory-/HEAP Table endless growing indexessvoj@april.(none)2006-04-191-3/+2
* | | | | After merge fixesmonty@mysql.com2006-05-044-1/+32
* | | | | Cleanups after review of WL#602monty@mysql.com2006-05-031-2/+2
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmonty@mysql.com2006-05-032-8/+32
|\ \ \ \ \
| * | | | | Added support for key_block_size for key and table level (WL#602)monty@mysql.com2006-05-032-8/+32
* | | | | | Windows build fixes for CMakeknielsen@mysql.com2006-05-031-1/+1
* | | | | | Merge mysql.com:/home/dlenev/mysql-5.0-bg11081dlenev@mysql.com2006-05-021-2/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Fix a bunch of non-Linux compile failures.knielsen@mysql.com2006-05-021-2/+3
* | | | | | Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667cmiller@zippy.(none)2006-05-023-20/+138
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.(none)2006-05-013-20/+138
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | SECURITY FIXcmiller@zippy.(none)2006-05-013-20/+138
* | | | | Manually mergedevgen@moonbone.local2006-04-251-5/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2igor@rurik.mysql.com2006-04-191-5/+7
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fixed bug #19079.igor@rurik.mysql.com2006-04-181-5/+7
| | * | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2006-03-041-28/+75
| | |\ \ \
| | * \ \ \ Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1SergeyV@selena.2006-02-131-0/+1
| | |\ \ \ \
| | | * | | | Fixes bug #6536. When MyODBC or any other client do my_init()/my_end() SergeyV@selena.2005-12-011-0/+1
* | | | | | | Fix wrong auto mergemonty@mysql.com2006-04-191-8/+0
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmonty@mysql.com2006-04-191-1/+10
|\ \ \ \ \ \ \
| * | | | | | | Fixed compilation errormonty@mysql.com2006-04-191-1/+10
* | | | | | | | my_access.c:bar@mysql.com2006-04-191-1/+0
|/ / / / / / /
* | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newbar@mysql.com2006-04-191-4/+92
|\ \ \ \ \ \ \
| * | | | | | | bug#17870 Table names conflict with Windows device namesbar@mysql.com2006-04-111-5/+92
* | | | | | | | UNIXWARE removalbrian@zim.(none)2006-04-172-7/+1
* | | | | | | | This completes the work done in 5.0 to remove mit_pthread support (most was p...brian@zim.(none)2006-04-163-5/+5
* | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newbrian@zim.(none)2006-04-1522-248/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Another long patch to remove the rest of the OS2 support. brian@zim.(none)2006-04-1522-248/+28
* | | | | | | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.(none)2006-04-141-47/+50
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | Bug#18474 Unlistable directories yield no info from information_schema, part2msvensson@neptunus.(none)2006-04-111-47/+50
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge 192.168.0.20:mysql/bug15069/my50-bug15069msvensson@neptunus.(none)2006-04-102-1/+10
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.1-newmsvensson@neptunus.(none)2006-04-112-1/+10
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge 192.168.0.20:mysql/bug15069/my51-bug15069msvensson@neptunus.(none)2006-04-102-1/+10
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/bug15069/my50-bug15069msvensson@shellback.(none)2006-04-102-1/+10
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Bug#15069 [patch] my_print_defaults does'nt care --sysconfdirmsvensson@shellback.(none)2006-04-102-1/+10
| | | | |_|_|_|_|/ | | | |/| | | | |
* | | | | | | | | Drop a number of OS2 specific files. brian@zim.(none)2006-04-1010-1307/+1
|/ / / / / / / /
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmsvensson@shellback.(none)2006-04-061-4/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-04-041-4/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Bug#17368 General log and slow query log don't workmsvensson@shellback.(none)2006-04-041-4/+1
| * | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-04-041-9/+17
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | / / / / | | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmonty@mysql.com2006-03-291-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove compiler warningsmonty@mysql.com2006-03-291-1/+1
* | | | | | | | | Manual merge.knielsen@mysql.com2006-03-283-5/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Some changes to make it possible to build for Windows with CMake fromknielsen@mysql.com2006-03-241-1/+3