Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -1/+18 |
|\ | |||||
| * | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-03-19 | 1 | -1/+18 |
| |\ | |||||
| | * | Bug#41627 Illegal mix of collations in LEAST / GREATEST / CASE | Sergey Glukhov | 2009-03-19 | 1 | -1/+18 |
* | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -40/+43 |
|\ \ \ | |/ / | |||||
| * | | merged 5.0-bugteam -> 5.1-bugteam | Georgi Kodinov | 2009-02-20 | 1 | -1/+0 |
| |\ \ | | |/ | |||||
| | * | fixed a warning | Georgi Kodinov | 2009-02-20 | 1 | -1/+0 |
| * | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-02-19 | 1 | -39/+43 |
| |\ \ | | |/ | |||||
| | * | Bug#37601 Cast Is Not Done On Row Comparison | Sergey Glukhov | 2009-02-19 | 1 | -33/+43 |
| * | | Automerge. | Alexey Kopytov | 2009-02-19 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fix for bug #41078: With CURSOR_TYPE_READ_ONLY mysql_stmt_fetch() ... | Alexey Kopytov | 2009-02-19 | 1 | -1/+1 |
* | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -6/+19 |
|\ \ \ | |/ / | |||||
| * | | Auto-merge | Ramil Kalimullin | 2009-02-05 | 1 | -6/+19 |
| |\ \ | | |/ | |||||
| | * | Fix for bug#42014: Crash, name_const with collate | Ramil Kalimullin | 2009-02-05 | 1 | -6/+19 |
* | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -7/+27 |
|\ \ \ | |/ / | |||||
| * | | auto-merge | Tatiana A. Nurnberg | 2009-01-31 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | auto-merge | Tatiana A. Nurnberg | 2009-01-31 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Bug#41370: TIMESTAMP field does not accepts NULL from FROM_UNIXTIME() | Tatiana A. Nurnberg | 2009-01-30 | 1 | -2/+2 |
| * | | | merged 5.0-bugteam -> 5.1-bugteam | Georgi Kodinov | 2009-01-16 | 1 | -1/+18 |
| |\ \ \ | | |/ / | |||||
| | * | | auto merge | Georgi Kodinov | 2009-01-16 | 1 | -1/+18 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Bug #38637: COUNT DISTINCT prevents NULL testing in HAVING clause | Georgi Kodinov | 2008-10-17 | 1 | -1/+18 |
| | * | | backported the fix for bug #34773 to 5.0 | Georgi Kodinov | 2008-12-09 | 1 | -2/+2 |
| * | | | merged 5.1-main -> 5.1-bugteam | Georgi Kodinov | 2009-01-05 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge from mysql-5.1.30-release | unknown | 2008-11-27 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Added "Sun Microsystems, Inc." to copyright headers on files modified | Build Team | 2008-11-10 | 1 | -1/+1 |
| * | | | | | Fix warnings and bug spotted by gcc-4.3. | Davi Arnaut | 2008-12-16 | 1 | -3/+3 |
| * | | | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2008-12-09 | 1 | -0/+3 |
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | Bug#35796 SHOW CREATE TABLE and default value for BIT field | Sergey Glukhov | 2008-12-09 | 1 | -0/+3 |
| | | |/ | | |/| | |||||
* | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -27/+50 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2008-10-15 | 1 | -1/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#38823: Invalid memory access when a SP statement does wildcard expansion | Davi Arnaut | 2008-10-14 | 1 | -1/+2 |
| * | | | merged 5.1-main -> 5.1-bugteam | Georgi Kodinov | 2008-10-13 | 1 | -4/+6 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc | Gleb Shchepa | 2008-10-08 | 1 | -4/+6 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #38691: segfault/abort in ``UPDATE ...JOIN'' while | Gleb Shchepa | 2008-10-08 | 1 | -4/+6 |
| * | | | merged 5.1-bugteam -> bug 34773 tree | Georgi Kodinov | 2008-10-10 | 1 | -46/+80 |
| |\ \ \ | |||||
| | * \ \ | merge 5.1-bugteam -> bug 32124 5.1 tree | Georgi Kodinov | 2008-10-08 | 1 | -3/+6 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #37348: Crash in or immediately after JOIN::make_sum_func_list | Georgi Kodinov | 2008-10-02 | 1 | -0/+1 |
| | | * | | Merge | Ramil Kalimullin | 2008-10-02 | 1 | -3/+5 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Fix for bug#39182: Binary log producing incompatible character set query | Ramil Kalimullin | 2008-10-01 | 1 | -3/+5 |
| | * | | | Bug #32124: crash if prepared statements refer to variables in the where clause | Georgi Kodinov | 2008-10-08 | 1 | -17/+29 |
| | |/ / | |||||
| | * | | merge of bug 39353 5.0-5.1.29-rc -> 5.1-5.1.29-rc | Georgi Kodinov | 2008-09-19 | 1 | -1/+6 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #39353: Multiple conditions on timestamp column crashes server | Georgi Kodinov | 2008-09-18 | 1 | -1/+6 |
| * | | | Bug#34773: query with explain extended and derived table / other table | Georgi Kodinov | 2008-10-06 | 1 | -2/+2 |
* | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -28/+90 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Bug#36086: Auto merge. | Martin Hansson | 2008-09-08 | 1 | -10/+2 |
| |\ \ \ | |||||
| | * | | | Bug#36086: SELECT * from views don't check column grants | Martin Hansson | 2008-09-03 | 1 | -10/+2 |
| * | | | | merge 5.0 --> 5.1 | Gleb Shchepa | 2008-09-03 | 1 | -0/+7 |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | |||||
| | * | | merge with local tree | Gleb Shchepa | 2008-09-03 | 1 | -0/+7 |
| | |\ \ | |||||
| | | * | | Bug #39002: The server crashes on the query: | Gleb Shchepa | 2008-09-03 | 1 | -0/+7 |
| * | | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2008-08-20 | 1 | -0/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug#38291 memory corruption and server crash with view/sp/function | Sergey Glukhov | 2008-08-20 | 1 | -0/+4 |