summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releasekent@mysql.com2005-12-141-2/+2
|\ | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0
| * Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1kent@mysql.com2005-12-111-2/+2
| |\ | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
| | * make_win_src_distribution.sh:kent@mysql.com2005-12-111-2/+2
| | | | | | | | | | | | Removed Visual Studio 6 project files, as they are not maintained
* | | 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
|\ \ \ | |/ / |/| | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
| * | 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
| |\ | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
* | \ Merge mysql.com:/home/jimw/my/mysql-5.0-14610jimw@mysql.com2005-11-301-0/+1
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | 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
|\ \ \ \ | |/ / / |/| | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
| * | | Mergekent@mysql.com2005-11-041-1/+2
| |\ \ \ | | |/ /
| | * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-11-041-2/+3
| | |\ \ | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
| | | * | Makefile.am, configure.in:kent@mysql.com2005-09-241-2/+3
| | | | | | | | | | | | | | | | | | | | Enable "make distcheck" to work
* | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-11-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | Merge mysql.com:/home/jimw/my/mysql-4.1-14469jimw@mysql.com2005-11-101-1/+1
| |\ \ \ | | |/ / | |/| | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * | 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
|\ \ \ \ | |/ / / | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | Handle decision to use mysqld-max over mysqld within mysqld_safejimw@mysql.com2005-10-311-8/+11
| |/ / | | | | | | | | | even when --ledir option is specified. (Bug #13774)
* | | thread_registry.h, thread_registry.cc:kent@mysql.com2005-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit Thread_info::Thread_info() and move both initializers out of class definition, to solve link problem on QNX Makefile.am: Preserve executable mode on scripts make_binary_distribution.sh: Copy *.imtest files
* | | 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
|\ \ \ | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0.b9278
| * \ \ Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmpjani@ua141d10.elisa.omakaista.fi2005-10-131-0/+4
| |\ \ \ | | |/ / | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
| | * | 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
|\ \ \ \ | |/ / / |/| | | | | | | into mysql.com:/usr/home/bar/mysql-5.0.b9278
| * | | type_binary.result, type_binary.test:bar@mysql.com2005-10-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new file mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh: Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding. Many files: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. Adding true BINARY/VARBINARY: new pad_char structure member. ctype-bin.c: Adding true BINARY/VARBINARY: new pad_char structure member. New strnxfrm, with two trailing length bytes. field.cc: Adding true BINARY/VARBINARY.
* | | | make_binary_distribution.sh:kent@mysql.com2005-10-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Copy *.cnf files in mysql-test/std_data/ Makefile.am: Added std_data/*.cnf to copy ndb config
* | | | Merge mysql.com:/space/my/mysql-4.1-buildlenz@mysql.com2005-10-111-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / into mysql.com:/space/my/mysql-5.0-build
| * | Merge mysql.com:/space/my/mysql-4.0-buildlenz@mysql.com2005-10-111-1/+1
| |\ \ | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| | * | - 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
|\ \ \ \ | |/ / / | | | | | | | | into mysql.com:/users/lthalmann/bk/mysql-5.0
| * | | make_binary_distribution.sh:kent@mysql.com2005-10-071-1/+4
| | | | | | | | | | | | | | | | | | | | Copy zlib.a and valgrind.supp if exists Copy disabled.def
* | | | Mergekent@mysql.com2005-10-071-136/+124
|\ \ \ \ | |/ / /
| * | | make_binary_distribution.sh:kent@mysql.com2005-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Corrected platform name output Services.cpp: Dont print null address (back port from 5.0)
| * | | make_binary_distribution.sh:kent@mysql.com2005-10-061-11/+20
| | | | | | | | | | | | | | | | | | | | Reintroduced --machine Better sh compatibility, "for i ; do" is not portable
| * | | make_binary_distribution.sh:kent@mysql.com2005-10-061-118/+102
| | | | | | | | | | | | | | | | | | | | Replaced --machine with --platform General code cleanup
| * | | Many files:kent@mysql.com2005-09-301-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New VC7 project files des_key_file.cc: Visual C++ wants '"' for local include mysql.cc: Cast my_cgets() argument for VC6 and VC7 dummy.cpp: Added to convince VS .Net generate a lib for mysqlserver
* | | | 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
| | | | | | | | | | | | | | | | | | | | Quote here is unneccessary as it should all be handled in quote_opt_arg().
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0serg@serg.mylan2005-09-302-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| * | | | 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
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | | | mysql_config.sh:kent@mysql.com2005-09-281-1/+1
| | |_|/ | |/| | | | | | | | | | Added -lz to link using libmysqld
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-09-281-5/+8
|\ \ \ \ | |/ / / | | / / | |/ / |/| | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | Makefile.am:kent@mysql.com2005-09-241-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Revert to shell test script for test targets mysqltest.c: Windows pclose() returns error code in low byte mysql_config.sh: Remove -Xa -xstrconst from --cflags for Sun C++
* | | make_binary_distribution.sh:kent@mysql.com2005-09-201-1/+2
| | | | | | | | | | | | Include libz.a in distribution if built bundled
* | | 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
|\ \ \ | |/ / | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | Merge mysql.com:/home/jimw/my/mysql-4.1-11280jimw@mysql.com2005-09-021-0/+1
| |\ \ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * \ Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M41/merge-4.1joerg@mysql.com2005-09-011-0/+1
| | |\ \ | | | |/
| * | | Fix quoting of options passed to external commands by mysqld_multi. (Bug #11280)jimw@mysql.com2005-08-311-3/+10
| |/ /
* | | Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M50/merge-5.0joerg@mysql.com2005-09-011-0/+1
|\ \ \ | | |/ | |/|