summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* ha_innodb.cc:heikki@hundin.mysql.fi2005-09-041-3/+5
* ha_innodb.cc:heikki@hundin.mysql.fi2005-09-041-2/+34
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-09-0312-652/+966
|\
| * Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures".konstantin@mysql.com2005-09-0312-652/+966
* | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-09-021-4/+10
|\ \
| * \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-09-021-4/+10
| |\ \
| | * \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-09-021-4/+10
| | |\ \
| | | * | Bug#12363bar@mysql.com2005-08-301-4/+10
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-09-0220-137/+128
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Rename:konstantin@mysql.com2005-09-0220-137/+128
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-09-022-28/+65
|\ \ \ \ \ | |/ / / /
| * | | | Merge mysql.com:/users/lthalmann/bk/mysql-4.1lars@mysql.com2005-09-022-28/+65
| |\ \ \ \ | | |/ / /
| | * | | Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1lars@mysql.com2005-09-022-28/+66
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1lars@mysql.com2005-09-012-28/+66
| | | |\ \
| | | | * | BUG#12542: Added commentslars@mysql.com2005-09-012-1/+22
| | | | * | BUG#12542: All set statements should be executed by slave thdlars@mysql.com2005-08-311-28/+45
* | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-09-025-159/+276
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0bar@mysql.com2005-09-021-2/+2
| |\ \ \ \ \
| | * | | | | sp_head.cc:bar@mysql.com2005-09-021-2/+2
| * | | | | | Fixes after merging fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGESdlenev@mysql.com2005-09-021-20/+23
| * | | | | | Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423dlenev@mysql.com2005-09-014-153/+267
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2005-09-014-171/+268
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in dlenev@mysql.com2005-09-014-171/+268
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-09-011-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-08-301-1/+1
| | | |\ \ \ \
* | | | | | | | postmerge changes bell@sanja.is.com.ua2005-09-023-11/+4
* | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-09-0110-33/+108
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-08-2310-33/+108
| |\ \ \ \ \ \ \
| | * | | | | | | issue correct error message in case of view presence for duplicated table on ...bell@sanja.is.com.ua2005-08-0210-34/+112
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-09-011-3/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2005-09-011-3/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug #11286 yassl incompatible with "load data infile"msvensson@neptunus.(none)2005-09-011-3/+2
* | | | | | | | | | | ndb - fix ha_ndb crash on ordered index on nullable varcharpekka@mysql.com2005-09-011-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-09-012-6/+11
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2005-08-302-6/+11
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug12527/my41-bug12527msvensson@neptunus.(none)2005-08-301-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | Bug #12527 yassl causes errors in "repair" and "optimize"msvensson@neptunus.(none)2005-08-291-1/+1
| | * | | | | | | | | Improve default error message for optimize/repair tablemsvensson@neptunus.(none)2005-08-241-5/+10
* | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-08-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-7156jimw@mysql.com2005-08-311-0/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add test for madvise() being declared in C++ code, because it is notjimw@mysql.com2005-08-311-0/+2
* | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-08-314-8/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-09-011-3/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix bug #12861 client hang with group_concat insubquery FROM DUAL.evgen@moonbone.local2005-08-311-3/+1
| * | | | | | | | | | | | ha_innodb.cc:heikki@hundin.mysql.fi2005-08-311-1/+3
| * | | | | | | | | | | | ha_innodb.cc:heikki@hundin.mysql.fi2005-08-311-0/+15
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-08-302-3/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-12828jimw@mysql.com2005-08-301-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-12757jimw@mysql.com2005-08-301-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Fix crash in DES_DECRYPT(NULL). (Bug #12757)jimw@mysql.com2005-08-251-3/+3