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
dlenev@brandersnatch.localdomain
5a6c7027f0
Better approach for prelocking of tables for stored routines execution
...
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
2005-03-04 16:35:28 +03:00
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