summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* mergeSergei Golubchik2012-04-071-9/+24
|\
| * Merge.Igor Babaev2012-04-061-9/+16
| |\
| | * Fixed bug #915222.Igor Babaev2012-04-061-9/+16
| * | Fix of LP bug#968720.unknown2012-04-051-0/+8
| |/
* | mysql-5.5.22 mergeSergei Golubchik2012-03-281-2/+49
|\ \
| * \ Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\ \
| * | | BUG#11758263: Modification of indentation in the added code.Rohit Kalhans2012-02-131-11/+11
| * | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-091-1/+48
| * | | Backout the patch for bug#11758263.Rohit Kalhans2012-02-081-40/+1
| * | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-081-1/+40
* | | | Merge mariadb 5.3->mariadb 5.5unknown2012-03-241-9/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Speedup:Michael Widenius2012-03-231-9/+4
* | | | Merge 5.3->5.5Igor Babaev2012-03-171-0/+11
|\ \ \ \ | |/ / /
| * | | MergeSergey Petrunya2012-03-121-4/+13
| |\ \ \
| | * | | Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable ke...Michael Widenius2012-02-281-4/+13
| * | | | BUG#952297: Server crashes on 2nd execution of PS in Field::is_null with semi...Sergey Petrunya2012-03-121-0/+11
| |/ / /
| * | | Fixed lp:933719, "Assertion open_tables == 0 ... " in THD::restore_backup_ope...Michael Widenius2012-02-231-6/+5
* | | | Upgraded sphinx to version 2.0.4Michael Widenius2012-03-071-8/+14
* | | | MDEV-117 Assertion: prebuilt->sql_stat_start || trx->conc_state == 1 failed a...Sergei Golubchik2012-03-011-5/+6
* | | | 5.3.4 mergeSergei Golubchik2012-02-151-6/+26
|\ \ \ \ | |/ / /
| * | | Fix for LP BUG#910123 MariaDB 5.3.3 causes 1093 error on Drupalunknown2012-02-141-4/+18
| * | | Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view.unknown2012-02-031-2/+3
| * | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.Igor Babaev2012-02-011-1/+6
| |\ \ \
| | * | | Fixed LP bug #806057.Igor Babaev2011-12-291-1/+6
* | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-3/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix for bug #13116518 - "OPEN_TABLES() SHOULD NOT ALLOCATE AND FREE Dmitry Lenev2011-10-231-3/+4
* | | | | 5.3 mergeSergei Golubchik2012-01-131-4/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Rewrite IGNORE handling:Michael Widenius2011-12-111-4/+9
| * | | | Merge with 5.2.Michael Widenius2011-12-111-60/+163
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge with 5.1Michael Widenius2011-11-301-3/+3
| | |\ \ \
| | | * | | Fixed compiler warnings and other bugs found by buildbot.Michael Widenius2011-11-301-3/+3
| | * | | | Merge with 5.1 + fixes for build failures in 5.2Michael Widenius2011-11-291-2/+3
| | |\ \ \ \ | | | |/ / /
| | * | | | after merge fixesSergei Golubchik2011-11-281-2/+8
| | * | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-55/+151
| | |\ \ \ \ | | | |/ / /
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-52/+152
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Merge.Sergey Vojtovich2011-08-241-42/+141
| | | | |\ \
| | | | | * | BUG#11763712 - 56458: KILLING A FLUSH TABLE FOR A MERGE/CHILDSergey Vojtovich2011-08-181-42/+141
* | | | | | | moved ha_maria::implicit_commit() calls aroundSergei Golubchik2012-01-061-5/+0
* | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-271-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fixed LP bug #892725.Igor Babaev2011-11-201-0/+2
* | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-10/+22
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix MySQL BUG#12329653unknown2011-11-121-2/+2
| * | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-2/+2
| * | | | | | BUG#849763: Wrong result with second execution of prepared statement with sem...Sergey Petrunya2011-09-201-1/+15
| * | | | | | Merge with 5.2Michael Widenius2011-09-101-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ...Michael Widenius2011-09-091-2/+2
| * | | | | | Merge of mergeunknown2011-09-021-2/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge 5.2->5.3unknown2011-09-021-2/+3
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Added logging of all errors from my_read/my_write/my_pread/my_pwrite/my_open ...Michael Widenius2011-09-021-2/+3
| * | | | | | | BUG#834534: Assertion `0' failed in replace_where_subcondition with semijoin ...Sergey Petrunya2011-08-291-5/+2
| |/ / / / / /