Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed some simple warnings on Windows. | Vladislav Vaintroub | 2012-04-13 | 1 | -1/+1 |
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -0/+5 |
|\ | |||||
| * | BUG#906357: Incorrect result with outer join and full text match | Sergey Petrunya | 2011-12-20 | 1 | -0/+1 |
| * | Fixed LP bug #904832. | Igor Babaev | 2011-12-18 | 1 | -0/+4 |
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+3 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+3 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+3 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | | |\ | |||||
| | | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| | | | | * | automerge | Georgi Kodinov | 2011-01-07 | 1 | -1/+1 |
| | | | | |\ | |||||
| | | | | * | | Backport of bug #55564 to 5.0-security | Georgi Kodinov | 2010-12-03 | 1 | -0/+1 |
* | | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -1/+1 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -20/+54 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Port of code for: (part of testcase is in mysql-test/t/subquery*.test and wil... | Sergey Petrunya | 2011-07-11 | 1 | -1/+1 |
| * | | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -7/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge | Igor Babaev | 2011-05-20 | 1 | -7/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -7/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -7/+1 |
| * | | | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -7/+5 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | unix_timestamp() and from_unixtime() supports microseconds. | Sergei Golubchik | 2011-05-22 | 1 | -0/+2 |
| | * | | | | | | | | lp:737450 Second Assertion `item->null_value' failed in 5.1-micro | Sergei Golubchik | 2011-03-18 | 1 | -1/+1 |
| | * | | | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -7/+3 |
| * | | | | | | | | | Merged the fix for bug 777745 into 5.3. | Igor Babaev | 2011-05-19 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fixed LP bug #777745. | Igor Babaev | 2011-05-19 | 1 | -0/+15 |
| | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -4/+20 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -3/+19 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | |||||
| | | * | | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | |||||
| * | | | | | | | | Fix LP BUG#715738 | unknown | 2011-03-24 | 1 | -0/+8 |
| * | | | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -2/+42 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -2/+42 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -2/+42 |
| | | |\ \ \ \ \ \ | |||||
| * | | \ \ \ \ \ \ | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge with 5.1 | Michael Widenius | 2011-01-05 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | Fixed LP bug #639935 (bug #58727). | Igor Babaev | 2010-12-24 | 1 | -0/+1 |
| * | | | | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | |||||
* | | | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -3/+68 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Bug#11926811 / Bug#60625 Illegal mix of collations | Alexander Barkov | 2011-04-08 | 1 | -0/+25 |
| * | | | | | | | | | | merge | Mattias Jonsson | 2011-01-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Update of copyright headers for files I changed this year. | Mattias Jonsson | 2011-01-27 | 1 | -1/+1 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Manual merge from 5.1 | Mattias Jonsson | 2011-01-10 | 1 | -1/+41 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | merge | Mattias Jonsson | 2011-01-04 | 1 | -1/+41 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Bug#54483: valgrind errors when making warnings for | Mattias Jonsson | 2010-12-22 | 1 | -1/+1 |
| | | * | | | | | | | | Bug#54483: valgrind errors when making warnings for multiline inserts into pa... | Mattias Jonsson | 2010-12-22 | 1 | -1/+41 |
| | | | |_|_|/ / / / | | | |/| | | | | | | |||||
| * | | | | | | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -1/+1 |
| | | | |_|_|_|/ | | | |/| | | | |