summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* mysql-5.5.22 mergeSergei Golubchik2012-03-2845-203/+290
|\
| * merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-02-182-0/+5
| |\
| | * Print a deprecation warning when ignore-builtin-innodb is usedVasil Dimov2012-02-172-0/+5
| * | merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-02-1735-37/+120
| |\ \ | | |/
| | * Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| | |\
| | | * Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| | | * MergeKent Boortz2012-02-161-0/+4
| | | |\
| | * | \ MergeKent Boortz2012-02-161-0/+4
| | |\ \ \
| | | * \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-02-151-0/+4
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | store_create_info(): Fix a compiler warning about unused variable.Marko Mäkelä2012-02-151-0/+4
| | * | | | Updated/added copyright headersMySQL Build Team2012-02-1633-35/+33
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/|
| | | * | Updated/added copyright headersKent Boortz2012-02-1514-14/+14
| | | |\ \ | | | | |/ | | | |/|
| | | | * Updated/added copyright headersMySQL Build Team2012-02-1513-22/+13
| | * | | 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-095-1/+82
| | * | | Backout the patch for bug#11758263.Rohit Kalhans2012-02-085-74/+4
| | * | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFERohit Kalhans2012-02-085-4/+74
| * | | | Bug#13633383 63183: SMALL SORT_BUFFER_SIZE CRASH IN MERGE_BUFFERSTor Didriksen2012-02-141-98/+81
| * | | | Merge of fix for Bug#11765810.Martin Hansson2012-02-071-11/+1
| |\ \ \ \
| | * | | | Bug #11765810 58813: SERVER THREAD HANGS WHEN JOIN + WHERE + GROUP BYMartin Hansson2012-02-071-11/+1
| | * | | | merged mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-062-3/+3
| | |\ \ \ \ | | | | |/ / | | | |/| |
| * | | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-02-0620-93/+199
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | merge from 5.5 repo.Andrei Elkin2012-01-3115-56/+145
| | |\ \ \ \
| | * | | | | bug#3593869-64035Andrei Elkin2012-01-192-15/+16
| * | | | | | Bug#13593865 - 64037: CRASH IN HA_PARTITION::CREATE_HANDLERS ONMattias Jonsson2012-02-024-57/+70
| * | | | | | Merged from mysql-5.1-security Gopal Shankar2012-01-301-2/+2
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Bug#13105873 :Valgrind Warning: CRASH IN FOREIGNGopal Shankar2012-01-301-2/+2
| * | | | | | Merge 5.1-security => 5.5-securityTor Didriksen2012-01-272-12/+37
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#13580775 ASSERTION FAILED: RECORD_LENGTH == M_RECORD_LENGTHTor Didriksen2012-01-272-12/+37
| | * | | | | weave merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-01-121-2/+27
| | |\ \ \ \ \
| * | \ \ \ \ \ weave merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-01-122-3/+30
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge from mysql-5.1-security to mysql-5.5-securityJon Olav Hauglid2012-01-093-4/+37
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Backport from mysql-trunk of:Jon Olav Hauglid2012-01-093-4/+37
* | | | | | | | | mdev-201 - Assertion `!thd->spcont' failed in net_send_error on server shutdownSergei Golubchik2012-03-271-0/+3
* | | | | | | | | a couple of minor post-5.5-merge cleanupsSergei Golubchik2012-03-264-5/+5
* | | | | | | | | Merge MariaDB 5.3 into latest MariaDB 5.5unknown2012-03-2417-102/+132
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge mariadb 5.3->mariadb 5.5unknown2012-03-2417-102/+132
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Improve filesort performance for small sorts: Don't write pointers to records...unknown2012-03-242-38/+28
| | * | | | | | | | | Speedup:Michael Widenius2012-03-238-25/+29
| | * | | | | | | | | Fixes lp:941889 "JOIN constructors takes a long time in 5.3"Michael Widenius2012-03-233-16/+42
| | * | | | | | | | | Fixed LP bug #954900.Igor Babaev2012-03-221-1/+1
| | * | | | | | | | | Automerge.unknown2012-03-225-23/+32
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Backport some simple performance patches from 5.5.unknown2012-03-225-23/+32
| | * | | | | | | | | | mergeSergei Golubchik2012-03-212-1/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ mergeSergei Golubchik2012-03-212-1/+3
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | lp:933959 Assertion `0' failed in net_end_statement(THD*) on concurrent SELEC...Sergei Golubchik2012-03-211-0/+2
| | | | * | | | | | | | | | restore my_safe_printf_stderr for "crash-safe sigsegv handler"Sergei Golubchik2012-03-141-1/+1
| | * | | | | | | | | | | | mdev-191 SHOW TABLES was unnecessary opening .frm filesSergei Golubchik2012-03-211-4/+5
| | * | | | | | | | | | | | Merge BUG#952372Sergey Petrunya2012-03-211-2/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | BUG#952372: Server crashes on 2nd execution of PS in find_field_in_tables wit...Sergey Petrunya2012-03-181-2/+5