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
21caf15bca
Add Create_routine_priv, Alter_routine_priv, and Execute_priv privileges
...
to the 'host' privilege table. (Bug #8166 )
2005-02-07 18:40:14 -08: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
ram@gw.mysql.r18.ru
40daecb8b4
after merge fix up:
...
we should use REPLACE for $hostaname queries to avoid problems when $hostname=localhost.
2005-02-01 17:13:44 +04: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
ram@gw.mysql.r18.ru
edba2b9b33
A fix (bug #6000 : No "@%"-accounts after install).
2005-01-28 15:26:17 +04:00
ram@gw.mysql.r18.ru
d177817cac
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6000
2005-01-28 12:27:46 +04: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
46e444293a
Merge mysql.com:/home/jimw/my/mysql-4.0-7347
...
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-01-14 10:44:29 -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
jimw@mysql.com
39d90b710f
Replace ZLIB_LIBS in mysql_config. (Bug #6418 )
2005-01-11 21:50:30 +01:00
jimw@mysql.com
804a952f9b
Create columns_priv with correct column lengths (the alter table
...
that used to fix it was removed in a merge, and now the alter table
that fixes the length comes before the create table so it fixes
pre-existing tables but not the newly-created one).
2005-01-07 19:50:41 +01:00
serg@sergbook.mysql.com
a609bc45f2
merge
2005-01-07 15:02:25 +02:00
jimw@mysql.com
5010be1d8b
Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
...
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-06 21:39:57 +01:00
jimw@mysql.com
b1eab7097c
Make sure all char columns in the mysql.* tables have the proper width in
...
mysql_fix_privilege_tables.sql, or they may get truncated during conversion
to utf8. (Bug #7539 )
2005-01-06 20:42:06 +01:00
jimw@mysql.com
488170d38c
Merge mysql.com:/home/jwinstead2/mysql-4.1-7021
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 20:03:06 +01:00
jimw@mysql.com
4149e1116a
Merge mysql.com:/home/jwinstead2/mysql-4.1-6964
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 20:01:18 +01:00
jimw@mysql.com
2acb738784
Add comment to make code for option-stripping in mysql_config more clear
2005-01-06 19:57:02 +01:00
serg@sergbook.mysql.com
f472cec178
merged
2005-01-06 19:32:16 +02:00
jimw@mysql.com
d14f3d7675
Protect flags like -Wl,-O2 from being mangled by mysql_config (Bug #6964 )
...
(Second commit of this patch -- first included wrong changes.)
2005-01-05 03:43:37 +01:00
jimw@mysql.com
30808e9ab9
Make sure to include ZLIB_LIBS in mysql_config --libs_r (Bug #7021 )
2005-01-05 02:04:12 +01:00
jimw@mysql.com
0ed892f197
Change mysqld_safe search for mysqld relative to the current working directory
...
to only look for the mysqld binary (and english error strings) and assume the
datadir from that. Then, if that datadir turns out to not exist, startup will
fail. This avoids the behavior where mysqld_safe would go off and run a totally
different binary because the data directory had been moved (even when --datadir
was specified on the command line). (Bug #7249 )
2005-01-05 01:08:45 +01:00
jani@ua141d10.elisa.omakaista.fi
81d99da104
Added checking for my.cnf file from environment variable MYSQL_HOME
...
instead of DATADIR.
2005-01-04 20:13:47 +02:00
jimw@mysql.com
663396653a
Use 'ps xaww' in mysqld_safe (on Linux) so whole command-line is searched
...
for port and/or pid-file parameters. (Bug #5878 )
2005-01-04 01:49:29 +01:00
kent@mysql.com
bb806c1e98
make_win_src_distribution.sh, make_binary_distribution.sh, mysql-test-run.sh:
...
Removed references to ISAM and MERGE
2005-01-01 21:13:09 +01:00
dlenev@mysql.com
536cb92195
Manual merge.
2004-12-31 12:48:27 +03:00
monty@mysql.com
34d5331cee
Merge with global tree
2004-12-31 00:50:30 +02:00
dlenev@mysql.com
a8deefa3dd
Manual merge of patch implementing WL#1339 with main tree.
2004-12-29 22:35:16 +03:00
dlenev@brandersnatch.localdomain
ffa7393330
WL#1339 "Add per account max_user_connections limit (maximum number
...
of concurrent connections for the same account)"
Added support of account specific max_user_connections limit. Made all
user limits to be counted per account instead of the old behavior,
which was per user/host accounting. Added option which enables the old
behavior. Added testing of these to the test suite.
(After review version).
2004-12-29 20:30:37 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
b1e30904d5
WL#925 - Privileges for stored routines
...
Implement fine-grained control over access to stored procedures
Privileges are cached (same way as existing table/column privs)
2004-12-23 10:46:24 +00:00
monty@mishka.local
4f4bbfc279
Merge with 4.1
2004-12-22 13:54:39 +02:00
