Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
|\ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-05-11 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix warning VS2017 15.7 update. | Vladislav Vaintroub | 2018-05-09 | 1 | -1/+1 |
* | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -6/+6 |
* | | | remove my_hash_const_element(), use Hash_set in C++ code | Sergei Golubchik | 2017-03-31 | 1 | -8/+0 |
* | | | Merge 10.2 into bb-10.2-mariarocks | Sergei Petrunia | 2017-03-31 | 1 | -4/+12 |
|\ \ \ | |||||
| * \ \ | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -4/+12 |
| |\ \ \ | | |/ / | |||||
| | * | | spelling fixes | klemens | 2017-03-07 | 1 | -2/+2 |
| | * | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-03 | 1 | -2/+10 |
| | |\ \ | |||||
| | | * | | Added a separate lock for start/stop/reset slave. | Monty | 2017-02-28 | 1 | -2/+10 |
| | | * | | MDEV-9024 Build fails with VS2015 | Vladislav Vaintroub | 2015-11-06 | 1 | -1/+1 |
* | | | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks | Sergei Petrunia | 2017-03-11 | 1 | -76/+176 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Removed usage of my_hash_search() with uninitialized HASH. | Monty | 2017-01-11 | 1 | -7/+7 |
| * | | | | Improve mysys/hash by caching hash_nr | Monty | 2017-01-11 | 1 | -69/+169 |
| |/ / / | |||||
* | | | | MariaRocks: port my_hash_const_element | Sergei Petrunia | 2016-10-16 | 1 | -0/+8 |
|/ / / | |||||
* | | | cleanup: s/const CHARSET_INFO/CHARSET_INFO/ | Sergei Golubchik | 2014-12-04 | 1 | -1/+1 |
* | | | cleanup: my_init_dynamic_array2 -> init_dynamic_array2 | Sergei Golubchik | 2014-10-11 | 1 | -4/+3 |
|/ / | |||||
* | | MDEV-5675 - Performance: my_hash_sort_bin is called too often | Sergey Vojtovich | 2014-03-06 | 1 | -17/+15 |
* | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -1/+2 |
|\ \ | |||||
| * | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -1/+2 |
* | | | small cleanup | Sergei Golubchik | 2013-04-07 | 1 | -2/+4 |
|/ / | |||||
* | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -2/+4 |
|/ | |||||
* | 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/+5 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -9/+13 |
|\ \ \ \ | |||||
| * \ \ \ | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * | | | | - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed... | Michael Widenius | 2011-02-24 | 1 | -1/+2 |
| * | | | | | Fixed compiler warnings and some test failures found by buildbot | Michael Widenius | 2011-02-23 | 1 | -8/+11 |
| |/ / / / | |||||
* | | | | | adding DBUG_ENTER/DBUG_RETURN tags that were useful when fixing memory leaks | Sergei Golubchik | 2011-07-10 | 1 | -2/+4 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -11/+59 |
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | |||||
| * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -7/+2 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -7/+29 |
| |\ \ \ | |||||
| * \ \ \ | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -7/+6 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge with base MySQL-5.1-maria | Michael Widenius | 2008-12-03 | 1 | -73/+76 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -68/+70 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de... | Michael Widenius | 2008-12-03 | 1 | -6/+53 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t" | unknown | 2008-05-29 | 1 | -1/+1 |
* | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -3/+1 |
* | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -4/+12 |
* | | | | | | | | | Merge WL#5137 to mysql-next-mr | Mikael Ronstrom | 2009-11-27 | 1 | -9/+40 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | WL#5137, Remove hash calculation from LOCK_open in open_table | Mikael Ronstrom | 2009-11-20 | 1 | -9/+40 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| | * | | | | | | | | Review comments for LOCK_open patch | Mikael Ronstrom | 2009-11-10 | 1 | -10/+16 |