summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of the fix for bug#16106.joerg@mysql.com2006-01-161-3/+0
|\
| * Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1joerg@mysql.com2006-01-131-3/+0
| |\
| | * extra/comp_err.c + scripts/mysqld_multi.sh :joerg@mysql.com2006-01-131-3/+0
| * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-12-151-2/+2
| |\ \
* | \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releasekent@mysql.com2005-12-141-2/+2
|\ \ \ \
| * \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1kent@mysql.com2005-12-111-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | make_win_src_distribution.sh:kent@mysql.com2005-12-111-2/+2
* | | | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1jani@a193-229-222-105.elisa-laajakaista.fi2005-12-131-0/+4
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Minor Netware specific changes.jani@a193-229-222-105.elisa-laajakaista.fi2005-12-131-0/+4
| |/ /
| * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-11-191-1/+1
| |\ \
* | \ \ Merge mysql.com:/home/jimw/my/mysql-5.0-14610jimw@mysql.com2005-11-301-0/+1
|\ \ \ \
| * | | | Don't try to mysqlhotcopy the INFORMATION_SCHEMA database. (Bug #14610)jimw@mysql.com2005-11-101-0/+1
* | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com2005-11-191-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Mergekent@mysql.com2005-11-041-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-11-041-2/+3
| | |\ \ \
| | | * | | Makefile.am, configure.in:kent@mysql.com2005-09-241-2/+3
* | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-11-101-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge mysql.com:/home/jimw/my/mysql-4.1-14469jimw@mysql.com2005-11-101-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix harmless typo in mysql_fix_privilege_tables.sql (Bug #14469)jimw@mysql.com2005-10-311-1/+1
* | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-11-011-8/+11
|\ \ \ \ \ | |/ / / /
| * | | | Handle decision to use mysqld-max over mysqld within mysqld_safejimw@mysql.com2005-10-311-8/+11
| |/ / /
* | | | thread_registry.h, thread_registry.cc:kent@mysql.com2005-10-161-1/+2
* | | | Small fixes for Netware.jani@a193-229-222-105.elisa-laajakaista.fi2005-10-141-2/+1
* | | | Merge abarkov@bk-internal:/home/bk/mysql-5.0bar@mysql.com2005-10-131-0/+4
|\ \ \ \
| * \ \ \ Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmpjani@ua141d10.elisa.omakaista.fi2005-10-131-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Some Netware related fixes and fixes for Metrowerks compiler.jani@ua141d10.elisa.omakaista.fi2005-10-131-2/+1
* | | | | Merge abarkov@bk-internal:/home/bk/mysql-5.0bar@mysql.com2005-10-132-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | type_binary.result, type_binary.test:bar@mysql.com2005-10-132-2/+2
* | | | | make_binary_distribution.sh:kent@mysql.com2005-10-121-0/+1
* | | | | Merge mysql.com:/space/my/mysql-4.1-buildlenz@mysql.com2005-10-111-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge mysql.com:/space/my/mysql-4.0-buildlenz@mysql.com2005-10-111-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | - added Docs/manual.chm to the windows source distribution (BUG#13899)lenz@mysql.com2005-10-111-1/+1
* | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1lars@mysql.com2005-10-101-0/+1
|\ \ \ \ | |/ / /
| * | | make_binary_distribution.sh:kent@mysql.com2005-10-071-1/+4
* | | | Mergekent@mysql.com2005-10-071-136/+124
|\ \ \ \ | |/ / /
| * | | make_binary_distribution.sh:kent@mysql.com2005-10-071-2/+2
| * | | make_binary_distribution.sh:kent@mysql.com2005-10-061-11/+20
| * | | make_binary_distribution.sh:kent@mysql.com2005-10-061-118/+102
| * | | Many files:kent@mysql.com2005-09-301-6/+10
* | | | Make mysql_fix_privilege_tables.sh not dependent on the current directory.anozdrin@mysql.com2005-10-051-2/+11
* | | | Fix for Bug#12629, "mysqld_multi produces syntax error".jani@a193-229-222-105.elisa-laajakaista.fi2005-09-301-2/+1
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0serg@serg.mylan2005-09-302-2/+2
|\ \ \ \
| * | | | mysql.user.password doesn't need utf8serg@serg.mylan2005-09-272-2/+2
* | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-09-281-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | mysql_config.sh:kent@mysql.com2005-09-281-1/+1
| | |_|/ | |/| |
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-09-281-5/+8
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Makefile.am:kent@mysql.com2005-09-241-5/+8
* | | make_binary_distribution.sh:kent@mysql.com2005-09-201-1/+2
* | | A few changes to fix compiling on Windowsreggie@linux.site2005-09-061-1/+1
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-09-021-1/+6
|\ \ \ | |/ /