Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 1 | -2/+2 |
|\ | |||||
| * | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2009-12-12 | 1 | -2/+2 |
* | | Backport WL#4085: Merge revno:2617.56.29 from 6.0. | Alexander Nozdrin | 2009-10-06 | 1 | -1/+0 |
|/ | |||||
* | Auto-merge up from 5.0 | Timothy Smith | 2009-02-07 | 1 | -1/+1 |
|\ | |||||
| * | Handle renamed nwbootstrap -> nwbuild | Timothy Smith | 2009-02-06 | 1 | -1/+1 |
* | | Merge up from 5.0-build | Timothy Smith | 2009-02-04 | 2 | -196/+86 |
|\ \ | |/ | |||||
| * | The nwbootstrap script depended on BitKeeper, and was fairly complicated. It... | Timothy Smith | 2009-02-04 | 2 | -191/+86 |
* | | Merge from 5.0-bugteam local. | Chad MILLER | 2008-08-18 | 1 | -0/+9 |
|\ \ | |/ | |||||
* | | Merge from 5.0-bugteam local. | Chad MILLER | 2008-08-18 | 4 | -10/+24 |
|\ \ | |/ | |||||
| * | Bug#30129: mysql_install_db appears to run normally, but the databases \ | Chad MILLER | 2008-08-06 | 4 | -10/+24 |
* | | Merge trift2.:/MySQL/M50/merge-5.0 | joerg@trift2. | 2007-12-21 | 2 | -0/+2 |
|\ \ | |/ | |||||
| * | sp_head.cc: | kent/mysqldev@mysql.com/production.mysql.com | 2007-12-14 | 2 | -0/+2 |
* | | Minor Makefile fixes: | joerg@trift2. | 2007-10-30 | 1 | -3/+0 |
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | cmiller@zippy.cornsilk.net | 2007-10-08 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Change URLs. | cmiller@zippy.cornsilk.net | 2007-10-05 | 1 | -1/+1 |
| * | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint | tnurnberg@sin.intern.azundris.com | 2007-09-15 | 2 | -2/+3 |
| |\ | |||||
| * \ | Merge trift2.:/MySQL/M50/netware2-5.0 | joerg@trift2. | 2007-08-24 | 2 | -5/+18 |
| |\ \ | |||||
| * | | | NetWare packages were missing the scripts to initialize the database: add them. | joerg@trift2. | 2007-08-24 | 1 | -1/+1 |
* | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint | tnurnberg@sin.intern.azundris.com | 2007-09-15 | 2 | -2/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge mysql.com:/home/tnurnberg/15327/50-15327 | tnurnberg@sin.intern.azundris.com | 2007-09-15 | 2 | -2/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug #15327: configure: --with-tcp-port option being partially ignored | tnurnberg@mysql.com/sin.intern.azundris.com | 2007-09-13 | 2 | -2/+3 |
* | | | | | Merge trift2.:/MySQL/M51/netware2-5.1 | joerg@trift2. | 2007-08-24 | 1 | -3/+8 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge trift2.:/MySQL/M50/netware2-5.0 | joerg@trift2. | 2007-08-24 | 2 | -6/+18 |
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | Fixes for the NetWare builds, discovered during 5.1.21-beta and backported to... | joerg@trift2. | 2007-08-24 | 2 | -6/+19 |
| | |/ / | |||||
* | | | | Merge trift2.:/MySQL/M51/netware-5.1 | joerg@trift2. | 2007-08-23 | 4 | -37/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge trift2.:/MySQL/M50/netware-5.0 | joerg@trift2. | 2007-08-23 | 4 | -37/+1 |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | |||||
| | * | | Cleanup in the "netware" subdirectory: | joerg@trift2. | 2007-08-22 | 4 | -37/+1 |
| | |/ | |||||
* | | | NetWare fixes: 1) Link options, 2) SQL command files | jbruehe/mysqldev@suse9-x86.mysql.com | 2007-08-20 | 2 | -3/+10 |
|/ / | |||||
* | | Merge trift2.:/MySQL/M50/mysql-5.0 | joerg@trift2. | 2007-05-02 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Format corrections for various "Makefile.am": Leading tab, no trailing blank. | joerg@trift2. | 2007-05-02 | 1 | -3/+3 |
* | | Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 | msvensson@pilot.blaudden | 2007-04-11 | 1 | -1/+5 |
|\ \ | |||||
| * | | Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit | msvensson@pilot.blaudden | 2007-03-27 | 1 | -2/+6 |
* | | | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build | kent@kent-amd64.(none) | 2007-03-20 | 3 | -85/+25 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work | df@pippilotta.erinye.com | 2007-03-20 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | netware/Makefile.am : "libmysql.imp" must survive a "make clean" for the Ne... | joerg@trift2. | 2007-03-19 | 1 | -1/+2 |
| * | | | Bug#20166 mysql-test-run.pl does not test system privilege tables creation | joerg@trift2. | 2007-03-16 | 3 | -85/+24 |
* | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work | df@pippilotta.erinye.com | 2007-03-20 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | |||||
| * | | small build fix | df@pippilotta.erinye.com | 2007-03-20 | 1 | -1/+1 |
| |/ | |||||
* | | Merge mysql.com:/home/kent/bk/main/mysql-5.0 | kent@kent-amd64.(none) | 2006-12-23 | 2 | -4/+2 |
|\ \ | |/ | |||||
| * | Many files: | kent@mysql.com/kent-amd64.(none) | 2006-12-23 | 2 | -4/+2 |
* | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build | kent@kent-amd64.(none) | 2006-12-02 | 2 | -0/+12 |
|\ \ | |||||
| * \ | Merge mysql.com:/home/kent/bk/mysql-5.0-build | kent@kent-amd64.(none) | 2006-12-02 | 2 | -0/+12 |
| |\ \ | | |/ | |||||
| | * | Makefile.am: | kent@mysql.com/kent-amd64.(none) | 2006-12-02 | 2 | -0/+12 |
* | | | myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def: | kent/mysqldev@suse9-x86.mysql.com | 2006-12-02 | 5 | -6/+5 |
|/ / | |||||
* | | Merge mysql.com:/home/kent/bk/mysql-5.0-build | kent@kent-amd64.(none) | 2006-12-01 | 29 | -22/+41 |
|\ \ | |/ | |||||
| * | mysql_upgrade.def Makefile.am: | kent@mysql.com/kent-amd64.(none) | 2006-12-01 | 29 | -21/+40 |
* | | Merge mysql.com:/home/kent/bk/mysql-5.0-build | kent@kent-amd64.(none) | 2006-11-29 | 1 | -15/+14 |
|\ \ | |/ | |||||
| * | netware/BUILD/nwbootstrap : Editing "mwenv" is now obsolete and even plain ... | joerg@trift2. | 2006-11-28 | 1 | -9/+9 |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | cmiller@zippy.cornsilk.net | 2006-11-02 | 6 | -7/+46 |
|\ \ | |||||
| * \ | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint | msvensson@neptunus.(none) | 2006-10-24 | 1 | -0/+7 |
| |\ \ | | |/ |