Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -5/+3 |
|\ | |||||
| * | Merging from 5.3 | Alexander Barkov | 2013-07-08 | 1 | -5/+3 |
| |\ | |||||
| | * | MDEV-4667 DATE('string') incompability between mysql and mariadb | Sergei Golubchik | 2013-07-03 | 1 | -5/+3 |
| | * | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -4/+4 |
| | |\ | |||||
| | | * | 5.1 merge | Sergei Golubchik | 2012-08-22 | 1 | -4/+4 |
| | | |\ | |||||
| | | | * | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -4/+4 |
| | | | |\ | |||||
* | | | | \ | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+8 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -1/+8 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bug #14553380 MYSQL C API LIBRARY EXITS AT NET_CLEAR AT NET_SERV.CC:223 | Venkata Sidagam | 2013-01-10 | 1 | -1/+8 |
| | * | | | | | merge 5.1 => 5.5 | Tor Didriksen | 2012-11-01 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Bug#14840488 VALGRIND ERRORS IN MYSQL_CLIENT_TEST | Tor Didriksen | 2012-11-01 | 1 | -1/+1 |
| | | | |_|_|/ | | | |/| | | | |||||
* | | | | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -2/+2 |
* | | | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -3/+4 |
|/ / / / / / | |||||
* | | | | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -4/+5 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | merge bug#13708485 5.1->5.5 | Georgi Kodinov | 2012-06-29 | 1 | -4/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Bug #13708485: malformed resultset packet crashes client | Georgi Kodinov | 2012-06-28 | 1 | -4/+4 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+2 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+2 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -5/+15 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -1/+2 |
| * | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | post review changes 2 | Sergei Golubchik | 2011-05-19 | 1 | -1/+1 |
| | * | | | | | | post-review changes 1 | Sergei Golubchik | 2011-05-19 | 1 | -1/+1 |
| | * | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -2/+2 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Fixed bug when accessing wrong decimal value in dynamic string (Fixed lp:781233) | Michael Widenius | 2011-05-12 | 1 | -1/+1 |
| * | | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+9 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed... | Michael Widenius | 2011-02-24 | 1 | -0/+8 |
| | * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -4/+6 |
| | |\ \ \ \ | | | |/ / / | |||||
| * | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -2/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -2/+4 |
| | |\ \ \ \ | |||||
* | | \ \ \ \ | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -36/+56 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Patch for Bug#12374486 - SEVERE MEMORY LEAK IN PREPARED STATEMENTS | Alexander Nozdrin | 2011-05-06 | 1 | -21/+54 |
| * | | | | | | Remove configuration preprocessor symbols 'THREAD' | Magne Mahre | 2011-01-11 | 1 | -13/+1 |
| * | | | | | | Merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-11-24 | 1 | -2/+1 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge from mysql-5.0-bugteam. | Alexander Nozdrin | 2010-11-24 | 1 | -2/+1 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remov... | Alexander Nozdrin | 2010-11-24 | 1 | -2/+1 |
| | * | | | | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure | Davi Arnaut | 2010-11-10 | 1 | -2/+2 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | merge | Georgi Kodinov | 2010-10-04 | 1 | -2/+7 |
| |\ \ \ \ \ | |||||
| * | | | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -81/+20 |
* | | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -5/+5 |
* | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -82/+34 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | |||||
| * | | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -0/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | |