jimw@mysql.com
441f863f52
Merge mysql.com:/home/jimw/my/mysql-5.0-8902
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-11 12:46:11 -08:00
jimw@mysql.com
eaea82d3af
Merge query_cache tests
2005-03-11 12:38:38 -08:00
jimw@mysql.com
d114066174
Merge mysql.com:/home/jimw/my/mysql-4.1-8513
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-11 11:08:04 -08:00
joerg@mysql.com
f610930224
Correct "make_win_src_distribution" to not introduce additional directory layers,
...
adapt the Windows build files accordingly.
2005-03-10 21:13:46 +01:00
lars@mysql.com
20318574d4
Merge
2005-03-09 21:41:09 +01:00
kent@mysql.com
3ce3295e3f
mysqldumpslow.sh:
...
bug#4914 added --help and usage information
2005-03-09 15:00:40 +01:00
serg@serg.mylan
956682de1a
merged
2005-03-09 14:09:06 +01:00
jimw@mysql.com
2b2efa4208
Add all SQL_MODE settings to proc table. (Bug #8902 )
2005-03-08 17:40:43 -08:00
kent@mysql.com
c6002966be
mysql-test-run.pl:
...
Removed -c from /bin/sh call
make_win_src_distribution.sh:
Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
2005-03-09 01:34:22 +01:00
jimw@mysql.com
f7c01cfb76
Merged from 4.1
2005-03-03 15:01:46 -08:00
jimw@mysql.com
fe065fe78c
Merge mysql.com:/home/jimw/my/mysql-4.1-8136
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-03 10:47:49 -08:00
jimw@mysql.com
bb9d7bfc79
Create directory for UNIX socket in mysqld_safe if it doesn't already exist.
...
(Bug #8513 )
2005-03-02 12:19:44 -08:00
jani@ua141d10.elisa.omakaista.fi
6e9b26e8b7
Fixed a compatibility problem.
...
1) If my.cnf is found in datadir and basedir, give a warning and use the
one in basedir.
2) If my.cnf is found in datadir, use it, but give a warning.
3) No warning if my.cnf is in basedir.
2005-02-23 18:59:54 +02:00
tulin@mysql.com
9171ff17ca
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-21 10:54:23 +01:00
mysqldev@mysql.com
94fb790b18
Merge mysql.com:/home/mysqldev/tulin/mysql-4.1
...
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 10:53:01 +01:00
tulin@mysql.com
84f0f11fff
bug #8611 , ndb includes in lib dir instead of include dir
2005-02-21 10:52:29 +01:00
jimw@mysql.com
99bd939b3e
Remove doubled quotes (used for escaping) in table names in mysqlhotcopy.
...
Part of fix for Bug #8136 .
2005-02-18 12:37:18 -08:00
kent@mysql.com
d94b8662f4
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-18 14:21:00 +01:00
jimw@mysql.com
e9a5b7d500
Clean up merge from 4.1, including making several enum fields
...
in the grant tables case-insensitive and updating test results.
2005-02-17 18:07:14 -08:00
jimw@mysql.com
7eb8c130f7
Merge
2005-02-17 16:16:58 -08:00
jimw@mysql.com
9de31feab9
Merge mysql.com:/home/jimw/my/mysql-4.1-7617
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:53:35 -08:00
kent@mysql.com
87d6da972f
make_binary_distribution.sh, Makefile.am:
...
Make .disabled files part of distribution
2005-02-17 20:07:52 +01:00
monty@mysql.com
38d1a42481
Merge with 4.1
2005-02-15 17:12:13 +02:00
serg@serg.mylan
10c53ae1e5
remove passwordless remote accounts from windows distro
2005-02-14 11:14:04 +01:00
jimw@mysql.com
c4187750ff
Fix all of the enum and set columns in privilege tables to be
...
case-insensitive. (Bug #7989 )
2005-02-10 20:25:14 -08:00
lenz@mysql.com
afa2a462a1
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-merge
2005-02-09 17:58:29 +01:00
lenz@mysql.com
420d29159f
Merge mysql.com:/space/my/mysql-4.1-merge
...
into mysql.com:/space/my/mysql-5.0
2005-02-09 17:52:31 +01:00
lenz@mysql.com
8999d5ab11
- added copyright header on top of the fill_help_tables.sql file (BUG#5772)
...
- updated mysql-copyright-2 to properly convert this new header from GPL to commercial for the
commercial distribution
2005-02-09 17:40:10 +01:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb
Applied a patch for Netware.
2005-02-08 19:49:40 +02:00
jimw@mysql.com
1f21b05c53
Merge mysql.com:/home/jimw/my/mysql-5.0-7931
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-02-07 12:20:37 -08:00
guilhem@mysql.com
a70adb5d2a
Merge
2005-02-05 18:07:50 +01:00
konstantin@mysql.com
e531136c1f
A fix for Bug#6273 "building fails on link": we should not use
...
CLIENT_LIBS in mysql_config as CLIENT_LIBS point to builddir when
we use the bundled zlib.
2005-02-05 01:21:16 +03:00
jimw@mysql.com
8c8553af81
Merge changes
2005-02-04 11:59:02 -08:00
jimw@mysql.com
183d1327f0
Copy *.result.es files for binary distribution so embedded tests can be run
2005-02-03 14:21:16 -08:00
monty@mysql.com
422c2eb868
4.1 -> 5.0 merge
2005-02-03 13:18:30 +02:00
jimw@mysql.com
70f35fa6da
Add --help to mysqld_safe. (Bug #7931 )
2005-02-02 19:41:33 -08:00
jimw@mysql.com
a8039e1ac8
Make sure mysql_client_test and embedded test clients get added to
...
binary distribution on all platforms.
2005-02-01 11:59:44 -08:00
serg@serg.mylan
852f2e0aba
small Makefile.am cleanup
...
clean: targets removed
generated *.h files moved to include/
2005-01-28 17:14:03 +01:00
jimw@mysql.com
3229e67a20
Fix handling of table-name matching in mysqlhotcopy when newer versions of
...
DBD::mysql that quote table names are used by removing the quoting. Also fix
a bug that stripped all '~' characters out of the table regex instead of
just the leading one used to negate the expression. (Bug #8136 )
2005-01-27 14:29:06 -08:00
jimw@mysql.com
d11081bd6f
Merge
2005-01-24 13:48:48 -08:00
lenz@mysql.com
9675b0698f
- renamed client_test -> mysql_client_test
...
- renamed the tests that use the embedded server (client_test ->
mysql_client_test_embedded, mysqltest -> mysql_test_embedded
and changed some Makefiles and scripts so they are installed in $bindir
(required to be able to run the test suite against the embedded server)
2005-01-20 16:25:38 +01:00
jimw@mysql.com
d28f83359b
Update list of files copied for binary distribution. (Bug #7632 )
2005-01-18 17:01:06 -08:00
jimw@mysql.com
bdb36de9ff
Merge
2005-01-14 10:40:05 -08:00
jimw@mysql.com
b6d46b3c4c
Merge
2005-01-14 10:33:07 -08:00
jimw@mysql.com
d7389eedd1
Fix mysql_install_db to look for libexecdir relative to basedir when
...
it has been specified. (Bug #7347 )
2005-01-13 11:58:10 -08:00
jani@ua141d10.elisa.omakaista.fi
f3e73e26d7
A patch for Netware.
2005-01-13 19:24:54 +02:00
lenz@mysql.com
3e5e12d5c0
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-5.0-build
2005-01-13 14:54:17 +01:00
serg@serg.mylan
ec9f0ef1ca
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-13 11:12:00 +01:00
serg@serg.mylan
1d33747d3a
Symlink vulnerability fixed.
...
reported by Javier Fernandez-Sanguino Pena
and Debian Security Audit Team (http://www.debian.org/security/audit )
2005-01-12 23:30:54 +01:00
joreland@mysql.com
953df8f48d
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-12 11:24:46 +01:00
