Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -55/+54 |
|\ | |||||
| * | Merge MariaDB 5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-10-14 | 1 | -2/+2 |
| * | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -0/+15 |
| |\ | |||||
| | * | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -0/+15 |
| | |\ | |||||
| * | \ | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -5/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -5/+5 |
| | |\ \ | |||||
| * | \ \ | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -0/+246 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+148 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -0/+57 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+41 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -52/+52 |
| |/ / / / / / | |||||
| * | | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -1/+0 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | * Use excessive parentheses to stop compiler warning | Sergey Petrunia | 2009-06-17 | 1 | -1/+0 |
* | | | | | | | | Auto-merge from mysql-5.5-merge. | Alexander Nozdrin | 2010-09-28 | 1 | -5/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Manual merge of the fix for bug #54190 and the addendum patch | Alexey Kopytov | 2010-09-09 | 1 | -5/+0 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
* | | | | | | | | | Bug#56271: Wrong comparison result with STR_TO_DATE function | Evgeny Potemkin | 2010-09-07 | 1 | -6/+6 |
|/ / / / / / / / | |||||
* | | | | | | | | Bug#52312 lost Handler_read_last status variable | Marc Alff | 2010-08-25 | 1 | -0/+1 |
* | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Backporting of jorgen.loland@sun.com-20100618093212-lifp1psig3hbj6jj | Olav Sandstaa | 2010-07-08 | 1 | -0/+19 |
* | | | | | | | | | Automerge. | Ramil Kalimullin | 2010-06-24 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | |||||
| * | | | | | | | Fix for bug #54459: Assertion failed: param.sort_length, | Ramil Kalimullin | 2010-06-24 | 1 | -0/+15 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -18/+92 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bug #8433: Overflow must be an error | Alexey Kopytov | 2010-03-18 | 1 | -6/+9 |
| * | | | | | | | Patch for WL#3736: Extended Table, Column and Index Comments. | Alexander Nozdrin | 2010-02-20 | 1 | -4/+4 |
| * | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -0/+63 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Backport of WL #2934: Make/find library for doing float/double | Alexey Kopytov | 2009-12-22 | 1 | -7/+7 |
| * | | | | | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -0/+95 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -0/+32 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Bug#33546: Slowdown on re-evaluation of constant expressions. | Evgeny Potemkin | 2009-12-02 | 1 | -1/+72 |
* | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-03-07 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Bug#47669 Query showed by EXPLAIN EXTENDED gives different result from origin... | Sergey Glukhov | 2010-02-26 | 1 | -5/+5 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -0/+63 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Auto-merge. | Ramil Kalimullin | 2010-01-29 | 1 | -0/+63 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix for bug#49897: crash in ptr_compare when char(0) NOT NULL | Ramil Kalimullin | 2010-01-29 | 1 | -0/+64 |
| * | | | | | | | | | merge 5.1-main to 5.1-bugteam | Georgi Kodinov | 2010-01-13 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
* | | | | | | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-12-16 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | / / / / | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix for bug#49517: Inconsistent behavior while using | Ramil Kalimullin | 2009-12-15 | 1 | -0/+15 |
| * | | | | | | | | Bug#49489: Uninitialized cache led to a wrong result. | Georgi Kodinov | 2009-12-15 | 1 | -0/+10 |
* | | | | | | | | | Streamlined the test case for bug #49199 in | Alexey Kopytov | 2009-12-12 | 1 | -7/+7 |
* | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -0/+95 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | / / / / | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Auto-merged fix for bug#49489. | Evgeny Potemkin | 2009-12-11 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Bug#49489: Uninitialized cache led to a wrong result. | Evgeny Potemkin | 2009-12-09 | 1 | -0/+10 |
| | |/ / / / / / | |||||
| * | | | | | | | Manual merge. | Ramil Kalimullin | 2009-12-10 | 1 | -0/+85 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / | |||||
| | * | | | | | Fix for bug#49199: Optimizer handles incorrectly: | Ramil Kalimullin | 2009-12-04 | 1 | -0/+84 |
* | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||||
| * | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -0/+41 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Bug#30302: Tables that were optimized away are printed in the | Evgeny Potemkin | 2009-10-19 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Bug#48052: Valgrind warning - uninitialized value in | Jorgen Loland | 2009-11-13 | 1 | -0/+18 |
* | | | | | merge | Georgi Kodinov | 2009-11-10 | 1 | -0/+14 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | |