summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Cleanups during review of new codemonty@mysql.com2005-08-116-134/+187
* Fixed test that failed on 32 bit systemsmonty@mysql.com2005-08-091-9/+6
* ha_innodb.cc:heikki@hundin.mysql.fi2005-08-081-1/+1
* Merge mysql.com:/home/jimw/my/mysql-5.0-6080jimw@mysql.com2005-08-082-2/+7
|\
| * Fix error message when creating a non-string field with a displayjimw@mysql.com2005-08-052-2/+7
* | Merge mysql.com:/home/jimw/my/mysql-5.0-3094jimw@mysql.com2005-08-0814-30/+101
|\ \
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-08-083-2/+7
| |\ \
| | * | A fix and a test case for Bug#11909 "mysql_stmt_attr_set konstantin@mysql.com2005-08-083-2/+7
| * | | Merge mysql.com:/usr/home/bar/mysql-4.1.b10892bar@mysql.com2005-08-081-4/+8
| |\ \ \
| | * \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-08-081-4/+8
| | |\ \ \
| | | * | | item.cc:bar@mysql.com2005-08-081-4/+6
| | | * | | grant.result, grant.test:bar@mysql.com2005-08-041-4/+6
| | * | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1igor@rurik.mysql.com2005-08-071-4/+9
| | |\ \ \ \
| * | \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-08-081-6/+7
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix for BUG#12082 (assert failure when the query fails to get a lock for reco...sergefp@mysql.com2005-07-311-6/+7
| * | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0igor@rurik.mysql.com2005-08-071-5/+10
| |\ \ \ \ \ \
| | * \ \ \ \ \ Manual mergeigor@rurik.mysql.com2005-08-071-5/+10
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | subselect.result:igor@rurik.mysql.com2005-08-071-4/+9
| * | | | | | | Merge mysql.com:/home/mydev/mysql-4.1-4100ingo@mysql.com2005-08-081-0/+17
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-08-071-3/+2
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-08-073-5/+19
| | |\ \ \ \ \ \
| | * | | | | | | Bug#9459 - deadlock with flush with lock, and lock table writeingo@mysql.com2005-08-051-0/+17
| * | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2005-08-087-13/+38
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-08-077-13/+38
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Manual mergesergefp@mysql.com2005-08-072-3/+8
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | BUG#11869: part2: post-review fixes:sergefp@mysql.com2005-08-071-3/+2
| | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-08-073-5/+19
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-08-051-0/+6
| | | | |\ \ \ \ \
| | | | | * | | | | Fix bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reducedevgen@moonbone.local2005-08-041-0/+6
| | | | | | |_|/ / | | | | | |/| | |
| | | * | | | | | BUG#11869:part 2: post-review fixes: merging into 5.0sergefp@mysql.com2005-08-076-14/+21
| | | * | | | | | Manual mergesergefp@mysql.com2005-08-073-5/+18
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):sergefp@mysql.com2005-08-063-5/+19
| | | | |/ / / /
| * | | | | | | Bug#10473 - Can't set 'key_buffer_size' system variable to ZEROingo@mysql.com2005-08-072-0/+8
| |/ / / / / /
| * | | | | | mysql_priv.h:igor@rurik.mysql.com2005-08-051-0/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Always report row type of 'Fixed' for MEMORY tables. (Bug #3094)jimw@mysql.com2005-08-051-0/+2
|/ / / / /
* | | | | Fix for bug #12281 (Geometry: crash in trigger)hf@deer.(none)2005-08-051-0/+1
* | | | | fix for bug #12315 - SHOW TABLE STATUS FROM `information_schema`; does not so...andrey@lmy004.2005-08-052-27/+42
* | | | | Manual merge of #11335 bugfixevgen@moonbone.local2005-08-053-2/+46
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix bug #11335 View redefines TinyInt(1) column definitionevgen@moonbone.local2005-07-303-2/+46
* | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0hf@deer.(none)2005-08-042-1/+3
|\ \ \ \ \
| * \ \ \ \ Merginghf@deer.(none)2005-08-042-1/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix for bug #12177 (errorlog file isn't closed)hf@deer.(none)2005-08-042-1/+3
| | | |/ / | | |/| |
* | | | | Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0georg@lmy002.wdf.sap.corp2005-08-0416-84/+267
|\ \ \ \ \
| * | | | | ha_innodb.cc:heikki@hundin.mysql.fi2005-08-031-1/+1
| * | | | | Many files:heikki@hundin.mysql.fi2005-08-032-25/+50
| |/ / / /
| * | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-08-031-1/+1
| |\ \ \ \
| | * | | | Fix bug #11934 Two sequential FLUSH TABLES WITH READ LOCK hangs clientevgen@moonbone.local2005-08-031-1/+1
| * | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-08-0313-58/+216
| |\ \ \ \ \
| | * | | | | Fixed commentsergefp@mysql.com2005-08-031-2/+2
| | * | | | | Manual mergesergefp@mysql.com2005-08-0313-58/+216
| | |\ \ \ \ \