jimw@mysql.com
2c6e46f47e
Clean up merge of fix for Bug #3309 .
2005-03-03 17:44:28 -08:00
jimw@mysql.com
f7c01cfb76
Merged from 4.1
2005-03-03 15:01:46 -08:00
jimw@mysql.com
5d2bedc391
Fix bug in checking of table-specific grats that caused IP/NETMASK
...
hostnames to not be matched correctly. (Bug #3309 )
2005-03-02 16:30:24 -08:00
monty@mysql.com
7e5f74f8f2
Merge with global tree
2005-02-25 17:12:06 +02:00
monty@mysql.com
0a6b7aedb2
Remove compiler warnings and remove not used variables
...
(Found during build process)
2005-02-25 16:53:22 +02:00
bell@52.0.168.192.in-addr.arpa
25e87cd6f7
Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
...
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-23 19:22:52 +02:00
jimw@mysql.com
41043bb3f5
Merge
2005-02-22 16:39:21 -08:00
jimw@mysql.com
a50be4d42b
Merge mysql.com:/home/jimw/my/mysql-4.1-7989
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:15:34 -08:00
bell@51.0.168.192.in-addr.arpa
a9b40a8c0b
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-22 14:52:26 +02:00
monty@mysql.com
cab35adf7e
Review of new pushed code (XA & other)
...
Portability fixes and cleanups
Fixed setting of 'res' in mysql_execute_command()
2005-02-21 14:47:57 +02:00
bell@51.0.168.192.in-addr.arpa
a11369b999
Merge
2005-02-20 18:49:27 +02:00
jimw@mysql.com
5348bc99c1
Clean up fix for Bug #7989 by avoiding extra memory copy, and adding some
...
more information to the error message.
2005-02-18 12:47:33 -08:00
jimw@mysql.com
7eb8c130f7
Merge
2005-02-17 16:16:58 -08:00
jimw@mysql.com
219e29d7ae
Merge mysql.com:/home/jimw/my/mysql-4.1-8471
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:53:07 -08:00
jimw@mysql.com
a6afab6a55
Always lowercase database names from 'host' and 'db' grant tables when they
...
are loaded and lower_case_table_names is set, but issue a warning when it is
done. (Bug #7989 )
2005-02-15 13:36:46 -08:00
jimw@mysql.com
3d7a384d00
Allow hostnames that are IP addresses with a netmask even when
...
running with --skip-name-resolve. (Bug #8471 )
2005-02-14 20:33:14 -08:00
bell@sanja.is.com.ua
25042ae70c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-repl-5.0
2005-01-31 09:36:23 +02:00
georg@beethoven.site
3b2bf2f512
Fixes for windows compilation bugs
...
(After review of cs georg:1.1800 by Monty)
2005-01-26 15:19:20 +01:00
serg@serg.mylan
c76405a7ee
merged
2005-01-24 19:41:42 +01:00
serg@serg.mylan
67ba2e367a
fixes/cleanups according to Coverity report
2005-01-24 15:48:25 +01:00
bell@sanja.is.com.ua
a7d0eaae7c
added replication of VIEW DDL commands (BUG#4838)
2005-01-17 01:18:08 +02:00
monty@mysql.com
aad3d64a6f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-01-12 03:40:02 +02:00
monty@mysql.com
314cf993c6
Fixed memory reference errors found by valgrind
2005-01-12 03:38:53 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
b67a1f697a
Initialize lex->mqh structure. Fixes valgrind warnings.
2005-01-10 16:24:05 +00:00
monty@mysql.com
bda0a78184
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-01-06 13:31:31 +02:00
monty@mysql.com
d35140a851
First stage of table definition cache
...
Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name
2005-01-06 13:00:13 +02:00
bell@sanja.is.com.ua
a8a5f3590c
fixed bugs in view code with prepared statemnts
2005-01-04 18:04:16 +02:00
serg@sergbook.mysql.com
a9c7fb9dfd
post-merge
2004-12-31 17:59:43 +01:00
serg@sergbook.mysql.com
a04fc26c54
manually merged
2004-12-31 15:26:24 +01:00
dlenev@brandersnatch.localdomain
4e17aab243
Yet another after merge fix.
...
Now max_user_connections is 36th field in mysql.user table
(two new SP-related privileges were added).
2004-12-31 14:02:40 +03:00
serg@sergbook.mysql.com
45ce994e5d
post-merge
2004-12-31 11:52:14 +01:00
dlenev@mysql.com
536cb92195
Manual merge.
2004-12-31 12:48:27 +03:00
monty@mysql.com
5e03ebbcad
After merge fixes
...
Cleanup of mi_print_error() handling
Deleted 'merge' directory
2004-12-31 03:47:56 +02:00
monty@mysql.com
34d5331cee
Merge with global tree
2004-12-31 00:50:30 +02:00
monty@mysql.com
d71c030587
After merge fixes
2004-12-31 00:44:00 +02:00
serg@sergbook.mysql.com
c7e756f959
merged
2004-12-30 21:11:40 +01:00
serg@sergbook.mysql.com
12bf7dcd04
unsufficient privilege checks in GRANT, when a grantor has column-level privileges
2004-12-30 21:01:11 +01: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
dlenev@mysql.com
71da86aa11
Manual merge of changes making GRANTs, which change SSL attributes and/or
...
user limits to behave well on 5.0 tables, into 4.1 tree.
2004-12-23 22:16:43 +03:00
dlenev@mysql.com
caade862ae
Make GRANTs, which change SSL attributes and/or user limits,
...
to behave well on 5.0 tables (well now you can't use tables from 4.1
and 5.0 with 4.0 because former use utf8, but still it is nice to have
similar code in acl_init() and replace_user_table()).
This also will make such GRANTs working in 5.0 (they are broken now).
2004-12-23 21:59:36 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
5c53cb39dd
Fix compile error, caused by wl#925 variable rename
2004-12-23 11:23:36 +00: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
gluh@gluh.mysql.r18.ru
58e75f6f24
fix according to review
2004-12-10 18:25:12 +03:00
gluh@gluh.mysql.r18.ru
2e912bbbe8
Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
...
mysqldump skips information_schema db
'use' now can use information_schema db
changed value of column 'Null' to 'NO' if column is not nullable
2004-12-10 12:07:11 +03:00
dlenev@mysql.com
62a6d9749b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6765
2004-12-09 13:33:12 +03:00
dlenev@brandersnatch.localdomain
4b0882e0a6
Fix for bug #6765 "Implicit access to time zone description
...
tables requires privileges for them if some table or column level grants
present" (with after-review fixes).
We should set SELECT_ACL for implicitly opened tables in
my_tz_check_n_skip_implicit_tables() to be able to bypass privilege
checking in check_grant(). Also we should exclude those tables from
privilege checking in multi-update.
2004-12-09 13:31:46 +03:00
monty@mysql.com
563500994a
Update results for new varchar handling
...
Fixed compiler warnings
String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
2004-12-07 15:47:00 +02:00
monty@mysql.com
77207d19f2
Merge with new VARCHAR code
2004-12-06 19:18:35 +02:00
