Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Automatic merge with 5.5 | Michael Widenius | 2012-09-01 | 1 | -4/+19 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -4/+19 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | undo the fix for MySQL Bug#12998841 | Sergei Golubchik | 2012-08-08 | 2 | -66/+9 | |
| | | | |_|_|_|/ | | | |/| | | | | ||||||
| | | * | | | | | Bug #12910665: AUTH-PLUGIN-DATA-LEN NOT TESTED FOR VALIDITY BY THE | Georgi Kodinov | 2012-06-29 | 1 | -0/+6 | |
| | | * | | | | | fixed a missing break | Georgi Kodinov | 2012-07-05 | 1 | -0/+1 | |
| | | * | | | | | Bug #12998841: libmysql divulges plaintext password upon request in 5.5 | Georgi Kodinov | 2012-07-05 | 2 | -9/+65 | |
| | | * | | | | | merge bug#13708485 5.1->5.5 | Georgi Kodinov | 2012-06-29 | 1 | -3/+12 | |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | ||||||
| | | | * | | | | Bug #13708485: malformed resultset packet crashes client | Georgi Kodinov | 2012-06-28 | 1 | -3/+12 | |
* | | | | | | | | MDEV-3802: Millisecond timeout support in non-blocking client library + fix i... | unknown | 2012-10-12 | 2 | -12/+51 | |
* | | | | | | | | compilation and test failures | Sergei Golubchik | 2012-10-04 | 1 | -11/+11 | |
* | | | | | | | | more fixes for test cases | Sergei Golubchik | 2012-10-01 | 1 | -5/+6 | |
* | | | | | | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -25/+16 | |
* | | | | | | | | More fixes | Michael Widenius | 2012-08-17 | 1 | -1/+1 | |
* | | | | | | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -46/+122 | |
|/ / / / / / / | ||||||
* | | | | | | | automatic merge with 5.5 | Michael Widenius | 2012-06-27 | 1 | -17/+80 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | merge | Vladislav Vaintroub | 2012-06-13 | 1 | -17/+80 | |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| | * | | | | | LP1008334 : Speedup specific datetime queries that got slower with introducti... | Vladislav Vaintroub | 2012-06-08 | 1 | -17/+80 | |
| | * | | | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -2/+2 | |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | ||||||
| | | * | | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -2/+2 | |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | ||||||
| | | | * | | | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 1 | -2/+2 | |
| | | | |\ \ \ | | | | | | |/ | | | | | |/| | ||||||
* | | | | | | | Added text for errno in error messages by: | Michael Widenius | 2012-05-30 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Fixed some simple warnings on Windows. | Vladislav Vaintroub | 2012-04-13 | 1 | -13/+0 | |
* | | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 1 | -1/+1 | |
| | |\ \ \ \ | ||||||
* | | \ \ \ \ | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merging BUG#13458237 from 5.1. | Alexander Barkov | 2012-01-24 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | BUG#13458237 - INCONSISTENT HANDLING OF INVALIDE DATES WITH ZERO DAY. SIMILAR... | Alexander Barkov | 2012-01-24 | 1 | -1/+1 | |
* | | | | | | | MWL#192 after-merge fixes. | unknown | 2012-02-23 | 1 | -1/+1 | |
* | | | | | | | Fix MWL#192 build error: Remove SSL special case for embedded server. | unknown | 2012-02-22 | 1 | -2/+2 | |
* | | | | | | | Merge MWL#192: Non-blocking client library, into MariaDB 5.5. | unknown | 2012-02-21 | 2 | -27/+2111 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | MWL#192: Fix problem when we first enable MYSQL_OPT_NONBLOCK, then connect | unknown | 2012-01-30 | 1 | -2/+1 | |
| * | | | | | | | MWL#192: non-blocking client API, after-review fixes. | unknown | 2012-01-06 | 2 | -578/+1028 | |
| * | | | | | | | MWL#192: Non-blocking client API for libmysqlclient. | unknown | 2011-09-20 | 3 | -17/+1613 | |
* | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 2 | -2/+4 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | ||||||
| * | | | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 3 | -6/+13 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | ||||||
| | * | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 3 | -7/+14 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | | | ||||||
| | | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 3 | -6/+13 | |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | ||||||
| | | | * | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+2 | |
| | | | |\ \ \ | ||||||
* | | | | \ \ \ | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | 5.2->5.3 merge | Sergei Golubchik | 2011-11-12 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | 5.1 merge | Sergei Golubchik | 2011-11-12 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / / | ||||||
| | | * | | | | | typos fixed | Sergei Golubchik | 2011-11-08 | 1 | -1/+1 | |
* | | | | | | | | merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -1/+1 | |
* | | | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 4 | -7/+8 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | ||||||
| * | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 4 | -7/+8 | |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||||
| | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 3 | -6/+13 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||||
| | | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 3 | -6/+8 | |
* | | | | | | | | cleanups | Sergei Golubchik | 2011-10-19 | 1 | -0/+2 |