summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge eherman@bk-internal.mysql.com:/home/bk/mysql-4.1eric@mysql.com2005-09-062-21/+19
|\
| * Backport of JimW's localhost patch to 4.1 tree.eric@mysql.com2005-09-022-21/+19
* | postmerge fixbell@sanja.is.com.ua2005-09-061-0/+1
* | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2005-09-063-36/+85
|\ \
| * \ Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.0bell@sanja.is.com.ua2005-09-063-36/+85
| |\ \
| | * | support of concurent query cache resizing (BUG#12848)bell@sanja.is.com.ua2005-09-064-36/+86
| | * | set_var.cc:paul@kite-hub.kitebird.com2005-08-291-2/+2
| | * | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0paul@frost.snake.net2005-08-272-41/+41
| | |\ \
| | | * | mysqld.cc:paul@frost.snake.net2005-08-271-26/+26
| | | * | set_var.cc:paul@frost.snake.net2005-08-271-15/+15
* | | | | Bug #6172 RAND(a) should only accept constant values as arguments(2nd version)gluh@eagle.intranet.mysql.r18.ru2005-09-061-0/+5
|/ / / /
* | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-09-0510-207/+365
|\ \ \ \ | | |_|/ | |/| |
| * | | 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 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 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
| | |\ \ \ \ \ \
| | | * | | | | | Bug #12527 yassl causes errors in "repair" and "optimize"msvensson@neptunus.(none)2005-08-291-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 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
| |/ / / / / / / / /
* | | | | | | | | | mysqld.cc, mysql_priv.h, sql_parse.cc:bar@mysql.com2005-09-053-8/+9
* | | | | | | | | | bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC ...bar@mysql.com2005-08-312-1/+10
|/ / / / / / / / /
* | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-08-302-3/+7
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ manual merge of bug fix#12537evgen@moonbone.local2005-08-302-3/+7
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Fix bug #12537 UNION produces longtext instead of varcharevgen@moonbone.local2005-08-302-3/+6
* | | | | | | | | | 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
* | | | | | | | | | | Fix incorrect spellings of "dropped" in source and tests. (Bug #12828)jimw@mysql.com2005-08-301-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@zim.(none)2005-08-303-0/+14
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@zim.(none)2005-08-293-0/+14
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Added support for delete_all_rows() for archive. This fixes bug #12836. brian@zim.(none)2005-08-293-0/+14
* | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2005-08-301-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2005-08-301-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | workaround (bug #9613: Some read-only variables are selectable, others are not).ramil@mysql.com2005-08-261-0/+10
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-08-301-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | ha_blackhole.cc:pgalbraith@mysql.com2005-08-301-0/+1
| * | | | | | | | | | | ha_blackhole.cc:pgalbraith@mysql.com2005-08-291-0/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-08-293-15/+42
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Bug#12296 - CHECKSUM TABLE reports 0 for the tableingo@mysql.com2005-08-291-1/+8