Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix up merge. Some macros are now functions. Some functions are | cmiller@zippy.cornsilk.net | 2007-05-02 | 1 | -1/+8 |
* | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-former... | cmiller@zippy.cornsilk.net | 2007-04-27 | 1 | -0/+3 |
|\ | |||||
| * | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-formerge51 | cmiller@zippy.cornsilk.net | 2007-04-25 | 1 | -0/+3 |
| |\ | |||||
| | * | Wrap code specific to the comunity-server in additional CPP #ifdef . | cmiller@zippy.cornsilk.net | 2007-04-24 | 1 | -1/+1 |
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | cmiller@zippy.cornsilk.net | 2007-04-03 | 1 | -0/+3 |
| | |\ | |||||
| | | * | Merge mysqldev@production.mysql.com:my/build-200702201448-5.0.36/mysql-5.0-re... | cmiller@zippy.cornsilk.net | 2007-02-27 | 1 | -0/+3 |
| | | |\ | |||||
| | | | * | Prevent bugs by making DBUG_* expressions syntactically equivalent | cmiller@zippy.cornsilk.net | 2007-02-22 | 1 | -1/+2 |
| | | | * | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 | baker@bk-internal.mysql.com | 2007-01-14 | 1 | -0/+2 |
| | | | |\ | |||||
| | | | | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-community | cmiller@zippy.cornsilk.net | 2007-01-03 | 1 | -0/+2 |
| | | | | |\ | |||||
| | | | | | * | Bug#24795: Add SHOW PROFILE | cmiller@zippy.cornsilk.net | 2007-01-03 | 1 | -0/+2 |
| | * | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/b27231/41 | tsmith@quadxeon.mysql.com | 2007-03-20 | 1 | -8/+6 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge romeo.(none):/home/bkroot/mysql-5.0-rpl | mats@romeo.(none) | 2007-04-20 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 | jamppa@bk-internal.mysql.com | 2007-04-03 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Initialize thd->no_trans_update | monty@mysql.com/narttu.mysql.fi | 2007-03-29 | 1 | -0/+1 |
* | | | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base | malff/marcsql@weblab.(none) | 2007-04-20 | 1 | -0/+96 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | kostja@vajra.(none) | 2007-04-14 | 1 | -0/+96 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | An attempt to fix a sporadic valgrind memory leak in Event Scheduler: | kostja@vajra.(none) | 2007-04-13 | 1 | -0/+96 |
* | | | | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-rpl | mats@romeo.(none) | 2007-04-20 | 1 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Added more descriptive error message of why statement was automaticly dropped | monty@mysql.com/narttu.mysql.fi | 2007-04-13 | 1 | -0/+1 |
| * | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | jani@ua141d10.elisa.omakaista.fi | 2007-04-10 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixes for tests after merge from 5.0 | jani@ua141d10.elisa.omakaista.fi | 2007-04-05 | 1 | -0/+2 |
| | * | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel | jani@ua141d10.elisa.omakaista.fi | 2007-04-03 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel | jani@ua141d10.elisa.omakaista.fi | 2007-03-29 | 1 | -3/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main | jani@ua141d10.elisa.omakaista.fi | 2007-03-28 | 1 | -3/+4 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 | jani@ua141d10.elisa.omakaista.fi | 2007-03-26 | 1 | -6/+6 |
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / / | | | | | |/| | | | | | | | | |||||
| | | | | | * | | | | | | | | Fixed compiler warnings. | jani@ua141d10.elisa.omakaista.fi | 2007-03-22 | 1 | -6/+6 |
* | | | | | | | | | | | | | | WL#2735: Refactor replication | mats@romeo.(none) | 2007-04-13 | 1 | -108/+3 |
* | | | | | | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl | mats@romeo.(none) | 2007-04-12 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | BUG#25688 (RBR: circular replication may cause STMT_END_F flags to be | mats@romeo.(none) | 2007-04-12 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl | lars/lthalmann@dl145h.mysql.com | 2007-04-10 | 1 | -5/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| / / / / / / / / / / / / / | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with m... | gluh@mysql.com/eagle.(none) | 2007-04-03 | 1 | -5/+6 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge mysql.com:/home/bar/mysql-5.0-rpl | bar@mysql.com | 2007-04-09 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | / / / / / / | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Bug#22648 LC_TIME_NAMES: Setting GLOBAL has no effect | bar@mysql.com | 2007-04-09 | 1 | -1/+0 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl | lars/lthalmann@mysql.com/dl145h.mysql.com | 2007-03-29 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl | lars/lthalmann@dl145j.mysql.com | 2007-03-29 | 1 | -15/+107 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl | mats@romeo.(none) | 2007-03-22 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_25543 | cbell/Chuck@mysql_cab_desk. | 2007-03-21 | 1 | -0/+11 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl | cbell/Chuck@mysql_cab_desk. | 2007-03-19 | 1 | -0/+12 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | Bug #25543 Replication of wrong values if using rand() in stored procedure | cbell/Chuck@mysql_cab_desk. | 2007-03-09 | 1 | -0/+12 |
| * | | | | | | | | | | | BUG#26969: | mats@romeo.(none) | 2007-03-20 | 1 | -3/+1 |
| * | | | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl | mats@romeo.(none) | 2007-03-20 | 1 | -15/+98 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl | mats@romeo.(none) | 2007-03-07 | 1 | -15/+98 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merging with mysql-5.1-new-rpl | mats@romeo.(none) | 2007-02-21 | 1 | -15/+98 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | BUG#22583 (RBR between MyISAM and non-MyISAM tables containing BIT field | mats@romeo.(none) | 2007-02-12 | 1 | -15/+98 |
* | | | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 | tsmith@quadxeon.mysql.com | 2007-03-22 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | kostja@bodhi.local | 2007-03-20 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | manual merge | guilhem@gbichot3.local | 2007-03-09 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Mechanical class renaming: | guilhem@gbichot3.local | 2007-01-30 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50 | tsmith@quadxeon.mysql.com | 2007-03-20 | 1 | -8/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | / / / / / / / | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/41 | tsmith@quadxeon.mysql.com | 2007-03-20 | 1 | -8/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | / / / / / / | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |