Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'connect/10.0' into 10.0 | Sergei Golubchik | 2016-04-26 | 1 | -17/+9 |
| | |\ | |||||
| | | * | - Fix an error causing MYSQL table to fail saying "no result set" | Olivier Bertrand | 2016-04-25 | 1 | -17/+9 |
* | | | | MDEV-6353 my_ismbchar() and my_mbcharlen() refactoring | Alexander Barkov | 2016-05-17 | 1 | -2/+1 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -1/+1 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -33/+38 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -33/+38 |
| |\ \ | |||||
| | * | | MDEV-8313 Got an error writing communication packets | Sergei Golubchik | 2015-12-07 | 1 | -0/+19 |
| | * | | federatedx small cleanup | Sergei Golubchik | 2015-12-07 | 1 | -33/+19 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | remove unneded #include's that had a dubious explanation | Sergei Golubchik | 2015-10-24 | 1 | -0/+1 |
* | | | | cleanup: use enum_binlog_checksum_alg, not uint8 | Sergei Golubchik | 2015-09-04 | 1 | -0/+1 |
* | | | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -1/+1 |
* | | | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -23/+23 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 1 | -23/+23 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | CRLF->LF | Sergei Golubchik | 2015-06-02 | 2 | -27/+27 |
* | | | cleanup: freshen up CREATE SERVER code | Sergei Golubchik | 2014-12-04 | 1 | -7/+7 |
* | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 5 | -4/+5 |
|\ \ \ | |/ / | |||||
| * | | 5.5.40+ merge | Sergei Golubchik | 2014-10-09 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | MDEV-5120 Test suite test maria-no-logging fails | Sergei Golubchik | 2014-10-02 | 5 | -0/+5 |
| * | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 4 | -4/+4 |
* | | | cleanup: remove table->status from some engines | Sergei Golubchik | 2014-10-01 | 1 | -8/+0 |
|/ / | |||||
* | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | typo in FederatedX. HA_READ_AFTER_KEY is not a valid index flag. | Sergei Golubchik | 2014-04-14 | 1 | -1/+1 |
* | | remove append_escaped(), use String::append_for_single_quote() instead | Sergei Golubchik | 2014-03-26 | 1 | -3/+3 |
* | | update plugins' maturity levels: | Sergei Golubchik | 2014-03-19 | 1 | -1/+1 |
* | | MDEV-5864 - Reduce usage of LOCK_open: TABLE_SHARE::tdc.free_tables | Sergey Vojtovich | 2014-03-20 | 1 | -8/+0 |
* | | MDEV-4447 MariaDB sources should have unix-style line endings everywhere | Sergei Golubchik | 2014-02-27 | 1 | -4/+4 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 2 | -16/+12 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 2 | -16/+12 |
| |\ \ | | |/ | |||||
| | * | federatedx: avoid unnecessary bzero. improve dbug traces | Sergei Golubchik | 2014-02-21 | 1 | -4/+7 |
| | * | MDEV-5698 Using ORDER BY in a FederatedX table is abnormally slow | Sergei Golubchik | 2014-02-21 | 1 | -12/+5 |
* | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -2/+2 |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -8/+8 |
|\ \ \ | |/ / |/| | | |||||
| * | | Push a lot of small fixes to get larger parts to compile | Michael Widenius | 2013-05-21 | 1 | -5/+5 |
| * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
* | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -0/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | MDEV-4468 Assertion `error != 0' fails or timeout occurs on select from a FED... | Sergei Golubchik | 2013-06-07 | 1 | -0/+5 |
| * | | Fixed some cache variables that could be set to higher value than what the co... | Michael Widenius | 2013-06-06 | 1 | -1/+0 |
* | | | MDEV-4708: GTID strict mode doesn't work on a database with purged binlogs | unknown | 2013-07-10 | 1 | -1/+0 |
* | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -5/+4 |
|\ \ \ | |/ / | |||||
| * | | MDEV-388 Creating a federated table with a non-existing server returns a rand... | Sergei Golubchik | 2013-05-21 | 1 | -3/+2 |
| * | | MDEV-388 Creating a federated table with a non-existing server returns a rand... | Sergei Golubchik | 2013-05-20 | 1 | -1/+1 |
| * | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1) | Sergei Golubchik | 2013-04-17 | 1 | -1/+1 |
* | | | Changed the client library to only mark memory as THREAD_SPECIFIC if one has ... | Michael Widenius | 2013-04-17 | 2 | -1/+8 |
* | | | 5.5 merge | Sergei Golubchik | 2013-04-14 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-4243 Warnings/errors while compiling with clang | Sergei Golubchik | 2013-03-28 | 1 | -1/+1 |
* | | | post-review comments and other minor edits | Sergei Golubchik | 2013-04-09 | 1 | -3/+4 |