Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 1 | -0/+2 |
|\ | |||||
| * | Merging Bug#11752408 from mysql-5.1 | Alexander Barkov | 2012-01-23 | 1 | -0/+2 |
| |\ | |||||
| | * | Bug#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF UTF8... | Alexander Barkov | 2012-01-23 | 1 | -0/+2 |
* | | | Merge 5.3->5.5. | Igor Babaev | 2012-03-01 | 1 | -0/+9 |
|\ \ \ | |||||
| * \ \ | Merge 5.2->5.3 | Igor Babaev | 2012-02-26 | 1 | -0/+9 |
| |\ \ \ | |||||
| | * | | | Fixed LP bug #939866. | Igor Babaev | 2012-02-25 | 1 | -0/+9 |
| | * | | | merge | Vladislav Vaintroub | 2012-02-20 | 1 | -1/+1 |
| | |\ \ \ | |||||
* | | | | | | Update copyright notices | Vladislav Vaintroub | 2012-02-28 | 2 | -0/+2 |
* | | | | | | merge 5.5 | Vladislav Vaintroub | 2012-02-27 | 7 | -32/+780 |
|\ \ \ \ \ \ | |||||
| * | | | | | | because of the high cost associated with fake symdir resolution, disable sym... | Vladislav Vaintroub | 2012-02-27 | 1 | -11/+5 |
| * | | | | | | Merge MWL#192: non-blocking client library into MariaDB. | unknown | 2012-02-26 | 2 | -1/+718 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | MWL#192 after-merge fixes. | unknown | 2012-02-23 | 1 | -7/+7 |
| | * | | | | | | Merge latest MariaDB 5.5 into MWL#192: Non-blocking client library. | unknown | 2012-02-22 | 4 | -11/+29 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge MWL#192: Non-blocking client library, into MariaDB 5.5. | unknown | 2012-02-21 | 2 | -1/+718 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | fix typo. | unknown | 2012-01-07 | 1 | -1/+1 |
| | | * | | | | | | | MWL#192: non-blocking client API, after-review fixes. | unknown | 2012-01-06 | 1 | -87/+35 |
| | | * | | | | | | | MWL#192: Non-blocking client API for libmysqlclient. | unknown | 2011-09-20 | 3 | -1/+751 |
| * | | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-02-24 | 1 | -12/+31 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Fixed lp:933719, "Assertion open_tables == 0 ... " in THD::restore_backup_ope... | Michael Widenius | 2012-02-23 | 1 | -11/+30 |
| * | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-02-21 | 1 | -8/+9 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 1 | -77/+294 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge with 5.1 | Michael Widenius | 2012-02-20 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | / / / | | | | | |_|/ / / | | | | |/| | | | | |||||
| | | | * | | | | | Fixed compiler warnings | Michael Widenius | 2012-02-20 | 1 | -1/+1 |
| | | * | | | | | | Merge with MariaDB 5.1 and MySQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -77/+294 |
| | | |\ \ \ \ \ \ | | | | |/ / / / / | |||||
| | | | * | | | | | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -77/+294 |
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | | | |||||
| | | | | * | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS | Tor Didriksen | 2011-11-30 | 1 | -65/+276 |
| | * | | | | | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc. | Igor Babaev | 2012-02-01 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | MDEV-106 my_gethwaddr() does not compile on Solaris 11 | Sergei Golubchik | 2012-01-23 | 1 | -3/+3 |
| * | | | | | | | | fix the include guards and add missing gplv2 headers | Sergei Golubchik | 2012-02-17 | 2 | -0/+17 |
* | | | | | | | | | address second round review comments | Vladislav Vaintroub | 2012-02-16 | 1 | -3/+1 |
* | | | | | | | | | merge | Vladislav Vaintroub | 2012-02-08 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Cherry-picked fix for solaris compilation from 5.2 | Vladislav Vaintroub | 2012-02-02 | 1 | -3/+3 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | merge | Vladislav Vaintroub | 2012-01-24 | 30 | -136/+433 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | portability fixes for FreeBSD 8 and 9 | Vladislav Vaintroub | 2012-01-23 | 1 | -2/+4 |
| * | | | | | | | - Always compile my_new.cc and safemalloc.c with mysys | Vladislav Vaintroub | 2012-01-20 | 2 | -10/+7 |
| * | | | | | | | Fix embedded build on Windows. | Vladislav Vaintroub | 2012-01-20 | 1 | -1/+1 |
| * | | | | | | | - Fix rpl_checksum test. Use basename of file in error messages, not the o | Vladislav Vaintroub | 2012-01-20 | 3 | -13/+56 |
| * | | | | | | | MDEV-69 SET optimizer_switch = REPLACE(...) causes ER_WRONG_VALUE_FOR_VAR | Sergei Golubchik | 2012-01-17 | 1 | -31/+43 |
| * | | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -61/+274 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS | Tor Didriksen | 2011-12-02 | 1 | -61/+273 |
| * | | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 27 | -28/+58 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 50 | -105/+230 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 50 | -108/+235 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 50 | -105/+230 |
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | |||||
| | | | | * | | | Merge from mysql-5.1.58-release | Karen Langford | 2011-07-06 | 1 | -11/+10 |
| | | | | |\ \ \ | |||||
| | | | | * \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 7 | -798/+260 |
| | | | | |\ \ \ \ | |||||
| | | | * | | | | | | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 1 | -3/+2 |
| | * | | | | | | | | Patch to get MariaDB to compile on CYGWIN; By Guenter Knauf | Michael Widenius | 2011-12-02 | 2 | -2/+7 |
* | | | | | | | | | | merge 5.5 | Vladislav Vaintroub | 2012-01-11 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | moved ha_maria::implicit_commit() calls around | Sergei Golubchik | 2012-01-06 | 1 | -2/+2 |