ndbdev@dl145b.mysql.com
8d44b54295
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-10 07:22:27 +02:00
brian@brian-akers-computer.local
12a7b7af04
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
2005-06-09 13:11:54 -07:00
acurtis@xiphis.org
3b8c3bd7e1
Merge
2005-06-09 17:15:06 +01:00
brian@brian-akers-computer.local
f5434a93bf
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
2005-06-08 22:29:10 -07:00
brian@brian-akers-computer.local
8683f513cd
Removed warnings for gcc 4.0
2005-06-07 18:23:58 -07:00
reggie@mdk10.(none)
f86c44ff56
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/41test3
2005-06-07 15:45:02 -05:00
ndbdev@dl145b.mysql.com
f188f6c98a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 10:51:32 +02:00
gluh@eagle.intranet.mysql.r18.ru
477feba00f
Fix for bug#10964: Information Schema:Authorization check on(2nd version, after review)
...
privilege tables is improper
added privilege check for USER_PRIVILEGES, SCHEMA_PRIVILEGES,
TABLE_PRIVILEGES, COLUMN_PRIVILEGES tables
2005-06-02 15:33:53 +05:00
tomas@poseidon.ndb.mysql.com
2dca9d5953
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-02 10:44:48 +02:00
brian@zim.(none)
113a99626d
Merge of 4.1->5.0. This contained the fixes for GCC 4.0
2005-06-01 21:56:30 -07:00
brian@zim.(none)
efb5ed5bab
Merge
2005-06-01 18:48:29 -07:00
brian@zim.(none)
ba9b9f8993
Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
2005-06-01 17:34:10 -07:00
ingo@mysql.com
c420599581
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
Hand merged from 4.0.
2005-05-31 19:37:24 +02:00
reggie@mdk10.(none)
db81ebec28
BUG# 10181-mysqld.exe crash with an access vioation after INSERT INTO mysql.host
...
this is a followup cset after changes suggested by Serg.
2005-05-31 07:21:10 -05:00
ingo@mysql.com
51d80960ea
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
1.) Added a new option to mysql_lock_tables() for ignoring FLUSH TABLES.
Used the new option in create_table_from_items().
It is necessary to prevent the SELECT table from being reopend.
It would get new storage assigned for its fields, while the
SELECT part of the command would still use the old (freed) storage.
2.) Protected the CREATE TABLE and CREATE TABLE ... SELECT commands
against a global read lock. This prevents a deadlock in
CREATE TABLE ... SELECT in conjunction with FLUSH TABLES WITH READ LOCK
and avoids the creation of new tables during a global read lock.
3.) Replaced set_protect_against_global_read_lock() and
unset_protect_against_global_read_lock() by
wait_if_global_read_lock() and start_waiting_global_read_lock()
in the INSERT DELAYED handling.
2005-05-31 11:08:14 +02:00
reggie@mdk10.(none)
57a2b04007
Bug #10181 mysqld.exe crash with an access violation after INSERT INTO mysql.host
...
sql_acl.cc:
Make sure host.db is a valid string pointer before we do our lower_case_table_names comparison
2005-05-26 14:02:18 -05:00
tulin@dl145c.mysql.com
03590c20bd
merge
2005-05-18 22:26:23 +02:00
monty@mysql.com
db40af2a6f
Fix warnings from icc
...
Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling
2005-05-18 19:00:21 +03:00
acurtis@xiphis.org
ed899c0da2
fix embedded build
2005-05-17 23:49:01 +01:00
tulin@dl145c.mysql.com
4a1d6f6a18
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-17 23:25:13 +02:00
acurtis@xiphis.org
8df5887ad5
Bug#10246 - Parser: bad syntax for GRANT EXECUTE
...
Rename some functions
more fine-grained sp privileges
make grant/revoke sp grammar less ambigious
2005-05-17 19:54:20 +01:00
mronstrom@mysql.com
c33a0673a6
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/Users/mikron/wl1682
2005-05-12 12:01:01 +02:00
lars@mysql.com
e76c641190
Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
2005-05-09 11:45:59 +02:00
lars@mysql.com
3ff9aa5fa1
After merge fixes
2005-05-09 11:43:09 +02:00
gluh@mysql.com
64cbbf1463
Fix for bug #9838 : INFORMATION_SCHEMA.COLUMNS columns of granted views missing
2005-05-07 13:55:46 +00:00
lars@mysql.com
05cbb3962c
Manual merge 5.0->5.1
2005-05-06 15:04:07 +02:00
monty@mishka.local
015cd1cd21
merge
2005-05-06 13:51:58 +03:00
monty@mishka.local
a9f6aab4c9
Fixes while reviewing new code
...
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
2005-05-06 11:39:30 +03:00
gbichot@quadita2.mysql.com
b72ae4fe57
Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions).
...
Approximative, because it's using our binlogging way (what we call "query"-level) and this is not as good as record-level binlog (5.1) would be. It imposes several
limitations to routines, and has caveats (which I'll document, and for which the server will try to issue errors but that is not always possible).
Reason I don't propagate caller info to the binlog as planned is that on master and slave
users may be different; even with that some caveats would remain.
2005-05-05 14:20:53 +02:00
mronstrom@mysql.com
f7cd6b8aa1
WL 1682: After review fixes + update bitvector class + bitvector test
...
cases + bug fixes
2005-05-02 15:45:33 +02:00
mronstrom@mysql.com
21347433cf
WL 1682: Use bitvector instead of query_id to tell handler which fields
...
to read and write
Changed Server code, added new interface to handler and changed the
NDB handler, InnoDB handler and Federated handler that previously used
query_id
Bug#10202 fix (one-liner fix for memory leak)
2005-04-28 14:45:27 +02:00
patg@patrick.local
8e0eb65f9a
5.0 to 5.1 merge
2005-04-01 12:32:17 -08:00
monty@mysql.com
c4467b817d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-29 12:58:31 +03:00
monty@mysql.com
dd4b0710dd
Cleanups during review
2005-03-29 12:37:36 +03:00
pekka@mysql.com
727015dbb3
Merge
2005-03-28 23:06:19 +02:00
serg@serg.mylan
8207241882
merged
2005-03-26 20:15:18 +01:00
serg@serg.mylan
72c9ac844b
fixes for "backport wild_compare fix from 4.1 - bug#3924"
2005-03-26 19:46:42 +01:00
serg@serg.mylan
9a0dd5c7e4
sql/sql_acl.cc
...
report correct errror in MODE_NO_AUTO_CREATE_USER
cleanup
after merge fixes
2005-03-23 19:18:25 +01:00
serg@serg.mylan
d6bedfa8e0
merged
2005-03-23 09:42:24 +01:00
mysqldev@mysql.com
ad26a667e6
sql_acl.cc, sql_acl.h, sql_parse.cc
...
New privilege CREATE USER (CREATE_USER_ACL, Create_user_priv) added
grant2.test:
new tests (mostly backported from jani's patch)
system_mysql_db.result, sp.result, grant2.result, grant.result:
results updated
2005-03-22 15:54:18 +01:00
jani@ua141d10.elisa.omakaista.fi
01dddf095a
- Added new error message.
...
- Changed error message in sql_acl.cc
- Added some more tests for GRANT.
2005-03-22 15:57:24 +02:00
lars@mysql.com
efb077502d
Merge
2005-03-21 23:05:55 +01:00
tomas@poseidon.ndb.mysql.com
7cc49e6b95
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-03-17 15:29:25 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
1fbb61754b
Fixed two bugs in MySQL ACL.
...
First one is related to Bug#7905. One should not be allowed to
create new user with password without UPDATE privilege to
MySQL database. Furthermore, executing the same GRANT statement
twice would actually crash the server and corrupt privilege database.
Other bug was that one could update a column, using the existing
value as basis to calculate the new value (e.g. UPDATE t1 SET a=a+1)
without SELECT privilege to the field (a in the above example)
Fixed tests grant.pl and grant2, which were wrong.
2005-03-17 08:16:56 +02:00
monty@mysql.com
dd4db08438
Code cleanups during review of pushed code
2005-03-15 16:07:28 +02:00
lars@mysql.com
7ed7fc7f58
WL#2472: Addendum: Fixes after Mats review
2005-03-10 14:36:48 +01:00
lars@mysql.com
26787260b7
WL#2472: Refactoring of replication and binlog filtering.
...
Needed to be able to have multiple masters connected
to same slave server with different filters.
2005-03-08 21:12:35 +01:00
tomas@poseidon.ndb.mysql.com
8e17bedeee
Merge
2005-03-08 10:40:52 +01:00
gluh@gluh.mysql.r18.ru
df2b38913f
WL2131: Access control for SHOW ... PROCEDURE|FUNCTION ...
2005-03-05 14:35:32 +03:00
dlenev@mysql.com
5b16dbf960
Manual merge SP-locking improvements patch with current tree.
2005-03-04 17:46:45 +03:00