summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge bodhi.(none):/opt/local/work/mysql-5.0-runtimekostja@bodhi.(none)2007-07-161-1/+1
|\
| * Remove typedef st_table_list TABLE_LIST and always use name 'TABLE_LIST'.kostja@bodhi.(none)2007-07-061-1/+1
* | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-07-021-14/+43
|\ \
| * | BUG#28722 (Multi-engine statements on has_own_binlogging engine):mats@kindahl-laptop.dnsalias.net2007-06-211-14/+43
* | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-rpltsmith@maint1.mysql.com2007-06-211-10/+120
|\ \ \ | |/ /
| * | Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rplmats@kindahl-laptop.dnsalias.net2007-06-121-9/+119
| |\ \
| | * \ Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rplmats@kindahl-laptop.dnsalias.net2007-06-121-9/+119
| | |\ \
| | | * | BUG#23051 (READ COMMITTED breaks mixed and statement-basedmats@kindahl-laptop.dnsalias.net2007-06-121-4/+9
| | | * | WL#3303 (RBR: Engine-controlled logging format):mats@kindahl-laptop.dnsalias.net2007-05-291-68/+94
| | | * | WL#3303 (RBR: Engine-controlled logging format):mats@kindahl-laptop.dnsalias.net2007-05-281-6/+85
| * | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145h.mysql.com2007-06-051-54/+62
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplmats@kindahl-laptop.dnsalias.net2007-05-311-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | WL#3339 (Issue warnings when statement-based replication may fail):mats@romeo.kindahl.net2007-05-141-2/+2
* | | | | Sdditional fix-up for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlockramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-06-181-2/+3
* | | | | Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlockramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-06-171-2/+6
| |_|/ / |/| | |
* | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-06-041-0/+7
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge bk-internal:/home/bk/mysql-5.0-optgkodinov/kgeorge@macbook.gmz2007-06-031-0/+7
| |\ \ \
| | * | | Bug #26162: Trigger DML ignores low_priority_updates settinggkodinov/kgeorge@macbook.gmz2007-06-031-0/+7
| * | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0ibabaev@bk-internal.mysql.com2007-06-021-3/+10
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@vajra.(none)2007-05-241-3/+10
| | |\ \ \
| * | \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0ibabaev@bk-internal.mysql.com2007-05-281-2/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge siva.hindu.god:/home/tsmith/m/bk/50tsmith@siva.hindu.god2007-05-171-34/+390
| |\ \ \ \ \
| * | | | | | Backport of TIME->MYSQL_TIME / Y2K fixsetmsvensson@pilot.blaudden2007-05-161-1/+1
* | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.1igor@olga.mysql.com2007-06-031-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1ibabaev@bk-internal.mysql.com2007-06-011-1/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-optgshchepa/uchum@gleb.loc2007-05-281-1/+1
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-05-231-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug#27563: Stored functions and triggers wasn't throwing an error when killed.evgen@moonbone.local2007-05-231-1/+1
| | | | |/ / / / /
| | | * | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@magare.gmz2007-05-221-1/+6
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | Bug #28476: force index on a disabled myisam index gives error 124gkodinov/kgeorge@magare.gmz2007-05-221-1/+6
| | | | |/ / / /
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.(none)2007-06-011-53/+54
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merged from main 5.1jani@linux-th5m.site2007-05-241-1/+1
| * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-241-52/+53
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-101-50/+51
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimedlenev@mockturtle.local2007-05-191-11/+38
|\ \ \ \ \ \ \
| * | | | | | | Patch changing how ALTER TABLE implementation handles table lockingdlenev@mockturtle.local2007-05-191-11/+38
| |/ / / / / /
* | | | | | | Merge vajra.(none):/opt/local/work/mysql-5.0-runtimekostja@vajra.(none)2007-05-181-3/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Bug #27907 "Misleading error message when opening/locking tables"kostja@vajra.(none)2007-05-181-3/+10
| | |/ / / | |/| | |
* | | | | Merge vajra.(none):/opt/local/work/mysql-5.0-21483kostja@vajra.(none)2007-05-161-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimekostja@vajra.(none)2007-05-161-2/+2
| |\ \ \ \
| | * | | | A fix and a test case for kostja@vajra.(none)2007-05-161-2/+2
| | | |/ / | | |/| |
| * | | | Fix for:dlenev@mockturtle.local2007-05-111-32/+388
| |/ / /
* | | | A post-merge fix.kostja@vajra.(none)2007-05-151-1/+1
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@vajra.(none)2007-05-151-41/+408
|\ \ \ \
| * | | | Fix for:dlenev@mockturtle.local2007-05-111-41/+408
| | |/ / | |/| |
* | | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-05-041-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2007-04-271-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@sergbook.mysql.com2007-04-161-2/+2
| | |\ \
| | | * | WL#2936antony@ppcg5.local2007-03-021-2/+2
* | | | | Merge mysql.com:/d2/hf/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-04-291-0/+5
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |