summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Expand)AuthorAgeFilesLines
* Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYunknown2005-01-031-0/+1
|\
| * set_var.cc:unknown2005-01-021-0/+1
| * Merged bugfixunknown2004-12-301-0/+1
| |\
* | \ Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browserunknown2005-01-031-0/+1
|\ \ \ | | |/ | |/|
| * | Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browserunknown2004-12-301-0/+1
* | | manually mergedunknown2004-12-311-0/+11
|\ \ \ | | |/ | |/|
| * | BitKeeper/triggers/pre-deltaunknown2004-12-221-0/+11
* | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-311-0/+1
|\ \ \
| * \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2004-12-311-0/+1
| |\ \ \
| | * | | logging_ok:unknown2004-12-241-0/+1
* | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-311-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge with global treeunknown2004-12-311-0/+4
| |\ \ \ \
| | * \ \ \ Merge with 4.1unknown2004-12-221-0/+4
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | fill_help_tables.sh:unknown2004-12-181-0/+1
| | | * | my-innodb-heavy-4G.cnf.sh:unknown2004-12-171-0/+1
| | | * | mergeunknown2004-12-171-0/+5
| | | |\ \
| | | | * | Add (optional) endian parameter to 'get nodeid' to warn on endian conflicts.unknown2004-12-061-0/+1
| | | * | | Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2004-12-061-0/+1
| | | |\ \ \
| | | * \ \ \ Merge mysql.com:/home/jonas/src/mysql-4.1unknown2004-11-151-0/+1
| | | |\ \ \ \
| | | * | | | | Merge joreland@bk-internal.mysql.com:wl1744 into w2k.:C:/mysql-4.1unknown2004-11-101-0/+1
| * | | | | | | Merge from 4.1: fix for bug #7285 (embedded server)unknown2004-12-301-0/+1
| |/ / / / / /
* | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-181-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Forward port of HugeTLB, InnoDB doublewrite and checksums patches to 5.0unknown2004-12-141-0/+1
* | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-161-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | WL#1051, more maintanable error messages.unknown2004-12-131-0/+1
* | | | | | | Remove dead codeunknown2004-12-081-0/+1
* | | | | | | Merge mysql.com:/home/jonas/src/mysql-5.0unknown2004-12-071-0/+34
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | ndb: testing "bk gone" with ndb/tools/old_dirs/ndbnetunknown2004-12-061-0/+34
* | | | | | | Merge with 4.1unknown2004-12-061-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Mergeunknown2004-12-031-0/+1
| |\ \ \ \ \
| | * | | | | Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when theunknown2004-12-031-0/+1
| | * | | | | Merge mysql.com:/home/timka/mysql/src/4.0-virginunknown2004-11-251-0/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge for BUG#3759 which was missing from the main tree for some reason.unknown2004-11-251-0/+8
| | |\ \ \ \ \ \
| | * | | | | | | Fix for Bug#3759unknown2004-08-301-0/+1
| * | | | | | | | openssl_1.result, have_openssl_1.require, openssl_1.test:unknown2004-12-011-0/+1
* | | | | | | | | configure.in:unknown2004-12-021-0/+1
* | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-261-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Mergeunknown2004-11-251-0/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge mysql.com:/space/bkroot/mysql-4.0unknown2004-11-251-0/+1
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Added --disable-log-bin option to the mysqlbinlog (WL1787)unknown2004-11-191-0/+1
| | |_|_|_|/ / | |/| | | | |
| * | | | | | correct name of function in synopsisunknown2004-11-181-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Needed for WL# 2094, MySQL Federated Storage Handlerunknown2004-11-121-0/+1
* | | | | | Merge with 4.1unknown2004-11-121-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge with 4.0unknown2004-11-121-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Changed default.c so that it now checks for my.ini and thenunknown2004-11-051-0/+1
| | * | | Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROCunknown2004-11-021-0/+1
| | * | | Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-10-171-0/+1
| | |\ \ \
| | | * | | mysqld.cc:unknown2004-10-031-0/+1
| | * | | | Fixed Bug#5575, mysqlhotcopy is broken when using --noindicesunknown2004-10-071-0/+1
| | |/ / /
* | | | | Merge with 4.1 to get in latest bug fixesunknown2004-11-041-0/+2
|\ \ \ \ \ | |/ / / /