summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Merge tsmith.mysql.internal:m/bk/maint/b4858/51tsmith@quadxeon.mysql.com2007-05-311-102/+153
|\
| * Bug #4858: mysql_safe logs to syslog instead of stderrtsmith@siva.hindu.god2007-05-041-102/+153
* | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-05-301-32/+40
|\ \
| * \ Merge trift2.:/MySQL/M50/bug26609-5.0joerg@trift2.2007-05-221-32/+40
| |\ \
| | * | scripts/make_binary_distribution.sh :joerg@trift2.2007-05-221-32/+40
* | | | Merge pilot.blaudden:/home/msvensson/mysql/bug28521/my51-bug28521msvensson@pilot.blaudden2007-05-241-18/+18
|\ \ \ \ | |/ / /
| * | | After-merge fix in "scripts/make_win_bin_dist":joerg@trift2.2007-05-161-2/+2
| * | | Manual merge.joerg@trift2.2007-05-161-16/+16
| |\ \ \
| | * | | Fix bug#27833 "Bourne shell string comparison issue in scripts/make_win_bin_d...joerg@trift2.2007-05-151-17/+17
| | |/ /
* | | | Bug#28521 Upgrade from 5.1.17 to 5.1.18 breaks eventsmsvensson@pilot.blaudden2007-05-191-1/+1
|/ / /
* | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-05-041-2/+2
|\ \ \
| * | | mysql-test/mysql-test-run.pl: another mysqld --help fixserg@sergbook.mysql.com2007-04-301-2/+2
* | | | Merge trift2.:/MySQL/M50/netware-cross-5.0joerg@trift2.2007-05-031-6/+6
|\ \ \ \ | | |/ / | |/| |
| * | | Better distinction between "CLEANFILES" and "DISTCLEANFILES" for some generat...joerg@trift2.2007-05-031-8/+6
| * | | Resolve a possible timing issue with "scripts/mysql_fix_privilege_tables_sql....joerg@trift2.2007-05-021-0/+2
| * | | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2007-05-021-1/+3
| |\ \ \
* | \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-05-021-1/+3
|\ \ \ \ \
| * \ \ \ \ Merge trift2.:/MySQL/M50/netware-cross-5.0joerg@trift2.2007-04-301-1/+3
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | |
| | * | | Necessary change for cross-builds: Include "mysql_fix_privilege_tables_sql.c...joerg@trift2.2007-04-301-1/+3
* | | | | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2007-05-021-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | Format corrections for various "Makefile.am": Leading tab, no trailing blank.joerg@trift2.2007-05-021-1/+1
* | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50tsmith@quadxeon.mysql.com2007-04-281-193/+127
|\ \ \ \ | |/ / /
| * | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50tsmith@quadxeon.mysql.com2007-04-281-185/+127
| |\ \ \
| | * | | Bug #27390: mysqld_multi --config-file= not working as documentedtsmith@quadxeon.mysql.com2007-04-281-185/+127
* | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50tsmith@quadxeon.mysql.com2007-04-271-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | mysql_install_db.sh: Fix algorithm for finding pkgdata directorytsmith@quadxeon.mysql.com2007-04-271-0/+1
| |/ / /
* | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27390/50tsmith@quadxeon.mysql.com2007-04-261-1/+4
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | mysql_install_db.sh:tsmith@quadxeon.mysql.com2007-04-251-1/+4
| |/
| * Don't copy any subdirs in scripts/msvensson@pilot.blaudden2007-04-231-1/+1
* | Merge alf.:D:/src/mysql-5.1-maintiggy@alf.2007-04-241-2/+12
|\ \
| * | Minor fixes.iggy@alf.2007-04-241-2/+12
* | | Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrademsvensson@pilot.blaudden2007-04-2411-1032/+283
|\ \ \ | |/ /
| * | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-233-23/+25
| |\ \ | | |/
| | * Add "name of struct" as first arg to comp_sqlmsvensson@pilot.blaudden2007-04-233-23/+25
| | * Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-233-1/+175
| | |\
| | * \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-04-163-18/+20
| | |\ \
| | * \ \ Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2007-04-071-1/+7
| | |\ \ \
| * | | | | Don't copy subidrs of scripts/msvensson@pilot.blaudden2007-04-201-1/+1
| * | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-191-0/+9
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | mysql_upgrade portability fixesmsvensson@pilot.blaudden2007-04-191-0/+9
| * | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-192-5/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | mysql_upgrade win fixesmsvensson@pilot.blaudden2007-04-192-5/+8
| * | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-181-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add CMakeLists.txt to EXTRA_DISTmsvensson@pilot.blaudden2007-04-181-1/+2
| * | | | | Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@pilot.blaudden2007-04-185-48/+170
| |\ \ \ \ \
| | * | | | | Update mysql_upgrade tests for 5.1msvensson@pilot.blaudden2007-04-182-48/+9
| | * | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-183-0/+161
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrademsvensson@pilot.blaudden2007-04-183-0/+161
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Bug#25452 mysql_upgrade access deniedmsvensson@pilot.blaudden2007-04-183-0/+161
| * | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-usertomas@whalegate.ndb.mysql.com2007-04-163-18/+20
| |\ \ \ \ \ \ | | |/ / / / /