Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-26: Global Transaction ID. | unknown | 2013-03-11 | 1 | -0/+1 |
* | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -1/+14 |
|\ | |||||
| * | fix embedded build with for cmake 2.6.2 (older cmake could not handle IF(NOT ... | Vladislav Vaintroub | 2013-01-28 | 1 | -1/+3 |
| * | fix embedded | Vladislav Vaintroub | 2013-01-25 | 1 | -1/+0 |
| * | Fix embedded build | Vladislav Vaintroub | 2013-01-25 | 1 | -3/+4 |
| * | MDEV-3842, MDEV-3923 : | Vladislav Vaintroub | 2013-01-25 | 1 | -1/+12 |
* | | Merge maria-5.5-mwl248 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -1/+2 |
|\ \ | |||||
| * \ | Merge | Igor Babaev | 2012-06-01 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| * | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-04-11 | 1 | -2/+1 |
| |\ \ | |||||
| * \ \ | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248. | Igor Babaev | 2012-03-19 | 1 | -1/+2 |
| |\ \ \ | |||||
| | * \ \ | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MariaDB 5.1 and MySQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -0/+1 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -0/+1 |
| | | | |\ \ \ | |||||
* | | | | \ \ \ | SHOW EXPLAIN: merge to 10.0-base. | Sergey Petrunya | 2012-10-06 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | MWL#182: Explain running statements | Sergey Petrunya | 2012-06-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | MWL#182: SHOW EXPLAIN: Merge 5.3->5.5 | Sergey Petrunya | 2012-05-16 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | | * | | | | | | MWL#182: Explain running statements: merge with 5.3-main (needs fixing) | Sergey Petrunya | 2012-01-03 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | |||||
| | | | * | | | | | MWL#182: Explain running statements | Sergey Petrunya | 2011-10-27 | 1 | -0/+1 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | Fix windows build: add my_apc.{h,cc} to CMakeLists.txt files | Sergey Petrunya | 2011-08-25 | 1 | -0/+1 |
* | | | | | | | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line. | Igor Babaev | 2012-09-01 | 1 | -0/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Building RPMs with CPack | Sergei Golubchik | 2012-05-22 | 1 | -2/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | 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 | -2/+1 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS | Tor Didriksen | 2011-11-30 | 1 | -0/+1 |
* | | | | | | | | | MDEV-15 Log all sql errors. | Alexey Botchkov | 2012-03-24 | 1 | -1/+0 |
| |_|_|_|_|/ / / |/| | | | | | | | |||||
* | | | | | | | | Fix compile error - linker does not find extern variables, in sql_logger.c | Vladislav Vaintroub | 2012-03-15 | 1 | -1/+1 |
* | | | | | | | | MDEV-15 Log SQL errors. | Alexey Botchkov | 2012-03-14 | 1 | -0/+1 |
* | | | | | | | | Merge MWL#192: Non-blocking client library, into MariaDB 5.5. | unknown | 2012-02-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | MWL#192: Non-blocking client API for libmysqlclient. | unknown | 2011-09-20 | 1 | -0/+1 |
* | | | | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS | Tor Didriksen | 2011-12-02 | 1 | -0/+1 |
* | | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | 1. add --plugin-dir and --default-auth to mysqltest. | Sergei Golubchik | 2011-12-02 | 1 | -1/+1 |
| * | | | | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | |||||
| | | | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+2 |
* | | | | | | | | | merged | Sergei Golubchik | 2011-11-27 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Avoid mysqld dependency on libaio.so by linking xtradb statically to libaio. | Vladislav Vaintroub | 2011-11-25 | 1 | -0/+3 |
* | | | | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | |||||
| * | | | | | | | | merging. | Alexey Botchkov | 2011-11-12 | 1 | -15/+12 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | merge | Sergei Golubchik | 2011-10-11 | 1 | -15/+12 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | / | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | | * | | | | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 1 | -15/+12 |
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | / | | | | |_|_|/ | | | |/| | | | |||||
| | | | * | | | support for plugins on windows | Sergei Golubchik | 2011-10-04 | 1 | -15/+12 |
| * | | | | | | gis-related tests fixes. | Alexey Botchkov | 2011-06-20 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | Precise GIS functions added. | Alexey Botchkov | 2011-05-04 | 1 | -0/+1 |
* | | | | | | | merged | Sergei Golubchik | 2011-11-22 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | few cmake/compiler warnings | Sergei Golubchik | 2011-11-03 | 1 | -2/+1 |