summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Re-apply fixes originally made by Kent, joerg@trift2.2007-08-031-4/+4
* WL#3732 Information schema optimizationgluh@mysql.com/eagle.(none)2007-08-0312-916/+1585
* Merge trift2.:/MySQL/M51/bug29982-5.1joerg@trift2.2007-08-021-0/+0
|\
| * Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.joerg@trift2.2007-07-311-0/+0
* | Merge mysql.com:/home/ram/work/b30088/b30088.5.0ramil/ram@ramil.myoffice.izhnet.ru2007-08-021-1/+6
|\ \
| * | Fix for bug #30088: Can't disable myisam-recover by a value of "".ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-08-011-1/+6
* | | Merge mysql.com:/home/ram/work/b30200/b30200.5.0ramil/ram@ramil.myoffice.izhnet.ru2007-08-022-1/+1
|\ \ \
| * | | Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-p...ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-08-023-1/+2
* | | | Post-merge fix. Update some test results, and add an InnoDB-onlytsmith@ramayana.hindu.god2007-08-021-0/+5
* | | | Merge 50 -> 51 (-opt changesets)tsmith@ramayana.hindu.god2007-08-018-24/+127
|\ \ \ \ | |/ / /
| * | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opttsmith@ramayana.hindu.god2007-08-0119-182/+288
| |\ \ \
| | * \ \ Merge ramayana.hindu.god:/home/tsmith/m/bk/50tsmith@ramayana.hindu.god2007-08-019-20/+28
| | |\ \ \
| | | * \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@ramil.myoffice.izhnet.ru2007-08-015-16/+15
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintiggy@alf.(none)2007-07-271-0/+4
| | | |\ \ \
| | * | \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.(none)2007-07-3112-162/+260
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-07-311-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | ha_innodb.cc:evgen@moonbone.local2007-07-311-1/+2
| * | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@magare.gmz2007-07-3114-88/+136
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Post-merge fixessergefp@mysql.com2007-07-311-2/+2
| * | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-optsergefp@pylon.mylan2007-07-313-18/+51
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | BUG#29582: huge memory consumption with union, subselect, joins:sergefp@mysql.com2007-07-313-18/+51
| * | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-07-312-1/+12
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120gshchepa/uchum@gleb.loc2007-07-317-15/+79
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-07-306-15/+78
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug#24989: The DEADLOCK error is improperly handled by InnoDB.evgen@moonbone.local2007-07-306-15/+78
* | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opttsmith@ramayana.hindu.god2007-08-0123-191/+328
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optgkodinov/kgeorge@magare.gmz2007-07-316-6/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-optgshchepa/uchum@gleb.loc2007-07-312-1/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/29717/my50-29717holyfoot/hf@hfmain.(none)2007-07-312-1/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge mysql.com:/home/hf/work/29717/my41-29717holyfoot/hf@hfmain.(none)2007-07-312-1/+12
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/029717/my41-29717holyfoot/hf@mysql.com/hfmain.(none)2007-07-312-1/+12
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Bug #29717 INSERT INTO SELECT inserts values even ifholyfoot/hf@mysql.com/hfmain.(none)2007-07-312-1/+12
| | * | | | | | | | | | | | | | | | sql_yacc.yy, sp.result, disabled.def:gshchepa/uchum@gleb.loc2007-07-311-1/+1
| | * | | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120gshchepa/uchum@gleb.loc2007-07-314-5/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | / / / / / / / / / / / | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fixed bug #30120.gshchepa/uchum@gleb.loc2007-07-304-5/+15
| | | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | | merge of the fix for bug 17417 5.0-opt->5.1-optgkodinov/kgeorge@magare.gmz2007-07-313-3/+3
| * | | | | | | | | | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B27417-5.0-optgkodinov/kgeorge@magare.gmz2007-07-311-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | addendum for the fix for bug 27417:gkodinov/kgeorge@magare.gmz2007-07-311-1/+2
| * | | | | | | | | | | | | | | (Pushing for Andrei)gkodinov/kgeorge@magare.gmz2007-07-3014-85/+126
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | (pushing for Andrei)gkodinov/kgeorge@magare.gmz2007-07-3014-88/+135
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Moved the DBUG_ASSERT from bug 28983 togkodinov/kgeorge@magare.gmz2007-07-301-0/+1
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | sp_head.cc:gshchepa/uchum@gleb.loc2007-07-291-1/+1
| * | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-07-292-68/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-07-281-66/+78
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Bug#29856: Insufficient buffer space led to a server crash.evgen@moonbone.local2007-07-281-66/+78
| | * | | | | | | | | | | | Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-optgshchepa/uchum@gleb.loc2007-07-281-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-07-281-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Bug#30020: Insufficient check led to a wrong info provided by theevgen@moonbone.local2007-07-281-1/+3
| * | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-07-281-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29834gshchepa/uchum@gleb.loc2007-07-281-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |