Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge bk-internal:/home/bk/mysql-5.1-marvel | df@pippilotta.erinye.com | 2007-08-03 | 35 | -282/+392 |
|\ | |||||
| * | Removed compiler warning | monty@mysql.com/nosik.monty.fi | 2007-08-03 | 1 | -2/+4 |
| * | Simplify logging code a bit (to make code smaller and faster) | monty@mysql.com/nosik.monty.fi | 2007-08-03 | 6 | -65/+62 |
| * | Don't save & restore time fields from thd when it's not needed. | monty@mysql.com/nosik.monty.fi | 2007-08-02 | 3 | -38/+20 |
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | monty@nosik.monty.fi | 2007-08-02 | 31 | -182/+311 |
| |\ | |||||
| | * | Set --debug-check if one uses DBUG_PUSH in all clients | monty@mysql.com/nosik.monty.fi | 2007-08-02 | 1 | -3/+4 |
| | * | Fixes Bug#30127: --debug-info no longer prints memory usage in mysql | monty@mysql.com/nosik.monty.fi | 2007-08-01 | 2 | -3/+3 |
| | * | Slow query log to file now displays queries with microsecond precission | monty@mysql.com/nosik.monty.fi | 2007-07-30 | 29 | -171/+304 |
| | * | Added support for 'internal temporary tables' in HEAP tables. | monty@mysql.com/nosik.monty.fi | 2007-07-25 | 1 | -3/+2 |
* | | | Merge bk-internal:/home/bk/mysql-5.1-engines | df@pippilotta.erinye.com | 2007-08-03 | 1 | -1/+8 |
|\ \ \ | |||||
| * \ \ | Merge mysql.com:/home/svoj/devel/mysql/BUG29152/mysql-5.0-engines | svoj@april.(none) | 2007-08-02 | 1 | -1/+8 |
| |\ \ \ | |||||
| | * | | | BUG#29152 - INSERT DELAYED does not use concurrent_insert on slave | svoj@mysql.com/april.(none) | 2007-07-31 | 1 | -1/+8 |
* | | | | | powermacg5 problem fix | gluh@mysql.com/eagle.(none) | 2007-08-03 | 1 | -3/+7 |
* | | | | | Re-apply fixes originally made by Kent, | joerg@trift2. | 2007-08-03 | 1 | -4/+4 |
* | | | | | WL#3732 Information schema optimization | gluh@mysql.com/eagle.(none) | 2007-08-03 | 12 | -916/+1585 |
* | | | | | Merge trift2.:/MySQL/M51/bug29982-5.1 | joerg@trift2. | 2007-08-02 | 1 | -0/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files. | joerg@trift2. | 2007-07-31 | 1 | -0/+0 |
* | | | | | | Merge mysql.com:/home/ram/work/b30088/b30088.5.0 | ramil/ram@ramil.myoffice.izhnet.ru | 2007-08-02 | 1 | -1/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix for bug #30088: Can't disable myisam-recover by a value of "". | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru | 2007-08-01 | 1 | -1/+6 |
* | | | | | | | Merge mysql.com:/home/ram/work/b30200/b30200.5.0 | ramil/ram@ramil.myoffice.izhnet.ru | 2007-08-02 | 2 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-p... | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru | 2007-08-02 | 3 | -1/+2 |
* | | | | | | | | Post-merge fix. Update some test results, and add an InnoDB-only | tsmith@ramayana.hindu.god | 2007-08-02 | 1 | -0/+5 |
* | | | | | | | | Merge 50 -> 51 (-opt changesets) | tsmith@ramayana.hindu.god | 2007-08-01 | 8 | -24/+127 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | tsmith@ramayana.hindu.god | 2007-08-01 | 19 | -182/+288 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge ramayana.hindu.god:/home/tsmith/m/bk/50 | tsmith@ramayana.hindu.god | 2007-08-01 | 9 | -20/+28 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint | ramil/ram@ramil.myoffice.izhnet.ru | 2007-08-01 | 5 | -16/+15 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint | iggy@alf.(none) | 2007-07-27 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | kostja@bodhi.(none) | 2007-07-31 | 12 | -162/+260 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | evgen@moonbone.local | 2007-07-31 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | ha_innodb.cc: | evgen@moonbone.local | 2007-07-31 | 1 | -1/+2 |
| * | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | gkodinov/kgeorge@magare.gmz | 2007-07-31 | 14 | -88/+136 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Post-merge fixes | sergefp@mysql.com | 2007-07-31 | 1 | -2/+2 |
| * | | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | sergefp@pylon.mylan | 2007-07-31 | 3 | -18/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | BUG#29582: huge memory consumption with union, subselect, joins: | sergefp@mysql.com | 2007-07-31 | 3 | -18/+51 |
| * | | | | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | holyfoot/hf@hfmain.(none) | 2007-07-31 | 2 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120 | gshchepa/uchum@gleb.loc | 2007-07-31 | 7 | -15/+79 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | evgen@moonbone.local | 2007-07-30 | 6 | -15/+78 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Bug#24989: The DEADLOCK error is improperly handled by InnoDB. | evgen@moonbone.local | 2007-07-30 | 6 | -15/+78 |
* | | | | | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt | tsmith@ramayana.hindu.god | 2007-08-01 | 23 | -191/+328 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt | gkodinov/kgeorge@magare.gmz | 2007-07-31 | 6 | -6/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt | gshchepa/uchum@gleb.loc | 2007-07-31 | 2 | -1/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/hf/work/29717/my50-29717 | holyfoot/hf@hfmain.(none) | 2007-07-31 | 2 | -1/+12 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | Merge mysql.com:/home/hf/work/29717/my41-29717 | holyfoot/hf@hfmain.(none) | 2007-07-31 | 2 | -1/+12 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/hf/work/029717/my41-29717 | holyfoot/hf@mysql.com/hfmain.(none) | 2007-07-31 | 2 | -1/+12 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | | | | | | | Bug #29717 INSERT INTO SELECT inserts values even if | holyfoot/hf@mysql.com/hfmain.(none) | 2007-07-31 | 2 | -1/+12 |
| | * | | | | | | | | | | | | | | | | | | | sql_yacc.yy, sp.result, disabled.def: | gshchepa/uchum@gleb.loc | 2007-07-31 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120 | gshchepa/uchum@gleb.loc | 2007-07-31 | 4 | -5/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | / / / / / / / / / / / / / / | | | | |_|_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | Fixed bug #30120. | gshchepa/uchum@gleb.loc | 2007-07-30 | 4 | -5/+15 |
| | | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | merge of the fix for bug 17417 5.0-opt->5.1-opt | gkodinov/kgeorge@magare.gmz | 2007-07-31 | 3 | -3/+3 |
| * | | | | | | | | | | | | | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B27417-5.0-opt | gkodinov/kgeorge@magare.gmz | 2007-07-31 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |