pem@mysql.com
6e717133c5
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
hf@deer.(none)
3e9338f845
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1-w1284
2003-11-26 13:39:18 +04:00
hf@deer.(none)
611096a709
SCRUM
...
WL#1284 (warnings about --skip-name-resolve)
Messages corrected
2003-11-26 13:38:32 +04:00
gluh@gluh.mysql.r18.ru
3ff69d5dc4
Fix for bug #1855 : mysqld crashes with certain SSL connections
2003-11-24 13:57:49 +04:00
monty@mysql.com
7c6113a39f
Merge key cache structures to one
...
Fixed compiler warnings (IRIX C compiler and VC++)
2003-11-20 22:06:25 +02:00
hf@deer.(none)
72566c794e
SCRUM
...
WL#1284 (warnings about --skip-name-resolve)
Now MySQL will issue warnings during startup about entries in
grant tables with hostnames that require resolve, and after
GRANT commands with that kind of hostnames.
2003-11-20 12:55:48 +04:00
pem@mysql.com
28a2c6a96b
Merging 4.1->5.0.
2003-11-19 15:19:46 +01:00
serg@serg.mylan
8cdc27da15
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-25 00:03:44 +02:00
serg@serg.mylan
c752d2cad0
removed one more hack that - as usual - almost always worked
...
(but broke permission handling for *some* IP's after we started to compare in utf8)
Bug #1636
2003-10-24 23:27:21 +02:00
pem@mysql.com
337238b78a
Merging 4.1->5.0
2003-10-22 16:10:22 +02:00
serg@serg.mylan
f944fd4a65
merged
2003-10-21 11:58:43 +02:00
serg@serg.mylan
50d9b95b77
merged
2003-10-15 12:25:44 +02:00
serg@serg.mylan
261831ddea
#ifdef removed
...
comment clarified
2003-10-14 16:26:28 +02:00
monty@mashka.mysql.fi
461d1627b3
merge with 4.0 for more memory allocation variables.
2003-10-13 15:50:30 +03:00
monty@mashka.mysql.fi
c95d142f8f
Add new user variables for tuning memory usage:
...
query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization
2003-10-11 22:00:24 +03:00
serg@serg.mylan
9be83de693
minor error messages cleanup
2003-10-02 23:41:10 +02:00
hf@deer.(none)
5f8e7fef27
Merge
2003-09-26 15:40:26 +05:00
hf@deer.(none)
ba8fa76fa2
SCRUM:
...
WL#604 Privileges in embedded library
code added to check privileges in embedded library
NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
access-checking parts. Actually we now can exclude these parts from
standalone server as well. Do we need it?
Access checks are disabled in embedded server by default. One should
edit libmysqld/Makefile manually to get this working.
We definitely need the separate configure for embedded server
2003-09-26 15:33:13 +05:00
pem@mysql.com
8d884c02bb
Merging 4.1 -> 5.0
2003-09-24 11:29:38 +02:00
hf@deer.(none)
a2dbfaefa3
SCRUM
...
embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea?
2003-09-19 14:44:31 +05:00
monty@mashka.mysql.fi
73f66f68fd
merge with 4.0.15
2003-09-11 20:24:14 +03:00
monty@mashka.mysql.fi
45aa92c574
After merge fixes.
...
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
2003-09-11 19:06:23 +03:00
monty@mashka.mysql.fi
99490870e6
Cleaned up last bug fixes
...
Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
2003-09-09 20:06:50 +03:00
monty@mashka.mysql.fi
439b84afe4
Merge with 3.23
2003-09-05 06:56:28 +03:00
monty@narttu.mysql.fi
4b3b4b9250
merge
2003-09-03 19:53:08 +03:00
kostja@oak.local
36dd82c1d5
merge commit, hope that none of bar and dlenev changes were
...
lost.
2003-09-03 14:12:10 +04:00
serg@serg.mylan
48e2d15369
bug #928 - arbitrary table grant was used, sort-order wasn't honored
2003-09-02 11:18:13 +02:00
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +03:00
monty@narttu.mysql.fi
66b160c253
vio ssl structure renames (to get rid of ending _)
...
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
2003-08-27 02:51:39 +03:00
pem@mysql.com
7f158dd12a
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
Sinisa@sinisa.nasamreza.org
ced195f8a9
After merge fixes
2003-08-22 18:43:46 +03:00
Sinisa@sinisa.nasamreza.org
4d2902a27d
grant.result, grant.test, sql_acl.cc:
...
Fix for a bug #878
2003-08-22 18:32:11 +03:00
monty@mashka.mysql.fi
4f7512160b
After merge fixes
...
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
monty@mashka.mysql.fi
a9146ace70
Cleanups to recent patches
...
Fix packet error when using wrong GRANT command
2003-08-15 09:54:19 +03:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
monty@mashka.mysql.fi
6e7a509d06
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-07 20:18:51 +03:00
monty@mashka.mysql.fi
8f08c511ee
Review of changesets since last pull.
...
(Mostly code cleanups)
2003-08-07 20:16:37 +03:00
serg@serg.mylan
86e79ec380
merged
2003-08-07 14:39:34 +02:00
kostja@oak.local
c23975aace
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-08-07 13:29:25 +04:00
serg@serg.mylan
4235268bef
fixed password buffer overflow
2003-08-07 11:16:34 +02:00
guilhem@mysql.com
41865cf3a6
Fix so that SET PASSWORD is not replicated by the slave if running with
...
replicate-*-table rules which exclude 'mysql' tables
(e.g. replicate-wild-ignore-table=mysql.%).
This was already the behaviour for GRANT/REVOKE, I'm extending it to
SET PASSWORD because it seems very logical (the contrary seems illogical).
2 new tests:
- one to test if GRANT and SET PASSWORD are replicated
- one to test if they are not replicated if replicate-wild-ignore-table=mysql.%
The 2nd is also a testcase for BUG#980.
2003-08-02 23:46:26 +02:00
guilhem@mysql.com
fbe49f0c48
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-08-02 17:24:44 +02:00
guilhem@gbichot2
6b8fd6fc0f
There were two wrong calls to tables_ok() in MySQL 4.0 (BUG#980),
...
which are fixed now.
In 4.1 there are 3 calls; 2 of them will be fixed when there is a merge;
here I fix the 3rd, new one.
2003-08-02 17:23:39 +02:00
guilhem@mysql.com
c784b91578
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-02 16:11:39 +02:00
guilhem@mysql.com
fa1d0098ec
Mark tables 'updating' in sql_acl.cc (mysql_grant(), mysql_table_grant()) so that
...
tables_ok() does not ignore them. This fixes random bug #980 .
2003-08-02 16:10:26 +02:00
kostja@oak.local
50d3291aee
manual merge
2003-07-31 17:11:52 +04:00
dlenev@mysql.com
8f50cd0472
Fix security bug. mysqld server without ssl support was completly
...
ignorant about ssl_type attribute
2003-07-30 03:33:48 +04:00
serg@serg.mylan
e0d9c9cd2b
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-27 09:59:24 +02:00
dlenev@dlenev.mshome
b5faccbbc3
Fix security bug. mysqld server without ssl support was completly
...
ignorant about ssl_type attribute
2003-07-23 18:50:18 +04:00
serg@serg.mylan
2cac8f0768
now GRANT db.* ... compares patterns correctly to prevent privilege escalation
2003-07-22 22:21:23 +02:00
