Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | a couple of minor post-5.5-merge cleanups | Sergei Golubchik | 2012-03-26 | 1 | -3/+1 |
* | Merge MWL#192: Non-blocking client library, into MariaDB 5.5. | unknown | 2012-02-21 | 1 | -1/+133 |
|\ | |||||
| * | MWL#192: non-blocking client API, after-review fixes. | unknown | 2012-01-06 | 1 | -9/+4 |
| * | MWL#192: Non-blocking client API for libmysqlclient. | unknown | 2011-09-20 | 1 | -1/+136 |
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -0/+1 |
|\ \ | |||||
| * \ | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | 1. add --plugin-dir and --default-auth to mysqltest. | Sergei Golubchik | 2011-12-02 | 1 | -0/+1 |
| | |/ | |||||
* | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -2/+2 |
* | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+4 |
|\ \ \ | |/ / | |||||
| * | | merge | Vladislav Vaintroub | 2011-07-10 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | merge | Vladislav Vaintroub | 2011-07-10 | 1 | -1/+1 |
| * | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 1 | -1/+2 |
| * | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+2 |
| |\ \ | | |/ | |/| | |||||
| | * | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -1/+1 |
| * | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -1/+2 |
| |\ \ | |||||
| | * \ | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -1/+2 |
| | |\ \ | | | |/ | |||||
* | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -4/+5 |
|\ \ \ \ | |||||
| * | | | | Patch for Bug#12374486 - SEVERE MEMORY LEAK IN PREPARED STATEMENTS | Alexander Nozdrin | 2011-05-06 | 1 | -1/+2 |
| * | | | | Fix for BUG#59894 | Guilhem Bichot | 2011-02-11 | 1 | -1/+1 |
| * | | | | merge | Georgi Kodinov | 2010-10-04 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| * | | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -32/+5 |
* | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+1 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -48/+22 |
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -1/+0 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -1/+0 |
| | |\ \ \ | |||||
| * | | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -32/+5 |
| * | | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | fix for a possible DoS in the my_net_skip_rest() | Sergei Golubchik | 2010-02-23 | 1 | -1/+1 |
| * | | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -10/+0 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -10/+0 |
| | |\ \ \ \ | |||||
| * | | | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as const | Michael Widenius | 2010-01-06 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+10 |
| |\ \ \ \ \ | |||||
| * | | | | | | Added client functions: | Michael Widenius | 2009-10-02 | 1 | -0/+2 |
| * | | | | | | Added "pool-of-threads" handling (with libevent) | Michael Widenius | 2009-03-13 | 1 | -2/+4 |
| * | | | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -11/+8 |
* | | | | | | | Auto-merge from mysql-5.1-bugteam. | Dmitry Shulga | 2010-09-07 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Fixed bug #47485 - mysql_store_result returns a not NULL result set | Dmitry Shulga | 2010-09-07 | 1 | -1/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-20 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5 | Davi Arnaut | 2010-07-20 | 1 | -1/+0 |
| | |_|/ | |/| | | |||||
* | | | | Post-fix for Bug#52929 : replace uint with "unsigned int" in mysql.h.pp | Vladislav Vaintroub | 2010-07-05 | 1 | -3/+3 |
* | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -0/+4 |
* | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -69/+14 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -0/+10 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -1/+2 |
| * | | | Backport of: | Konstantin Osipov | 2009-10-16 | 1 | -62/+6 |
| * | | | Introduce thd->query_cache_tls (thread | Konstantin Osipov | 2009-10-13 | 1 | -1/+1 |
| * | | | Backport to 5.4 the following changesets: | Konstantin Osipov | 2009-10-09 | 1 | -5/+5 |
| | |/ | |/| | |||||
* | | | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an... | Davi Arnaut | 2009-11-24 | 1 | -10/+0 |
| |/ |/| | |||||
* | | Automerge. | Davi Arnaut | 2009-11-02 | 1 | -0/+10 |
|/ |