Commit graph

200 commits

Author SHA1 Message Date
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
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
serg@serg.mylan
716e91eecb Bug #473 - GRANT ... TO ''@... was requiring FLUSH PRIVILEGES to work 2003-07-21 13:46:57 +02:00
kostja@oak.local
09e53b0169 Style fixes, comments for 4.1.1 authorization
Now special 1-byte packet is used for request of old password
Fixed bug with --skip-grant-tables and acl_getroot
2003-07-18 18:25:54 +04:00
monty@narttu.mysql.fi
7b8a54b512 Fixed memory overrun when doing REPAIR on table with multi-part auto_increment key where one part was a packed CHAR 2003-07-18 04:04:24 +03:00
kostja@oak.local
a232225b69 Preliminary support for options --secure-auth,
--old-passwords
Support for option --old-protocol was removed.
Some test performed.
Tests for SSL and replication are pending.
More strict following to specification for --old-passwords
is in the TODO.
2003-07-08 02:36:14 +04:00
kostja@oak.local
1d20b23247 Bug fixes for authentication
OLD_PASSWORD made a keyword to allow set password=old_password('abc') constructions.
2003-07-04 20:52:04 +04:00
guilhem@mysql.com
ace8a06323 I committed the same changeset in my tree yesterday, but broke the tree since,
so I commit again in a fresh tree.
Fix for bug#763 (Relay_log_space too big by 4 bytes),
plus comments and DBUG_PRINT, and we don't start replication
if --bootstrap.
2003-07-03 01:08:36 +02:00
pem@mysql.com
b3f153507e Added missing (char*) casts in bzero calls.
(Needed for platforms with the traditional bzero prototype.)
Fixes BUG#460.
2003-07-03 01:08:34 +02:00
Sinisa@sinisa.nasamreza.org
c1660e1a23 Lot's of clean-ups and fixes for 4.0.14. 2003-07-02 00:10:47 +03:00
kostja@oak.local
7df0475847 First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1)
For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
  hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 

- password.c: new functions were implemented, old rolled back to 4.0 state

- server code was rewritten to use new authorization algorithm (check_user(), change
  user, and other stuff in sql/sql_parse.cc)

- client code was rewritten to use new authorization algorithm
  (mysql_real_connect, myslq_authenticate in sql-common/client.c)

- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
  authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)

- mysqladmin.c was fixed to work correctly with new passwords

Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary.
2003-07-01 23:40:59 +04:00
Sinisa@sinisa.nasamreza.org
ef61b1a56f Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-06-30 12:33:35 +03:00
gluh@gluh.mysql.r18.ru
8573bdbff8 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.for_fix
2003-06-26 12:49:03 +05:00
gluh@gluh.mysql.r18.ru
7d43750eb6 Fix bug #673: MySQL 4.0.13 no SSL connection with mysql client possible 2003-06-26 12:47:36 +05:00
Sinisa@sinisa.nasamreza.org
66b60b57af Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-06-25 18:40:31 +03:00
monty@narttu.mysql.fi
a51ea11147 SHOW GRANTS hided real grants when grants on both column and table (Bug 654) 2003-06-23 20:03:59 +03:00
Sinisa@sinisa.nasamreza.org
438ed49691 Removing one fix. 2003-06-23 16:05:22 +03:00
Sinisa@sinisa.nasamreza.org
5a414bda8e Two Sprint tasks and two behaviour changes. 2003-06-17 16:20:07 +03:00
monty@narttu.mysql.fi
e090f2d0cc Fixes for make_win_src_distributions
Removed compiler warnings
2003-06-15 23:24:37 +03:00
gluh@gluh.mysql.r18.ru
7d020eae17 REVOKE all privileges and delete user(244) 2003-06-06 17:43:23 +05:00
Sinisa@sinisa.nasamreza.org
ec4a0ee477 several bug fixes 2003-05-31 21:35:20 +03:00
monty@mashka.mysql.fi
6aa8929cf3 After merge fixes
Added initialization of all important global variables
2003-05-21 21:39:58 +03:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00