summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.(none)2006-04-172-0/+69
|\
| * BUG#17152: Wrong result with BINARY comparison on aliased columngkodinov@mysql.com2006-04-172-0/+69
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintcmiller@zippy.(none)2006-04-174-15/+54
|\ \ | |/
| * item_timefunc.cc:bar@mysql.com2006-04-171-0/+1
| * Merge mysql.com:/usr/home/bar/mysql-4.1.b18691bar@mysql.com2006-04-174-15/+53
| |\
| | * Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2006-04-142-5/+11
| | |\
| | * | Bug#18691: Converting number to UNICODE string returns invalid result.bar@mysql.com2006-04-134-6/+44
* | | | Only expand the empty string to the letters "NULL" if the columncmiller@zippy.(none)2006-04-163-8/+27
|/ / /
* | | Merge april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1svoj@april.(none)2006-04-152-6/+12
|\ \ \ | | |/ | |/|
| * | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1svoj@april.(none)2006-04-131-1/+1
| |\ \
| | * | Fix a typo in the help message.konstantin@mysql.com2006-04-131-1/+1
| | |/
| * | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1svoj@april.(none)2006-04-131-4/+10
| |\ \ | | |/ | |/|
| | * BUG#17917 - SELECT from compressed MyISAM table crashes MySQL serversvoj@april.(none)2006-04-131-4/+10
| * | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2006-04-112-1/+9
| |\ \
| * \ \ Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2006-04-11212-996/+13249
| |\ \ \
* | | | | Bug#19097: rpl_view failed on some platformsaelkin@mysql.com2006-04-141-4/+0
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2006-04-1419-279/+492
|\ \ \ \ \
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2006-04-1419-279/+492
| |\ \ \ \ \
| | * \ \ \ \ Merge mysql.com:/opt/local/work/mysql-5.0-rootkonstantin@mysql.com2006-04-1419-279/+492
| | |\ \ \ \ \
| | | * \ \ \ \ Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0kroki@mysql.com2006-04-137-36/+80
| | | |\ \ \ \ \
| | | | * | | | | Bug#16461: connection_id() does not work properly inside triggerkroki@mysql.com2006-04-127-36/+80
| | | * | | | | | Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0kroki@mysql.com2006-04-122-19/+56
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | In test for bug#15933 we have to wait for all disconnects to finish to avoidkroki@mysql.com2006-04-122-19/+56
| | | * | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtimepem@mysql.com2006-04-077-204/+233
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Renaming sp_pcontext members and methods; less cryptic and more consistent.pem@mysql.com2006-04-077-204/+233
| | | * | | | | | Bug#15933: max_used_connections is wrong after FLUSH STATUS if connections ar...kroki@mysql.com2006-04-075-39/+142
| | | |/ / / / /
* | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2006-04-142-2/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0aelkin@dl145j.mysql.com2006-04-132-2/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | #BUG18715 create view with replicate*ignore-tableaelkin@mysql.com2006-04-122-2/+7
* | | | | | | | The check for recursive view definitions added. (BUG#14308)bell@sanja.is.com.ua2006-04-134-1/+75
* | | | | | | | postmerge fix: added tinfo support.bell@sanja.is.com.ua2006-04-131-1/+4
* | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2006-04-134-4/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2006-04-134-4/+31
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2006-04-112-1/+9
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2006-04-113-4/+24
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2006-04-102-1/+9
| | | |\ \ \ \ \ \
| | | | * | | | | | Avoid trying to include <asm/atomic.h> when it doesn't work in C++bell@sanja.is.com.ua2006-04-101-0/+5
| | | | * | | | | | Check tinfo library presence and use it. (BUG#18912)bell@sanja.is.com.ua2006-04-081-1/+4
| | * | | | | | | | after merge fix.ramil@mysql.com2006-04-111-0/+2
| | * | | | | | | | Merge mysql.com:/usr/home/ram/work/mysql-4.0ramil@mysql.com2006-04-113-4/+24
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0ramil@mysql.com2006-04-113-4/+24
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Fix for bug #13044: BIT_COUNT with NULL values.ramil@mysql.com2005-11-063-4/+24
| | * | | | | | | Merge bk-internal:/home/bk/mysql-4.1knielsen@mysql.com2006-04-101-5/+11
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfixknielsen@mysql.com2006-04-091-5/+11
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@perch.ndb.mysql.com2006-04-1014-66/+540
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1jonas@perch.ndb.mysql.com2006-04-0715-129/+991
| | |\ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0grog@mysql.com2006-04-133-1/+75
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2006-04-133-1/+75
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | BUG#19021, Crash in ROR-index_merge optimizer: sergefp@mysql.com2006-04-133-1/+75
* | | | | | | | | | | | | foo2grog@mysql.com[grog]2006-04-138-359/+2