summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* manual merge from mysql-trunk-bugfixingJon Olav Hauglid2010-06-0614-60/+64
|\
| * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-05-311-27/+29
| * Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-0110-24/+29
| |\
| | * Backport: remove dead code.Davi Arnaut2010-05-285-11/+10
| | * Backport: Remove unused and ancient files, functions, and facilities.Davi Arnaut2010-05-281-5/+0
| | * Auto-merge from mysql-trunk.Alexander Nozdrin2010-05-284-8/+19
| | |\
| | | * Manual merge from mysql-trunk.Alexander Nozdrin2010-05-201-3/+0
| | | |\
| | | * | Fixed loaddata failures on some platforms in PB2.Alexey Kopytov2010-05-111-5/+5
| | | * | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-092-5/+13
| | | |\ \
| | | | * | On behalf of Kristofer :Georgi Kodinov2010-05-052-5/+13
| | | * | | Manual merge from mysql-trunk.Alexander Nozdrin2010-04-271-3/+3
| | | |\ \ \
| | | * \ \ \ Automerge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-04-111-1/+1
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Bug #47095: Can't open_files_limit really be larger than 65535?Georgi Kodinov2010-04-091-1/+1
| | | * | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-04-031-0/+3
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Bug #51893: crash with certain characters given to load_file Georgi Kodinov2010-03-231-0/+3
| * | | | | | Merge mysql-trunk-bugfixing -> mysql-trunk-innodbVasil Dimov2010-05-272-6/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug #53445 Build with -Wall and fix warnings that it generatesTor Didriksen2010-05-261-2/+1
| | * | | | | Patch for Bug#53937 (Junk make-ccc files included in MySQL Server bzr repo).Alexander Nozdrin2010-05-261-4/+0
| | | |_|_|/ | | |/| | |
| * | | | | Merge a change from mysql-5.1-innodb:Marko Mäkelä2010-05-201-0/+5
| |/ / / /
| * | | | Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-191-3/+0
| | |_|/ | |/| |
* | | | A follow up patch for the fix for Bug#51263 "Deadlock between Konstantin Osipov2010-06-012-200/+22
|/ / /
* | | Merge the changes of the 5.5.3-m3 release buildJoerg Bruehe2010-04-181-3/+3
|\ \ \ | |/ / |/| |
| * | Fix C++ style comments, they cause syntax errors in C file.Joerg Bruehe2010-03-131-3/+3
* | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-2459-888/+4118
|\ \ \ | |/ /
| * | A follow-up on WL#5154 and WL#5182: remove forgotten options.Alexander Nozdrin2010-03-031-69/+10
| * | Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-023-9/+223
| |\ \
| | * \ Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-012-5/+219
| | |\ \
| | | * \ Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-251-1/+1
| | | |\ \
| | | * \ \ Merging WL#1213 into mysql-next-mr-bar2Alexander Barkov2010-02-242-5/+219
| | | |\ \ \
| | | | * | | Backporting WL#1213Alexander Barkov2010-02-242-5/+219
| | * | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-4/+4
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Fix for bug #51105 "MDL deadlock in rqg_mdl_stability testDmitry Lenev2010-02-281-12/+44
| |/ / / / /
| * | | | | Fix BUILD/compile-pentium64-xxx scripts, when ccache is present.Vladislav Vaintroub2010-02-221-1/+1
| | |/ / / | |/| | |
| * | | | mergeVladislav Vaintroub2010-02-163-45/+132
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Auto-merge from mysql-next-4284.Alexander Nozdrin2010-02-151-1/+0
| | |\ \ \
| | | * | | Followup to Bug#45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-151-1/+0
| | * | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-152-40/+42
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug #45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-111-16/+16
| | * | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-062-3/+3
| | |\ \ \ \
| | * \ \ \ \ Merge next-mr -> next-4284-merge.Konstantin Osipov2010-02-041-6/+6
| | |\ \ \ \ \
| | * | | | | | Bug #50821 Deadlock between LOCK TABLES and ALTER TABLEJon Olav Hauglid2010-02-041-3/+2
| | * | | | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-033-5/+6
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-034-172/+386
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge next-mr -> next-4284. Konstantin Osipov2010-02-021-4/+12
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-025-57/+85
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | * | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-0232-409/+715
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix for bug #48538 "Assertion in thr_lock() on LOAD DATA CONCURRENTJon Olav Hauglid2010-01-081-9/+20
| | * | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-161-0/+3
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-5/+9
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-153-6/+76
| | |\ \ \ \ \ \ \ \ \ \ \ \