summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):unknown2005-08-065-5/+40
* Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2005-08-049-16/+67
|\
| * mysql-test-run.pl:unknown2005-08-041-2/+33
| * Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-041-3/+7
| |\
| | * mysqld.dsp:unknown2005-08-041-3/+7
| * | Merge mysql.com:/space/my/mysql-4.1unknown2005-08-041-2/+8
| |\ \ | | |/ | |/|
| | * - manual merge from 4.0 into 4.1: used the local version of ha_innodb.cc, mer...unknown2005-08-041-1/+3
| | |\
| | | * - Fixed the creation of the mysql user group account in the postinstall secti...unknown2005-08-041-1/+6
| | * | - fixed enabling the Archive storage engine for the mysqld-max RPM binaryunknown2005-08-041-1/+5
| * | | BUG#12330 Adding updated result file which I missed in last changeset.unknown2005-08-031-5/+5
| * | | Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1unknown2005-08-031-0/+1
| |\ \ \
| | * | | BUG#12330 Add --replace_column in order to make test deterministic.unknown2005-08-031-0/+1
| * | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-030-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Manual merge: Current 4.1.14 has precedence over 4.1.10bunknown2005-08-030-0/+0
| | |\ \ \
| | | * | | Security fix in "zlib":unknown2005-07-2931-173/+300
| | | * | | Increase version number (prepare for new build including security fixes in "z...unknown2005-07-292-2/+2
| * | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-031-0/+9
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Merge hundin.mysql.fi:/home/heikki/mysql-4.0unknown2005-08-030-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | ha_innodb.cc:unknown2005-08-031-1/+1
| | * | | buf0buf.c:unknown2005-08-031-0/+9
| | * | | Merge hundin.mysql.fi:/home/heikki/mysql-4.0unknown2005-08-030-0/+0
| | |\ \ \ | | | |/ /
| | | * | ha_innodb.cc:unknown2005-08-031-1/+2
| * | | | Portability fixes:unknown2005-08-033-4/+4
| |/ / /
* | | | Merge deer.(none):/home/hf/work/mysql-4.1.cleanunknown2005-08-044-138/+164
|\ \ \ \
| * | | | Fix for bug #9508 (query_cache test fails)unknown2005-07-294-138/+164
* | | | | Merge deer.(none):/home/hf/work/mysql-4.1.cleanunknown2005-08-04371-92/+1089
|\ \ \ \ \
| * | | | | Fix for bug #12177 (errorlog file isn't closed)unknown2005-08-043-1/+10
| * | | | | mergingunknown2005-08-040-0/+0
| |\ \ \ \ \
| | * | | | | Additional fix for #12177 (stderr isn't closed)unknown2005-07-281-3/+3
| | * | | | | addition to the fix for bug #12177(error log file isn't closed)unknown2005-07-271-0/+3
| | * | | | | Fix for bug #12177 (error file isn't closed)unknown2005-07-271-2/+5
| * | | | | | mergingunknown2005-08-040-0/+0
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0unknown2005-08-033-6/+27
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Fix for bug #10226 (mysql_get_client_version not implemented)unknown2005-07-281-0/+4
| | | |/ / / | | |/| | |
| * | | | | item_sum.cc:unknown2005-08-021-3/+10
| * | | | | sql_select.cc, sql_class.h:unknown2005-08-022-5/+2
| * | | | | Merge mysql.com:/space/my/mysql-4.1unknown2005-08-021-2/+5
| |\ \ \ \ \
| | * | | | | - Fixed the Requires: tag for the server RPM (BUG#12233), make sure to list allunknown2005-08-021-2/+5
| * | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-023-6/+20
| |\ \ \ \ \ \
| | * | | | | | Fix for BUG#12075.unknown2005-08-023-6/+20
| * | | | | | | After merge fix.unknown2005-08-021-1/+1
| * | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.0unknown2005-08-023-6/+27
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | BUG#11684 fix.unknown2005-08-023-6/+27
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-9947unknown2005-08-011-12/+10
| |\ \ \ \ \ \
| | * | | | | | Fix max_connections_per_hour handling when the globalunknown2005-06-271-12/+10
| * | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-11402unknown2005-08-013-3/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Fix multiplication of abs() by a negative value. (Bug #11402)unknown2005-06-223-3/+8
| * | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-10724unknown2005-08-017-32/+67
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Don't force column header to @@session.var_name if @@local.var_nameunknown2005-07-257-32/+67
| * | | | | | | | | Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-013-1/+85
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |