summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1hartmut@mysql.com2005-09-081-1/+2
|\
| * Merge mysql.com:/home/hartmut/projects/mysql/dev/4.0hartmut@mysql.com2005-09-081-1/+2
| |\
| | * fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX hartmut@mysql.com2005-09-021-1/+2
| * | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1aivanov@mysql.com2005-09-071-1/+2
| |\ \
| * \ \ Merge mysql.com:/home/alexi/mysql-4.1aivanov@mysql.com2005-09-076-32/+397
| |\ \ \
* | \ \ \ Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0aivanov@mysql.com2005-09-078-8/+98
|\ \ \ \ \
| * \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-09-073-0/+66
| |\ \ \ \ \
| | * | | | | Fix for Bug#12995: Inside function "Table 't4' was not locked with LOCK TABLES"anozdrin@mysql.com2005-09-073-0/+66
| * | | | | | item.cc:evgen@moonbone.local2005-09-071-3/+3
| * | | | | | Manual mergeevgen@moonbone.local2005-09-074-7/+30
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix bug #12922 if(sum(),...) with group from view returns wrong resultsevgen@moonbone.local2005-09-074-7/+32
| * | | | | | Merge zim.(none):/home/brian/mysql/mysql-4.1brian@zim.(none)2005-09-071-1/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Small tweak for random read performance (we shouldn't always tell the OS that...brian@zim.(none)2005-09-071-1/+2
| | | |/ / / | | |/| | |
* | | | | | Merge mysql.com:/home/alexi/mysql-5.0aivanov@mysql.com2005-09-078-57/+381
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | join_outer.result, opt_range.cc, item_cmpfunc.cc:aivanov@mysql.com2005-09-075-46/+25
| * | | | | Merge mysql.com:/home/alexi/dev/mysql-4.1-0aivanov@mysql.com2005-09-067-29/+374
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | item_cmpfunc.h:aivanov@mysql.com2005-09-066-32/+397
* | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b12611bar@mysql.com2005-09-076-2/+71
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-09-076-2/+71
| |\ \ \ \ \
| | * | | | | func_like.result, func_like.test:bar@mysql.com2005-09-063-1/+42
| | * | | | | item_cmpfunc.h:bar@mysql.com2005-09-061-1/+1
| | * | | | | Bug#12611: ESCAPE + LIKE do not work when the escape char is a multibyte onebar@mysql.com2005-08-313-1/+29
* | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0bar@mysql.com2005-09-077-30/+64
|\ \ \ \ \ \ \
| * | | | | | | Fix for bug#12905 show fields from view behaving erratically with current dat...gluh@eagle.intranet.mysql.r18.ru2005-09-073-3/+43
| * | | | | | | Fix for bug#11775 Variable character_set_system does not exist (sometimes).gluh@eagle.intranet.mysql.r18.ru2005-09-074-27/+21
* | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b12829bar@mysql.com2005-09-073-0/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-09-073-0/+20
| |\ \ \ \ \ \
| | * | | | | | Bug #12829bar@mysql.com2005-08-303-0/+20
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-09-073-10/+79
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-09-073-10/+79
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix for BUG#12941: in create_tmp_field(), if the passed item is an Item_ref, ...sergefp@mysql.com2005-09-073-10/+79
* | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-09-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-09-072-27/+52
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Backport fixes for mysqltest.test from 5.0msvensson@neptunus.(none)2005-09-062-27/+52
| * | | | | | | | | Merge eherman@bk-internal.mysql.com:/home/bk/mysql-4.1eric@mysql.com2005-09-062-21/+19
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Backport of JimW's localhost patch to 4.1 tree.eric@mysql.com2005-09-022-21/+19
* | | | | | | | | | Fixed a typo in the configure --help menu. brian@zim.(none)2005-09-061-1/+1
* | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-09-079-62/+127
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1bell@sanja.is.com.ua2005-09-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | postmerge fixbell@sanja.is.com.ua2005-09-061-0/+1
| * | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1bell@sanja.is.com.ua2005-09-068-62/+126
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2005-09-063-36/+85
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.0bell@sanja.is.com.ua2005-09-063-36/+85
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2005-09-064-36/+86
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | | | * | | | | | | support of concurent query cache resizing (BUG#12848)bell@sanja.is.com.ua2005-09-064-36/+86
| | | | * | | | | | | | Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M40/mysql-4.0joerg@mysql.com2005-09-011-0/+1
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | Clone of 4.0.26 is taken, increase version number.joerg@mysql.com2005-08-311-1/+1
| | | | * | | | | | | | | fulltext_var.result:paul@snake-hub.snake.net2005-08-291-1/+1
| | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | set_var.cc:paul@kite-hub.kitebird.com2005-08-291-2/+2
| | | | * | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0paul@frost.snake.net2005-08-291-3/+10
| | | | |\ \ \ \ \ \ \ \
View Lorry Controller Status