summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2017-04-063-35/+66
|\
| * Merge 10.0 into 10.1Marko Mäkelä2017-04-062-35/+61
| |\
| | * MDEV-8642: WHERE Clause not applied on View - Empty result set returnedOleksandr Byelkin2017-04-051-13/+0
| | * Compiling, Windows . Avoid unnecessary rebuilds with MSVC.Vladislav Vaintroub2017-04-031-22/+61
| * | fix warning "ignoring return value" of fwrite.Jan Lindström2017-04-051-1/+5
* | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocksSergei Petrunia2017-04-044-13/+272
|\ \ \
| * | | Fixed bug mdev-10454.Igor Babaev2017-04-034-13/+272
* | | | Merge 10.2 into bb-10.2-mariarocksSergei Petrunia2017-04-033-6/+21
|\ \ \ \ | |/ / /
| * | | MDEV-12421 Check constraint with query crashes server and renders DB unusableSergei Golubchik2017-04-011-3/+5
| * | | properly close the table in fill_schema_table_from_frm()Sergei Golubchik2017-03-311-1/+1
| * | | MDEV-12416 OOM in create_virtual_tmp_table() makes the server crashAlexander Barkov2017-03-311-2/+15
* | | | ha_start_consistent_snapshot() did not check for errorsSergei Golubchik2017-03-312-6/+11
* | | | move rocksdb specific changes into rocksdbSergei Golubchik2017-03-312-9/+0
* | | | remove my_hash_const_element(), use Hash_set in C++ codeSergei Golubchik2017-03-311-2/+12
* | | | remove DB_TYPE_ROCKSDBSergei Golubchik2017-03-311-2/+1
* | | | Merge 10.2 into bb-10.2-mariarocksSergei Petrunia2017-03-31121-1122/+1578
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-30110-1037/+1327
| |\ \ \ | | |/ /
| | * | Fix some warnings on Windows compilationVladislav Vaintroub2017-03-242-2/+2
| | * | MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by T...Vladislav Vaintroub2017-03-231-0/+9
| | * | Merge branch '10.0' into 10.1Sergei Golubchik2017-03-219-28/+52
| | |\ \ | | | |/
| | | * Merge branch '5.5' into 10.0Sergei Golubchik2017-03-213-2/+7
| | | |\
| | | | * MDEV-12126 Correct German error message.Vladislav Vaintroub2017-03-171-1/+1
| | | | * MDEV-6486: Assertion `!table || (!table->read_set || bitmap_is_set(table->rea...Varun Gupta2017-03-141-0/+5
| | | | * Use correct function name in DEBUG_ENTERSergei Petrunia2017-03-091-1/+1
| | | * | Wait for slave threads to start during startupMonty2017-03-162-16/+35
| | | * | Removed wrong assertMonty2017-03-161-4/+3
| | | * | MDEV-12261 build failure without P_SSergei Golubchik2017-03-153-5/+5
| | | * | Make ELOOP be considered a File Not Found error when it comes from handlertonVicențiu Ciorbaru2017-03-141-0/+1
| | * | | Fix truncation of affected rows and insert id in select_insert::send_ok_packetVladislav Vaintroub2017-03-131-2/+2
| | * | | Correct FSF addressiangilfillan2017-03-1052-52/+52
| | * | | cleanup: sort various lists of servicesSergei Golubchik2017-03-102-16/+16
| | * | | thd_rnd serviceSergei Golubchik2017-03-104-4/+36
| | * | | Auth Plugin API: add THD to MYSQL_SERVER_AUTH_INFOSergei Golubchik2017-03-101-40/+39
| | * | | base64 serviceSergei Golubchik2017-03-104-3/+10
| | * | | remove old API for SHA2Sergei Golubchik2017-03-103-124/+18
| | * | | my_sha2 serviceSergei Golubchik2017-03-101-0/+28
| | * | | cleanup: generalize my_sha1.ccSergei Golubchik2017-03-102-30/+28
| | * | | make sql_udf.cc to shorten dlerror() messagesSergei Golubchik2017-03-102-15/+6
| | * | | MDEV-11943 I_S.TABLES inconsistencies with tables with unknown storage engineSergei Golubchik2017-03-101-4/+31
| | * | | MDEV-11943 I_S.TABLES inconsistencies with tables with unknown storage engineSergei Golubchik2017-03-101-1/+11
| | * | | trivial cleanupSergei Golubchik2017-03-101-5/+2
| | * | | cleanup: change dd_frm_type() to return the engine name, not legacy_db_typeSergei Golubchik2017-03-104-35/+41
| | * | | MDEV-11842 Fail to insert on a table where a field has no defaultSergei Golubchik2017-03-101-2/+7
| | * | | Merge 10.0 into 10.1Marko Mäkelä2017-03-101-1/+1
| | |\ \ \ | | | |/ /
| | | * | Use %pure-parser instead of the deprecated %pure_parser.Marko Mäkelä2017-03-091-1/+1
| | | * | Remove unused variables.Marko Mäkelä2017-03-091-1/+0
| | * | | Merge 10.0 into 10.1Marko Mäkelä2017-03-0918-120/+149
| | |\ \ \ | | | |/ /
| | | * | Merge 5.5 into 10.0Marko Mäkelä2017-03-084-18/+33
| | | |\ \ | | | | |/
| | | | * MDEV-12206 Query_cache::send_result_to_client() may corrupt THD::query_plan_f...Marko Mäkelä2017-03-081-14/+13
| | | | * MDEV-11078: NULL NOT IN (non-empty subquery) should never return resultsVarun Gupta2017-03-052-0/+15