| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 4 | -6/+107 |
|\ |
|
| * | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -0/+80 |
| |\ |
|
| | * | Fix Windows-build failure: use my_snprintf() instead of snprintf(). | Alexander Nozdrin | 2011-10-20 | 1 | -3/+3 |
| | * | Fix for Bug#13001491: MYSQL_REFRESH CRASHES WHEN STORED ROUTINES ARE RUN CONC... | Alexander Nozdrin | 2011-09-22 | 1 | -0/+80 |
| * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 4 | -6/+27 |
| |\ \
| | |/ |
|
| | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+119 |
| | |\ |
|
| | * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 3 | -7/+12 |
| | |\ \ |
|
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 3 | -5/+7 |
* | | | | | Small CMake fixes : | Vladislav Vaintroub | 2011-05-15 | 1 | -2/+2 |
* | | | | | Automatic merge with 5.1 | Michael Widenius | 2011-05-04 | 1 | -1/+2 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Fixed build errors on centos5-amd64-minimal, where we compile with very few c... | Michael Widenius | 2011-05-04 | 1 | -1/+2 |
* | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -0/+118 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+118 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | * | | | Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS". | Dmitry Shulga | 2011-03-15 | 1 | -0/+51 |
| | * | | | A post-fix for b58036. | Alexander Barkov | 2011-02-18 | 1 | -3/+3 |
| | * | | | Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they... | Alexander Barkov | 2011-02-18 | 1 | -0/+67 |
| | |/ / |
|
* | | | | Merge with base 5.2 | Michael Widenius | 2011-03-23 | 2 | -2/+4 |
|\ \ \ \ |
|
| * | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 2 | -2/+4 |
* | | | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 2 | -5/+5 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 2 | -5/+5 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 2 | -5/+5 |
| | |\ \ \
| | | |/ / |
|
| | | * | | Merge | Kent Boortz | 2010-12-29 | 17 | -4/+237 |
| | | |\ \
| | | | |/ |
|
| | | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 17 | -4/+237 |
| | | * | | Assorted post-merge fixes, clean-up, integration, compat with 5.6. | Tatiana A. Nurnberg | 2010-11-25 | 1 | -2/+2 |
| | | * | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure | Davi Arnaut | 2010-11-10 | 1 | -3/+3 |
* | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -1/+1 |
|/ / / / |
|
* | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -1/+0 |
|\ \ \ \
| |/ / / |
|
| * | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -1/+0 |
* | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -0/+102 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -0/+102 |
| |\ \ \
| | |/ / |
|
| | * | | Fixed bug #47485 - mysql_store_result returns a not NULL result set | Dmitry Shulga | 2010-09-07 | 1 | -0/+102 |
* | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 2 | -18/+44 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 2 | -18/+44 |
| |\ \ \
| | |/ / |
|
| | * | | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run | Davi Arnaut | 2010-07-30 | 1 | -10/+39 |
| | * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-09 | 1 | -13/+13 |
| | * | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -1/+1 |
* | | | | Merge with MariaDB 5.1 | Michael Widenius | 2010-08-06 | 1 | -6/+6 |
|\ \ \ \
| |/ / / |
|
| * | | | Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar... | Michael Widenius | 2010-08-06 | 1 | -6/+6 |
* | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -17/+194 |
|\ \ \ \
| |/ / / |
|
| * | | | Fixed warnings and build failures after last push | Michael Widenius | 2010-08-02 | 1 | -1/+1 |
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -17/+194 |
| |\ \ \
| | |/ / |
|
| | * | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2010-06-28 | 1 | -0/+58 |
| | |\ \
| | | |/ |
|
| | | * | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run | Davi Arnaut | 2010-06-28 | 1 | -0/+58 |
| | * | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -17/+16 |
| | * | | Manual merge. | Ramil Kalimullin | 2010-05-25 | 1 | -0/+38 |
| | |\ \
| | | |/ |
|
| | | * | Fix for bug #53907: Table dump command can be abused to dump arbitrary tables. | Ramil Kalimullin | 2010-05-25 | 1 | -0/+38 |
| | * | | Using an initial command with mysql_options(..., MYSQL_INIT_COMMAND, ...) | Jim Winstead | 2010-05-09 | 1 | -0/+82 |
| | * | | Bug #53371: COM_FIELD_LIST can be abused to bypass table level grants. | Georgi Kodinov | 2010-05-04 | 1 | -0/+45 |
| | |\ \
| | | |/ |
|
| | | * | Bug #53371: COM_FIELD_LIST can be abused to bypass table level grants. | Georgi Kodinov | 2010-05-03 | 1 | -0/+42 |
* | | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+2 |
|\ \ \ \
| |/ / / |
|