summaryrefslogtreecommitdiff
path: root/sql/sql_view.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge bodhi.(none):/opt/local/work/mysql-5.0-runtimekostja@bodhi.(none)2007-07-161-0/+13
|\
| * A fix and a test case for Bug#26141 mixing table types in trigger kostja@bodhi.(none)2007-07-121-0/+13
| * Merge adventure.(none):/home/thek/Development/cpp/bug28846/my50-bug28846thek@adventure.(none)2007-06-221-10/+9
| |\
* | | Patch for the following bugs:anozdrin/alik@ibm.2007-06-281-20/+60
* | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-06-271-10/+9
|\ \ \
| * \ \ Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-06-251-10/+9
| |\ \ \
| | * \ \ Merge adventure.(none):/home/thek/Development/cpp/bug28846/my51-bug28846thek@adventure.(none)2007-06-221-10/+9
| | |\ \ \
| | | * \ \ Merge adventure.(none):/home/thek/Development/cpp/bug28846/my50-bug28846thek@adventure.(none)2007-06-221-10/+9
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Bug#28846 Use of undocumented Prepared Statements crashes serverthek@adventure.(none)2007-06-221-10/+9
* | | | | | Merge gleb.loc:/home/uchum/work/bk/5.1gshchepa/uchum@gleb.loc2007-06-251-6/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bug #26418: Slave out of sync after gkodinov/kgeorge@magare.gmz2007-06-191-6/+1
| | |/ / / | |/| | |
* | | | | Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1lars/lthalmann@dl145k.mysql.com2007-06-211-9/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | The second cleanup patch in scope of BUG#11986.anozdrin/alik@ibm.2007-06-141-4/+3
| * | | | Bug#25411 (trigger code truncated), PART IImalff/marcsql@weblab.(none)2007-06-121-5/+6
| |/ / /
* | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145h.mysql.com2007-06-051-63/+79
|\ \ \ \ | |/ / /
| * | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-06-041-1/+2
| |\ \ \ | | | |/ | | |/|
| | * | Post-merge fix.igor@olga.mysql.com2007-06-011-102/+7
| | * | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0ibabaev@bk-internal.mysql.com2007-06-021-0/+97
| | |\ \ | | | |/
| | | * Bug#27876 (SF with cyrillic variable name fails during execution (regression))malff/marcsql@weblab.(none)2007-05-251-1/+2
| * | | Post-merge fix.igor@olga.mysql.com2007-06-041-1/+1
| * | | Merge olga.mysql.com:/home/igor/mysql-5.1igor@olga.mysql.com2007-06-031-56/+71
| |\ \ \
| | * \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1ibabaev@bk-internal.mysql.com2007-06-011-56/+71
| | |\ \ \
| | | * \ \ Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-optgshchepa/uchum@gleb.loc2007-06-011-1/+1
| | | |\ \ \ | | | | |/ /
| | | | * | sql_view.cc:gshchepa/uchum@gleb.loc2007-06-011-1/+1
| | | * | | Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-optgshchepa/uchum@gleb.loc2007-05-311-56/+71
| | | |\ \ \ | | | | |/ /
| | | | * | sql_view.cc:gshchepa/uchum@gleb.loc2007-05-311-1/+1
| | | | * | Fixed bug #28244.gshchepa/uchum@gleb.loc2007-05-311-57/+72
| | | | |/
| | | | * Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2007-04-241-5/+9
| | | | |\
| | | | | * Bug#25411 (trigger code truncated), PART Imalff/marcsql@weblab.(none)2007-04-241-5/+9
| | | | * | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0ibabaev@bk-internal.mysql.com2007-04-211-2/+7
| | | | |\ \
| * | | | \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.(none)2007-06-011-6/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-241-6/+6
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-101-6/+6
* | | | | | | 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
* | | | | | | Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimethek@adventure.(none)2007-05-301-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Bug#24988 FLUSH PRIVILEGES causes brief unavailabilitythek@adventure.(none)2007-05-281-3/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Manual mergemalff/marcsql@weblab.(none)2007-05-291-1/+1
|/ / / / / /
* | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-05-021-3/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | manual merge 5.0-runtime -> 5.1->runtime, with 25411 part Imalff/marcsql@weblab.(none)2007-04-251-3/+7
* | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optgkodinov/kgeorge@magare.gmz2007-04-241-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | - addendum of the fix for bug 27786:gkodinov/kgeorge@magare.gmz2007-04-231-1/+1
| * | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B27786-5.0-optgkodinov/kgeorge@magare.gmz2007-04-201-2/+7
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1ibabaev@bk-internal.mysql.com2007-04-211-2/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-optevgen@moonbone.local2007-04-211-2/+7
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Bug #27786:gkodinov/kgeorge@magare.gmz2007-04-201-2/+7
| | | |/ | | |/|
* | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@ua141d10.elisa.omakaista.fi2007-04-041-13/+29
|\ \ \ \ | |/ / / |/| | |
| * | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marveljani@ua141d10.elisa.omakaista.fi2007-03-291-12/+23
| |\ \ \ | | | |/ | | |/|
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvelserg@sergbook.mysql.com2007-03-241-1/+6
| | |\ \
| | | * \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-marveltnurnberg@sin.intern.azundris.com2007-03-231-1/+6
| | | |\ \