summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* create.test, create.result, sql_select.cc, item.cc:unknown2005-08-312-2/+4
* Manual mergedunknown2005-08-311-0/+2
|\
| * manual merge of bug fix#12537unknown2005-08-302-3/+7
| |\
| | * Fix bug #12537 UNION produces longtext instead of varcharunknown2005-08-302-3/+6
| * | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-303-0/+14
| |\ \
| | * \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-293-0/+14
| | |\ \
* | | \ \ Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-311-1/+2
|\ \ \ \ \
| * | | | | Fixes bug #11815. Convert file path to UNIX format to build correct query unknown2005-08-301-1/+2
* | | | | | Merge mysql.com:/usr/home/ram/work/4.1.b9613unknown2005-08-311-0/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-301-0/+10
| |\ \ \ \ \
| | * \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-301-0/+10
| | |\ \ \ \ \
| | | * | | | | workaround (bug #9613: Some read-only variables are selectable, others are not).unknown2005-08-261-0/+10
| * | | | | | | Merge mysql.com:/home/mydev/mysql-4.1unknown2005-08-301-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | ha_blackhole.cc:unknown2005-08-301-0/+1
| | * | | | | | ha_blackhole.cc:unknown2005-08-291-0/+1
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge mysql.com:/home/mydev/mysql-4.1unknown2005-08-293-15/+42
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-292-0/+27
| |\ \ \ \ \ \
| | * | | | | | ctype_utf8.result, ctype_utf8.test, item.cc:unknown2005-08-291-1/+7
| | * | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-292-0/+21
| | |\ \ \ \ \ \
| | | * | | | | | Bug#12371 executing prepared statement fails (illegal mix of collations)unknown2005-08-062-0/+21
| * | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-272-6/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-311-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix bug #12489 wrongly printed strcmp() function results in creation of brokenunknown2005-08-311-0/+1
* | | | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-303-16/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | ha_innodb.cc:unknown2005-08-301-4/+4
| * | | | | | | | | mysqld.cc:unknown2005-08-301-6/+6
| * | | | | | | | | set_var.cc:unknown2005-08-301-6/+6
* | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-301-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix for bad merge. unknown2005-08-301-1/+1
* | | | | | | | | | Manual merge.unknown2005-08-301-579/+947
* | | | | | | | | | Merge kite-hub.kitebird.com:/tmp/merge-4.1unknown2005-08-302-949/+583
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | set_var.cc:unknown2005-08-271-2/+4
| * | | | | | | | mysqld.cc:unknown2005-08-271-4/+4
* | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-303-0/+14
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-293-0/+14
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Update for delete_all_rows() which will be used for TRUNCATE and DELETE support.unknown2005-08-293-0/+14
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | / / | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | Added support for delete_all_rows() for archive. This fixes bug #12836. unknown2005-08-293-0/+14
| | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-304-18/+64
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-5.0unknown2005-08-304-18/+64
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-5.0unknown2005-08-304-18/+64
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0unknown2005-08-294-18/+64
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | After merge fix.unknown2005-08-291-1/+1
| | | | * | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1-4100unknown2005-08-293-16/+43
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / | | | | | |/| | | | | |
| | | | | * | | | | | | Bug#12296 - CHECKSUM TABLE reports 0 for the tableunknown2005-08-291-1/+8
| | | | | * | | | | | | Bug#11816 - Truncate table doesn't work with temporary innodb tablesunknown2005-08-291-13/+16
| | | | | * | | | | | | Bug#11493 - Alter table rename to default database does not work without db n...unknown2005-08-291-1/+18
| | | | | | |/ / / / / | | | | | |/| | | | |
| | | | | * | | | | | typo to DBUG_RETURN fixedunknown2005-08-261-1/+1
| | | | | | |_|_|/ / | | | | | |/| | | |
| | | | * | | | | | Bug#10056 - PACK_KEYS option take values greater than 1 while creating tableunknown2005-08-291-2/+21
* | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-301-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix for BUG#12720: In QUICK_RANGE_SELECT::reset(), reset in_range so next get...unknown2005-08-301-0/+1