summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Sergei Golubchik2017-11-211-5/+2
|\
| * Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2017-11-101-4/+7
| |\
| | * MW-394Jan Lindström2017-11-081-2/+2
| | * MW-394sjaakola2017-11-081-4/+6
| | * Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-031-1/+1
| | |\
* | | | Fix some conversion warnings.Vladislav Vaintroub2017-09-301-1/+1
* | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-281-2/+2
* | | | MDEV-13384 Fix Windows warnings. thd_alloc functions now use size_t parametersVladislav Vaintroub2017-09-281-5/+5
* | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-4/+4
* | | | MW-394sjaakola2017-09-151-3/+9
* | | | MDEV-12731andrelkin2017-09-041-0/+1
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-08-311-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-08-311-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | MDEV-13693 : Fix parameter passing to my_error.Vladislav Vaintroub2017-08-311-1/+1
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-08-311-0/+4
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.0-galera' into 10.1Jan Lindström2017-08-211-0/+4
| |\ \ \ | | | |/ | | |/|
| | * | Fix test failure on test MW-86 and remove MW-360 test.Jan Lindström2017-08-151-6/+0
| | * | Refs: MW-360 * splitting DROP TABLE query in separate DROP commands for tempo...sjaakola2017-08-111-1/+4
| | * | Merge tag 'mariadb-10.0.32' into 10.0-galeraJan Lindström2017-08-091-8/+16
| | |\ \ | | | |/
| | * | Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-301-1/+1
| | |\ \
| | * | | Fix galera tests part II(Fix previous commit)Sachin Setiya2017-05-081-1/+1
| | * | | Fix galera test failures.Sachin Setiya2017-05-081-1/+1
| | * | | Fix compiler warnings on gcc 6.x.Jan Lindström2017-04-051-1/+1
| | * | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-171-1/+6
| | |\ \ \
| | * \ \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-281-0/+2
| | |\ \ \ \
* | | | | | | Fix threadpool to report connections aborted due to wait timeout.Vladislav Vaintroub2017-08-301-0/+3
* | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-171-7/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-081-6/+4
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | MDEV-11896 thd_get_error_context_description race conditionSergei Golubchik2017-07-201-6/+4
| * | | | | | MDEV-13179 main.errors fails with wrong errnoMonty2017-08-071-9/+22
* | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-07-081-2/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-07-071-2/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-07-061-1/+1
| | |\ \ \ \ \
| | | * | | | | sql_class: incorrect assignment in Security_context::destroyDaniel Black2017-07-041-1/+1
| | * | | | | | Fix for MDEV-13191. Assert for !is_set() when doing LOAD DATAMonty2017-07-021-1/+9
* | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-07-051-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-06-301-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-06-281-0/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | / | | | |_|_|_|/ | | |/| | | |
| | | * | | | MDEV-13187 incorrect backslash parsing in clientsSergei Golubchik2017-06-271-0/+2
| * | | | | | MDEV-13012 Assertion `share->error' failed in discover_handlerton upon execut...Sergei Golubchik2017-06-221-1/+1
* | | | | | | MDEV-11639 Server crashes in update_virtual_field, gcol.innodb_virtual_basic ...Sergei Golubchik2017-07-051-0/+8
* | | | | | | MDEV-12070 - Introduce thd_query_safe() from MySQL 5.7Sergey Vojtovich2017-06-261-8/+29
* | | | | | | Remove the unnecessary method handlerton::release_temporary_latches()Marko Mäkelä2017-06-161-14/+0
* | | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-221-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-0/+1
* | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Remove compile warning - "this" canot be nullDaniel Black2017-04-301-1/+1
| * | | | | | Merge branch '10.0' 10.1Sergei Golubchik2017-04-281-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-04-211-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | |
| | | * | | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55Sergei Golubchik2017-04-111-1/+1
| | | |\ \ \