summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* A temporary solution to make CREATE TABLE attributesSergei Golubchik2010-05-116-8/+30
* create table options bug:Sergei Golubchik2010-04-301-2/+3
* create table options bug:Sergei Golubchik2010-04-301-0/+2
* small changes to WL#43:Sergei Golubchik2010-04-303-24/+25
* Automerge mariadb 5.1 -> mariadb 5.2unknown2010-05-057-13/+50
|\
| * Fix buffer overflow in COM_FIELD_LIST.Kristian Nielsen2010-04-282-12/+26
| * Fix a bunch of Windows warningsBo Thorsen2010-04-214-0/+21
| * Fix Windows compilebo.thorsen2010-04-091-1/+4
* | don't hide old_password_plugin from embedded, it may be compiled with grant s...Sergei Golubchik2010-04-141-2/+0
* | mergedSergei Golubchik2010-04-081-0/+6
|\ \ | |/
| * Fixed a problem of merge from mysql-5.1 baseline.Igor Babaev2010-04-081-0/+6
* | fixes for buildbot:Sergei Golubchik2010-04-082-4/+6
* | Merge with local treeMichael Widenius2010-04-087-15/+33
|\ \
| * \ Merge with 5.1Michael Widenius2010-04-087-14/+32
| |\ \ | | |/
| | * Removed compiler warningsMichael Widenius2010-04-077-14/+32
| * | Fixed compiler warningMichael Widenius2010-04-081-1/+1
* | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-0829-116/+1182
|/ /
* | more fixes for buildbot failuresSergei Golubchik2010-04-062-14/+19
* | fixes for builbot failures Sergei Golubchik2010-04-061-12/+6
* | keep acl_user->auth_string and acl_user->salt always in syncSergei Golubchik2010-04-061-14/+35
* | Post review fixes.Igor Babaev2010-04-051-1/+1
* | Merge with the latest changes of 5.2.Igor Babaev2010-04-051-20/+42
|\ \
| * | fixed a bug in handling mysql_native_password specified explicitly:Sergei Golubchik2010-04-051-20/+42
* | | Merge with the latest changes of 5.2Igor Babaev2010-04-0327-423/+729
|\ \ \ | |/ /
| * | embedded builds used to refer to undefined functions inside if(0) { }Sergei Golubchik2010-04-021-0/+1
| * | more fixes for windows and status_user.testSergei Golubchik2010-04-021-1/+1
| * | fixes for windows buildsSergei Golubchik2010-04-025-8/+4
| * | Fied problem with of compilation without dynamic plugin loading.unknown2010-04-011-0/+2
| * | Maria WL#61unknown2010-04-018-99/+375
| * | Merge with 5.1Michael Widenius2010-04-0118-316/+347
| |\ \ | | |/
| | * Removed compiler warningMichael Widenius2010-03-306-7/+22
| | * Fixed random failure in test systemMichael Widenius2010-03-292-17/+17
| | * Fixed compiler warnings and sporadic failures in test casesMichael Widenius2010-03-289-282/+284
| | * two crashes in the TC_LOG_MMAP:Sergei Golubchik2010-03-241-2/+10
* | | Post-review fixes.Igor Babaev2010-04-011-14/+15
* | | Merge with the latest changes og 5.2.Igor Babaev2010-03-3124-958/+1816
|\ \ \ | |/ /
| * | Fixed some compiler warningsMichael Widenius2010-03-311-1/+4
| * | pluggable auth with plugin examplesSergei Golubchik2010-03-2924-958/+1813
* | | Merge with the latest changes in the 5.2 tree.Igor Babaev2010-03-2981-891/+2051
|\ \ \ | |/ /
| * | simple speed & space optimization:Michael Widenius2010-03-253-6/+22
| * | fixes for the status_user.test in ps protocolSergei Golubchik2010-03-162-5/+2
| * | Fixed bug #539643.Igor Babaev2010-03-161-3/+1
| * | mergedSergei Golubchik2010-03-1576-795/+1888
| |\ \ | | |/
| | * 1. don't crash on failing to load a plugin with newer MYSQL_PLUGIN_INTERFACE_...Sergei Golubchik2010-03-122-27/+32
| | * Automatic mergeMichael Widenius2010-03-101-2/+5
| | |\
| | | * Fix for: Bug#44987 DELETE IGNORE and FK constraintMichael Widenius2010-03-101-2/+5
| | * | Fix some compiler warnings seen in Buildbot.unknown2010-03-102-4/+9
| | * | Automerge MySQL 5.1.44 merge into latest MariaDB trunk.unknown2010-03-1071-730/+1776
| | |\ \ | | | |/ | | |/|
| | | * Fix a buildbot memory leak due to JOIN::destroy() not being called for EXPLAIN unknown2010-03-091-0/+4
| | | * Automerge MySQL 5.1.44 merge into MariaDB trunk.unknown2010-03-0971-730/+1772
| | | |\