summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
Commit message (Expand)AuthorAgeFilesLines
* Fix up merge. Some macros are now functions. Some functions arecmiller@zippy.cornsilk.net2007-05-021-1/+8
* Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-former...cmiller@zippy.cornsilk.net2007-04-271-0/+3
|\
| * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-formerge51cmiller@zippy.cornsilk.net2007-04-251-0/+3
| |\
| | * Wrap code specific to the comunity-server in additional CPP #ifdef .cmiller@zippy.cornsilk.net2007-04-241-1/+1
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-04-031-0/+3
| | |\
| | | * Merge mysqldev@production.mysql.com:my/build-200702201448-5.0.36/mysql-5.0-re...cmiller@zippy.cornsilk.net2007-02-271-0/+3
| | | |\
| | | | * Prevent bugs by making DBUG_* expressions syntactically equivalent cmiller@zippy.cornsilk.net2007-02-221-1/+2
| | | | * Merge bk-internal.mysql.com:/data0/bk/mysql-5.0baker@bk-internal.mysql.com2007-01-141-0/+2
| | | | |\
| | | | | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communitycmiller@zippy.cornsilk.net2007-01-031-0/+2
| | | | | |\
| | | | | | * Bug#24795: Add SHOW PROFILEcmiller@zippy.cornsilk.net2007-01-031-0/+2
| | * | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/b27231/41tsmith@quadxeon.mysql.com2007-03-201-8/+6
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge romeo.(none):/home/bkroot/mysql-5.0-rplmats@romeo.(none)2007-04-201-1/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0jamppa@bk-internal.mysql.com2007-04-031-3/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Initialize thd->no_trans_updatemonty@mysql.com/narttu.mysql.fi2007-03-291-0/+1
* | | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-04-201-0/+96
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@vajra.(none)2007-04-141-0/+96
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | An attempt to fix a sporadic valgrind memory leak in Event Scheduler:kostja@vajra.(none)2007-04-131-0/+96
* | | | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-rplmats@romeo.(none)2007-04-201-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added more descriptive error message of why statement was automaticly droppedmonty@mysql.com/narttu.mysql.fi2007-04-131-0/+1
| * | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@ua141d10.elisa.omakaista.fi2007-04-101-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Fixes for tests after merge from 5.0jani@ua141d10.elisa.omakaista.fi2007-04-051-0/+2
| | * | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marveljani@ua141d10.elisa.omakaista.fi2007-04-031-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marveljani@ua141d10.elisa.omakaista.fi2007-03-291-3/+4
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-mainjani@ua141d10.elisa.omakaista.fi2007-03-281-3/+4
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2007-03-261-6/+6
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / / | | | | | |/| | | | | | | |
| | | | | | * | | | | | | | Fixed compiler warnings.jani@ua141d10.elisa.omakaista.fi2007-03-221-6/+6
* | | | | | | | | | | | | | WL#2735: Refactor replicationmats@romeo.(none)2007-04-131-108/+3
* | | | | | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2007-04-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | BUG#25688 (RBR: circular replication may cause STMT_END_F flags to bemats@romeo.(none)2007-04-121-0/+1
* | | | | | | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145h.mysql.com2007-04-101-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| / / / / / / / / / / / / / | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with m...gluh@mysql.com/eagle.(none)2007-04-031-5/+6
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge mysql.com:/home/bar/mysql-5.0-rplbar@mysql.com2007-04-091-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | / / / / / / | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Bug#22648 LC_TIME_NAMES: Setting GLOBAL has no effectbar@mysql.com2007-04-091-1/+0
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145h.mysql.com2007-03-291-0/+12
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-03-291-15/+107
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2007-03-221-0/+11
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_25543cbell/Chuck@mysql_cab_desk.2007-03-211-0/+11
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rplcbell/Chuck@mysql_cab_desk.2007-03-191-0/+12
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Bug #25543 Replication of wrong values if using rand() in stored procedurecbell/Chuck@mysql_cab_desk.2007-03-091-0/+12
| * | | | | | | | | | | BUG#26969:mats@romeo.(none)2007-03-201-3/+1
| * | | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2007-03-201-15/+98
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2007-03-071-15/+98
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merging with mysql-5.1-new-rplmats@romeo.(none)2007-02-211-15/+98
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | BUG#22583 (RBR between MyISAM and non-MyISAM tables containing BIT fieldmats@romeo.(none)2007-02-121-15/+98
* | | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1tsmith@quadxeon.mysql.com2007-03-221-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2007-03-201-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | manual mergeguilhem@gbichot3.local2007-03-091-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Mechanical class renaming:guilhem@gbichot3.local2007-01-301-3/+3
* | | | | | | | | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50tsmith@quadxeon.mysql.com2007-03-201-8/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | / / / / / / / | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/41tsmith@quadxeon.mysql.com2007-03-201-8/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | / / / / / / | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |