summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* create.test, create.result, sql_select.cc, item.cc:unknown2005-08-314-7/+7
* Manual mergedunknown2005-08-313-0/+18
|\
| * manual merge of bug fix#12537unknown2005-08-304-3/+23
| |\
| | * Fix bug #12537 UNION produces longtext instead of varcharunknown2005-08-304-3/+22
| * | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-305-1/+3654
| |\ \
| | * \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-295-1/+3654
| | |\ \
* | | \ \ Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-314-1/+9
|\ \ \ \ \
| * | | | | Fixes bug #11815. Convert file path to UNIX format to build correct query unknown2005-08-304-1/+9
* | | | | | Fix group_min_max.test - myisam may return slightly row count estimate on amd64unknown2005-08-312-1/+2
* | | | | | Merge mysql.com:/usr/home/ram/work/4.1.b9613unknown2005-08-316-4/+37
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-303-0/+20
| |\ \ \ \ \
| | * \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-303-0/+20
| | |\ \ \ \ \
| | | * \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-303-0/+20
| | | |\ \ \ \ \
| | | | * | | | | workaround (bug #9613: Some read-only variables are selectable, others are not).unknown2005-08-263-0/+20
| * | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1unknown2005-08-301-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-301-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge eel.(none):/home/jonas/src/mysql-4.1unknown2005-08-301-1/+1
| | | |\ \ \ \ \ \
| * | | \ \ \ \ \ \ 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-2912-24/+206
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-298-6/+85
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-293-4/+15
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | updated ndb redo file reader with schemaversion in commit rcord instead of pr...unknown2005-08-293-4/+15
| * | | | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-272-6/+8
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | configure.in:unknown2005-08-311-2/+2
* | | | | | | | | | | mysql-test-run.pl:unknown2005-08-311-0/+5
* | | | | | | | | | | Makefile.am:unknown2005-08-311-2/+2
* | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-313-0/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix bug #12489 wrongly printed strcmp() function results in creation of brokenunknown2005-08-313-0/+16
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-314-65/+473
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Implement WL#2789 "Instance Manager: test using mysql-test-run testing framew...unknown2005-08-294-65/+473
* | | | | | | | | | | | | 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-303-39/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix for bad merge. unknown2005-08-303-39/+33
* | | | | | | | | | | | | 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-305-1/+3682
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-295-1/+3682
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Update for delete_all_rows() which will be used for TRUNCATE and DELETE support.unknown2005-08-295-1/+3682
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | / / | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Added support for delete_all_rows() for archive. This fixes bug #12836. unknown2005-08-295-1/+3654
| | | | |_|/ / / / / / / | | | |/| | | | | | | |
* | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-3013-28/+247
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-5.0unknown2005-08-3013-28/+247
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-5.0unknown2005-08-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-5.0unknown2005-08-3013-28/+247
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
View Lorry Controller Status