summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix to make it build on all platforms.mats@romeo.(none)2006-10-101-1/+2
* Post-merge fixes.mats@romeo.(none)2006-10-091-10/+10
* Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2006-10-0611-277/+619
|\
| * BUG#19459 (BINLOG RBR command does not lock tables correctly causingmats@romeo.(none)2006-10-065-257/+518
| * BUG#19459 (BINLOG RBR command does not lock tables correctly causingmats@romeo.(none)2006-10-022-0/+48
| * BUG#19459 (BINLOG RBR command does not lock tables correctly causingmats@romeo.(none)2006-10-025-21/+54
* | Fix to build on 64-bit systems where sizeof(unsigned long long)mats@romeo.(none)2006-10-061-7/+4
* | Post-merge fixes.mats@romeo.(none)2006-10-052-11/+11
* | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2006-10-054-206/+503
|\ \
| * | I had forgotten to delete an already disabled line of C++ code.mats@romeo.(none)2006-10-054-206/+502
* | | Automerge fix: "Out of range value" error message adjusted to 5.1. bar@mysql.com/bar.intranet.mysql.r18.ru2006-10-039-104/+94
* | | sql_yacc.yy:bar@mysql.com/bar.intranet.mysql.r18.ru2006-10-032-2/+1
* | | After merge fixbar@bar.intranet.mysql.r18.ru2006-10-0338-300/+1176
|\ \ \
| * \ \ Merge mysql.com:/usr/home/bar/mysql-4.1-rpl.b8663bar@mysql.com/bar.intranet.mysql.r18.ru2006-10-030-0/+0
| |\ \ \
| | * \ \ Merge mysql.com:/usr/home/bar/mysql-4.1.b8663bar@mysql.com/bar.intranet.mysql.r18.ru2006-10-035-7/+38
| | |\ \ \
| | | * | | Bug#8663 cant use bgint unsigned as input to castbar@mysql.com2006-06-145-7/+38
| * | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145h.mysql.com2006-10-0239-332/+1192
| |\ \ \ \ \
| | * | | | | bug#6147 - fixing ndb test results (forgot to include into the main commit)bar@mysql.com/bar.intranet.mysql.r18.ru2006-10-021-24/+24
| | * | | | | Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2bar@mysql.com/bar.intranet.mysql.r18.ru2006-09-2931-302/+1083
| | |\ \ \ \ \
| | | * | | | | Bug#6147: Traditional: Assigning a string to a numeric column has unexpected ...bar@mysql.com/bar.intranet.mysql.r18.ru2006-07-2031-302/+1083
| | * | | | | | Bug#21263 mysql client XML output does not distinguish between NULL and strin...bar@mysql.com/bar.intranet.mysql.r18.ru2006-09-292-4/+9
| | * | | | | | Bug#21620 ALTER TABLE affects other columnsbar@mysql.com/bar.intranet.mysql.r18.ru2006-09-293-1/+21
| | * | | | | | Bug#19960 Inconsistent results when joining InnoDB tables using partial UTF8 ...bar@mysql.com/bar.intranet.mysql.r18.ru2006-09-293-1/+55
* | | | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2006-10-026-5/+45
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2006-10-026-5/+45
| |\ \ \ \ \ \ \ \
| | * | | | | | | | BUG#22550 (Replication of BIT column failing):mats@romeo.(none)2006-10-026-5/+45
* | | | | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145h.mysql.com2006-10-029-83/+268
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Result of a binlog_statement_insert_delayed was affected by recent fixing ofaelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi2006-09-281-21/+14
| * | | | | | | | | the results of binlog_statement_insert_delayed in STATEMENT - non-recommended...aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi2006-09-281-11/+7
| * | | | | | | | | Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rplaelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi2006-09-272-24/+20
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | One more fix for binlog_row_binlog due to interminism of checking withaelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi2006-09-272-24/+20
| * | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rplbar@bar.intranet.mysql.r18.ru2006-09-264-16/+152
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Bug#20854 XML functions: wrong result in ExtractValuebar@mysql.com/bar.intranet.mysql.r18.ru2006-09-144-16/+152
| * | | | | | | | | | Result of a binlog_statement_insert_delayed was affected by recent fixing ofaelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi2006-09-251-0/+1
| * | | | | | | | | | Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rplaelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi2006-09-233-11/+74
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | binlog_row_binlog test gained some indeterministic checks with changes due toaelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi2006-09-233-11/+74
* | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-10-0140-344/+464
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | This patch makes ndbcluster_hton not static. I have a second patch for ndbcl...brian@zim.(none)2006-10-012-2/+3
| * | | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-archbrian@zim.(none)2006-09-3039-346/+465
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Merge fix. brian@zim.(none)2006-09-301-1/+1
| | * | | | | | | | | | | | Merge zim.(none):/home/brian/mysql/merge-5.1brian@zim.(none)2006-09-3039-346/+465
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | This patch updates to remove most global hton needs. Cleans up wrong message ...brian@zim.(none)2006-09-309-23/+15
| | | * | | | | | | | | | | | This patch adds handlerton passing to functions. NDB and Innodb still require...brian@zim.(none)2006-09-3027-248/+350
| | | * | | | | | | | | | | | This removes the passing of global hton to engine instance. brian@zim.(none)2006-09-2924-75/+105
* | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1gkodinov@dl145s.mysql.com2006-09-3016-27/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-09-2916-27/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-archbrian@zim.(none)2006-09-284-14/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge gbichot@bk-internal:/home/bk/mysql-5.1-archgbichot@dl145h.mysql.com2006-09-284-14/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | In the handlerton, cursor creation function don't have an argumentgbichot@dl145h.mysql.com2006-09-284-14/+23
| | * | | | | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1brian@zim.(none)2006-09-2813-13/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
View Lorry Controller Status