Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 | msvensson@neptunus.(none) | 2006-11-23 | 1 | -2/+10 |
|\ | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint | ||||
| * | support-files/mysql.spec.sh : Make the server report its features in the ↵ | joerg@trift2. | 2006-11-13 | 1 | -2/+8 |
| | | | | | | | | first test run. | ||||
| * | Build the generic RPMs including the "partition" feature. bug#23949 | joerg@trift2. | 2006-11-13 | 1 | -0/+2 |
| | | |||||
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint | msvensson@neptunus.(none) | 2006-11-17 | 1 | -1/+1 |
|\ \ | |/ |/| | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint | ||||
| * | This command is not portable, as POSIX does not require it; use . instead. | hartmut@walhalla.site | 2006-11-16 | 1 | -1/+1 |
| | | | | | | | | (Bug #24294) | ||||
| * | Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194 | kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se | 2006-08-24 | 1 | -0/+3 |
| |\ | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-maint | ||||
* | | | mysql.spec.sh: | kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se | 2006-10-18 | 1 | -6/+7 |
| | | | | | | | | | | | | Aligned test flags to TAR builds | ||||
* | | | mysql.spec.sh: | kent@mysql.com/c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se | 2006-10-12 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | Corrected path to mysql-test directory Removed man1/mysql_explain_log.1 | ||||
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | cmiller@zippy.cornsilk.net | 2006-09-28 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint | ||||
| * | | | Bug#19738 "make install" tries to build files that "make" should already ↵ | msvensson@shellback.(none) | 2006-09-20 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | have built - Move comp_err to EXTRA_PROGRAMS, it will not be installed from 5.1 and up. | ||||
* | | | | mysql.spec.sh: | kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se | 2006-09-24 | 1 | -6/+17 |
|/ / / | | | | | | | | | | | | | | | | | | | Added "test" RPM package Install all binaries "make install" would make_binary_distribution.sh: Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955) | ||||
* | | | Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1 | tnurnberg@salvation.intern.azundris.com | 2006-08-24 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | | | | | into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint | ||||
| * \ \ | Merge mysql.com:/Users/kent/mysql/bk/bug17194/my51-bug17194 | kent@c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se | 2006-08-24 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.1-maint | ||||
| | * \ \ | Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194 | kent@g4-2.local | 2006-08-22 | 1 | -0/+3 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | into mysql.com:/Users/kent/mysql/bk/bug17194/my51-bug17194 | ||||
| | | * | | mysql.spec.sh: | kent@mysql.com/g4-2.local | 2006-08-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Added ndb_error_reporter to the RPM install (bug#20426) | ||||
| | | * | | Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194 | kent@mysql.com/g4-2.local | 2006-08-22 | 1 | -0/+2 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194 | ||||
| | | | * | | mysql.spec.sh: | kent@mysql.com/g4-2.local | 2006-08-22 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Added ndb_size.{pl,tmpl} to the RPM install (bug#20426) | ||||
* | | | | | | Many files: | kent@mysql.com/g4-2.local | 2006-08-21 | 3 | -12/+0 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | Deleted config/ac-macros/ha_berkeley.m4 Removed more referenses to bdb | ||||
* | | | | | Merge zim.(none):/home/brian/mysql/dep-5.1 | brian@zim.(none) | 2006-08-15 | 1 | -37/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | into zim.(none):/home/brian/mysql/remove-bdb-5.1 | ||||
| * | | | | | Remove building, packing, and installing the "max" server from the RPM ↵ | joerg@trift2. | 2006-08-15 | 1 | -37/+7 |
| |/ / / / | | | | | | | | | | | | | | | | "spec" file. | ||||
* | | | | | Fixed warning message breakage. | brian@zim.(none) | 2006-08-13 | 2 | -11/+0 |
|/ / / / | | | | | | | | | | | | | | | | | Fixed install breakage (my own fault) Edited exampled cnf to remove bdb references. | ||||
* | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge | kroki/tomash@moonlight.intranet | 2006-08-09 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | | | | | into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge | ||||
| * | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge | kroki/tomash@moonlight.intranet | 2006-07-29 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge | ||||
| | * \ \ | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 | kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se | 2006-07-28 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1 | ||||
| | | * | | | mysql.spec.sh: | kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se | 2006-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Man page for "mysqld" command move to section 8 (bug#21220) | ||||
* | | | | | | Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot | patg@govinda.patg.net | 2006-08-08 | 1 | -1/+3 |
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2 Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge | ||||
| * | | | | | Merge trift2.:/M41/tmp_merge | joerg@trift2. | 2006-07-24 | 1 | -0/+3 |
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | into trift2.:/M50/merge-4.1-to-5.0 | ||||
| | * | | | | mysql.spec.sh: | kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se | 2006-07-19 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new "mysql_explain_log" man page Added missing install of "myisam_ftdump" man page Added missing install of "mysqlman" man page | ||||
| * | | | | | Merge trift2.:/M41/tmp_merge | joerg@trift2. | 2006-07-24 | 1 | -1/+0 |
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | into trift2.:/M50/merge-4.1-to-5.0 | ||||
| | * | | | mysql.spec.sh: | kent@mysql.com/g4-2.local | 2006-07-15 | 1 | -1/+0 |
| | | |/ | | |/| | | | | | | | | | Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058) | ||||
| | * | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 | joerg@mysql.com | 2006-07-05 | 1 | -1/+5 |
| | |\ \ | | | | | | | | | | | | | | | | into mysql.com:/M41/bug20216-4.1 | ||||
* | | \ \ | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 | ingo/mydev@chilla.local | 2006-07-24 | 1 | -3/+9 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.1-amerge | ||||
| * | | | | support-files/mysql.spec.sh : Fix a typing error. | joerg@trift2. | 2006-07-10 | 1 | -2/+6 |
| | | | | | |||||
| * | | | | When building RPMs, use the Perl script to run the tests, to automatically ↵ | joerg@mysql.com | 2006-07-04 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | check SSL. | ||||
* | | | | | Merge bodhi.local:/opt/local/work/tmp_merge | kostja@bodhi.local | 2006-07-13 | 1 | -0/+17 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0 | ||||
| * | | | | mysql.spec.sh: | kent@mysql.com | 2006-06-30 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable old RPM strip my_global.h: Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694) mysqlmanager.vcproj: Place output files in common release/debug directory | ||||
* | | | | | Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516). | joerg@mysql.com | 2006-06-29 | 1 | -12/+16 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Manual merge for bug#20216. | joerg@mysql.com | 2006-06-27 | 1 | -1/+3 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216), | joerg@mysql.com | 2006-06-27 | 1 | -1/+5 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | manual merge from 4.0. | ||||
| | | * | | Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216). | joerg@mysql.com | 2006-06-27 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | Revert all previous attempts to call "mysql_upgrade" during RPM upgrade. | joerg@mysql.com | 2006-06-27 | 1 | -19/+7 |
| | | | | | | | | | | | | | | | | | | | | This finishes bug#18516, as far as "generic RPMs" are concerned. | ||||
| * | | | | Merge mysql.com:/M50/bug19353-5.0-2 into mysql.com:/M50/bug20216-5.0 | joerg@mysql.com | 2006-06-27 | 1 | -4/+18 |
| |\ \ \ \ | |||||
| | * | | | | Improved fix for bug#18516 (also 19353): | joerg@mysql.com | 2006-06-22 | 1 | -4/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Rename the old shell tool "mysql_upgrade", to avoid a name collision. 2) Improve the spec file, to explicitly use a temporary socket. | ||||
* | | | | | | Manual merge | evgen@moonbone.local | 2006-06-28 | 1 | -0/+13 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql | evgen@moonbone.local | 2006-06-23 | 1 | -0/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | into moonbone.local:/work/tmp_merge-5.0-opt-mysql | ||||
| | * | | | mysql.spec.sh: | kent@mysql.com | 2006-06-23 | 1 | -0/+1 |
| | |/ / | | | | | | | | | | | | | Disable the simplistic auto dependency scan for test/bench (bug#20078) | ||||
| | * | | Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M41/mysql-4.1 | joerg@mysql.com | 2006-06-14 | 1 | -0/+1 |
| | |\ \ | |||||
* | | \ \ | Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1 | joerg@trift2. | 2006-06-22 | 2 | -5/+29 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix for bug#18516 (also #19353, reported for 5.1): | joerg@mysql.com | 2006-06-20 | 2 | -5/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | In addition to include "mysql_upgrade" in a RPM, it should also be called when the RPM is upgraded. | ||||
| * | | | | Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M50/mysql-5.0 | joerg@mysql.com | 2006-06-14 | 1 | -0/+1 |
| |\ \ \ \ |