Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge of the fix for bug#16106. | joerg@mysql.com | 2006-01-16 | 1 | -3/+0 |
|\ | |||||
| * | Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1 | joerg@mysql.com | 2006-01-13 | 1 | -3/+0 |
| |\ | |||||
| | * | extra/comp_err.c + scripts/mysqld_multi.sh : | joerg@mysql.com | 2006-01-13 | 1 | -3/+0 |
| * | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 | kent@mysql.com | 2005-12-15 | 1 | -2/+2 |
| |\ \ | |||||
* | \ \ | Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release | kent@mysql.com | 2005-12-14 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 | kent@mysql.com | 2005-12-11 | 1 | -2/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | make_win_src_distribution.sh: | kent@mysql.com | 2005-12-11 | 1 | -2/+2 |
* | | | | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 | jani@a193-229-222-105.elisa-laajakaista.fi | 2005-12-13 | 1 | -0/+4 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Minor Netware specific changes. | jani@a193-229-222-105.elisa-laajakaista.fi | 2005-12-13 | 1 | -0/+4 |
| |/ / | |||||
| * | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 | kent@mysql.com | 2005-11-19 | 1 | -1/+1 |
| |\ \ | |||||
* | \ \ | Merge mysql.com:/home/jimw/my/mysql-5.0-14610 | jimw@mysql.com | 2005-11-30 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Don't try to mysqlhotcopy the INFORMATION_SCHEMA database. (Bug #14610) | jimw@mysql.com | 2005-11-10 | 1 | -0/+1 |
* | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 | kent@mysql.com | 2005-11-19 | 1 | -1/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge | kent@mysql.com | 2005-11-04 | 1 | -1/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 | kent@mysql.com | 2005-11-04 | 1 | -2/+3 |
| | |\ \ \ | |||||
| | | * | | | Makefile.am, configure.in: | kent@mysql.com | 2005-09-24 | 1 | -2/+3 |
* | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-clean | jimw@mysql.com | 2005-11-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-14469 | jimw@mysql.com | 2005-11-10 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Fix harmless typo in mysql_fix_privilege_tables.sql (Bug #14469) | jimw@mysql.com | 2005-10-31 | 1 | -1/+1 |
* | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-clean | jimw@mysql.com | 2005-11-01 | 1 | -8/+11 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Handle decision to use mysqld-max over mysqld within mysqld_safe | jimw@mysql.com | 2005-10-31 | 1 | -8/+11 |
| |/ / / | |||||
* | | | | thread_registry.h, thread_registry.cc: | kent@mysql.com | 2005-10-16 | 1 | -1/+2 |
* | | | | Small fixes for Netware. | jani@a193-229-222-105.elisa-laajakaista.fi | 2005-10-14 | 1 | -2/+1 |
* | | | | Merge abarkov@bk-internal:/home/bk/mysql-5.0 | bar@mysql.com | 2005-10-13 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * \ \ \ | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp | jani@ua141d10.elisa.omakaista.fi | 2005-10-13 | 1 | -0/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Some Netware related fixes and fixes for Metrowerks compiler. | jani@ua141d10.elisa.omakaista.fi | 2005-10-13 | 1 | -2/+1 |
* | | | | | Merge abarkov@bk-internal:/home/bk/mysql-5.0 | bar@mysql.com | 2005-10-13 | 2 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | type_binary.result, type_binary.test: | bar@mysql.com | 2005-10-13 | 2 | -2/+2 |
* | | | | | make_binary_distribution.sh: | kent@mysql.com | 2005-10-12 | 1 | -0/+1 |
* | | | | | Merge mysql.com:/space/my/mysql-4.1-build | lenz@mysql.com | 2005-10-11 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge mysql.com:/space/my/mysql-4.0-build | lenz@mysql.com | 2005-10-11 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | - added Docs/manual.chm to the windows source distribution (BUG#13899) | lenz@mysql.com | 2005-10-11 | 1 | -1/+1 |
* | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 | lars@mysql.com | 2005-10-10 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | make_binary_distribution.sh: | kent@mysql.com | 2005-10-07 | 1 | -1/+4 |
* | | | | Merge | kent@mysql.com | 2005-10-07 | 1 | -136/+124 |
|\ \ \ \ | |/ / / | |||||
| * | | | make_binary_distribution.sh: | kent@mysql.com | 2005-10-07 | 1 | -2/+2 |
| * | | | make_binary_distribution.sh: | kent@mysql.com | 2005-10-06 | 1 | -11/+20 |
| * | | | make_binary_distribution.sh: | kent@mysql.com | 2005-10-06 | 1 | -118/+102 |
| * | | | Many files: | kent@mysql.com | 2005-09-30 | 1 | -6/+10 |
* | | | | Make mysql_fix_privilege_tables.sh not dependent on the current directory. | anozdrin@mysql.com | 2005-10-05 | 1 | -2/+11 |
* | | | | Fix for Bug#12629, "mysqld_multi produces syntax error". | jani@a193-229-222-105.elisa-laajakaista.fi | 2005-09-30 | 1 | -2/+1 |
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | serg@serg.mylan | 2005-09-30 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | mysql.user.password doesn't need utf8 | serg@serg.mylan | 2005-09-27 | 2 | -2/+2 |
* | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 | msvensson@neptunus.(none) | 2005-09-28 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | mysql_config.sh: | kent@mysql.com | 2005-09-28 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 | msvensson@neptunus.(none) | 2005-09-28 | 1 | -5/+8 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | |||||
| * | | Makefile.am: | kent@mysql.com | 2005-09-24 | 1 | -5/+8 |
* | | | make_binary_distribution.sh: | kent@mysql.com | 2005-09-20 | 1 | -1/+2 |
* | | | A few changes to fix compiling on Windows | reggie@linux.site | 2005-09-06 | 1 | -1/+1 |
* | | | Merge mysql.com:/home/jimw/my/mysql-4.1-clean | jimw@mysql.com | 2005-09-02 | 1 | -1/+6 |
|\ \ \ | |/ / |