Commit graph

569 commits

Author SHA1 Message Date
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
monty@mysql.com
75d0958dc3 After merge fixes
Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld
2004-12-06 17:15:54 +02:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02:00
monty@mysql.com
67ce247965 Add support for up to VARCHAR (size up to 65535)
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
mats@mysql.com
fe70f8c747 Merge mysql.com:/space/bkroot/mysql-4.1
into mysql.com:/space/bk/b6391-mysql-4.1
2004-12-03 12:15:31 +01:00
mats@mysql.com
2bbdf2403d Bug#6391 (binlog-do-db rules ignored)
CREATE DATABASE statement used the current database instead of the
  database created when checking conditions for replication.
  CREATE/DROP/ALTER DATABASE statements are now replicated based on
  the manipulated database.
2004-12-03 12:13:51 +01:00
ram@gw.mysql.r18.ru
c78eefbc95 Fixes (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv
bug #6933: error in the tests/grant.pl test).
2004-12-02 13:34:30 +04:00
serg@serg.mylan
319546d5f0 create/drop/rename user cleanup 2004-11-27 23:07:30 +01:00
ingo@mysql.com
cb53411b47 WL#2050 - CREATE USER and DROP USER and RENAME USER
Added new commands CREATE USER and RENAME USER.
Changed behaviour of DROP USER.
Changed an error messages for the new commands.
2004-11-25 21:55:49 +01:00
bell@sanja.is.com.ua
072d38eb12 merge 2004-11-21 20:08:12 +02:00
bell@sanja.is.com.ua
21eb2e2eae post merge 2004-11-21 19:33:49 +02:00
serg@serg.mylan
2d3dd65cc1 merged 2004-11-20 18:36:41 +01:00
tomas@poseidon.ndb.mysql.com
0acc6f83b2 enabled having system tables in ndb 2004-11-17 08:10:26 +00:00
gluh@gluh.mysql.r18.ru
c67d479918 Fixes for information_schema 2004-11-15 19:20:45 +03:00
bell@sanja.is.com.ua
bb52950625 make information schema libmysqld compatible
fixed typo
2004-11-14 00:28:44 +02:00
bell@sanja.is.com.ua
d76db8b999 marge 2004-11-13 19:45:36 +02:00
bell@sanja.is.com.ua
7210195f1e now my_printf_error is not better then my_error, but my_error call is shorter
used only one implementation of format parser of (printf)
fixed multistatement
2004-11-13 19:35:51 +02:00
gluh@gluh.mysql.r18.ru
321f803784 WL#1629: SHOW with WHERE(partially) &
WL#173:  Create Data Dictionary Tables for SHOW Commands
2004-11-13 13:56:39 +03:00
monty@mysql.com
addd1a0da8 Merge with 4.1 2004-11-12 19:58:24 +02:00
monty@mysql.com
e9c3887b58 After merge fixes 2004-11-12 17:44:17 +02:00
bell@sanja.is.com.ua
1555469b64 merge 2004-11-12 15:36:31 +02:00
bell@sanja.is.com.ua
31f7811183 post-review fixes 2004-11-12 14:34:00 +02:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
2ad7d5c662 Bug#6123 - GRANT USAGE creates useless mysql.db row
Prevent creation of a row which grants no rights
  Test included
2004-11-11 20:59:03 +00:00
konstantin@mysql.com
baf9771474 Cleanup in sql_acl.cc: thd->lex ->lex 2004-11-11 21:57:55 +03:00
monty@mysql.com
0ebc50b851 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-11-09 21:47:46 +02:00
monty@mysql.com
1087186657 Merge with 4.1 to get new thd->mem_root handling 2004-11-08 17:53:32 +02:00
monty@mysql.com
b903a129e2 Simpler arena swapping code
Now thd->mem_root is a pointer to thd->main_mem_root and THR_MALLOC is a pointer to thd->mem_root.
This gives us the following benefits:
- Allow us to easily detect if arena has already been swapped before (this fixes a bug in setup_conds() where arena was swaped twice in some cases)
- Faster swaps of arenas (as we don't have to copy the whole MEM_ROOT)
- We don't anymore have to call my_pthread_setspecific_ptr(THR_MALLOC,...) to change where memory is alloced. Now it's enough to set thd->mem_root
2004-11-08 01:13:54 +02:00
bell@sanja.is.com.ua
7eae926e26 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0
2004-11-06 12:46:46 +02:00
monty@mysql.com
7d3be517a4 Merge on pull 2004-11-03 13:01:38 +02:00
gluh@gluh.mysql.r18.ru
4c65a9447e WL#1437 :don't create new users with GRANT 2004-11-02 17:45:26 +03:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
bell@sanja.is.com.ua
3d389a038e fixed detection of updating table on which we select (BUG#6032) 2004-10-25 17:32:28 +03:00
dellis@goetia.(none)
d4c5e404ac sql_acl.cc:
Correcting problem with merge
2004-10-22 14:32:23 -05:00
dellis@goetia.(none)
8ac3b79008 After-merge fixes. 2004-10-22 14:19:42 -05:00
dellis@goetia.(none)
e1d5815341 sql_acl.cc:
BUG #5831  Post-review changes, merging improvements from Monty.
2004-10-22 13:41:40 -05:00
bell@sanja.is.com.ua
3288007235 fixed db/user privileges getting (BUG#5976) 2004-10-22 15:43:22 +03:00
bell@sanja.is.com.ua
42d6d6765a Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
2004-10-20 16:11:16 +03:00
bell@sanja.is.com.ua
4714a6e744 errors without code removed
net_printf/send_error calls replaced by my_error family functions
-1/1 (sent/unsent) error reporting removed
(WL#2133)
2004-10-20 04:04:37 +03:00
monty@mishka.local
04c23808a8 Review of all code pushed since last review
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify
2004-10-20 01:28:42 +03:00
dellis@goetia.(none)
a4aec769b0 sql_acl.cc:
BUG #5831 Revoke privileges in a loop until no more privileges are revoked, because acl_dbs and column_priv_hash can re-organize during privilege removal.
2004-10-18 20:25:47 -05:00
timour@mysql.com
8ab4a7a101 Merge with implementation of WL#1724. 2004-10-11 10:47:08 +03:00
bell@sanja.is.com.ua
09e9651acc fix privileges for old style privileges tables on fly (as it do mysql_fix_privilege_tables dut if we have not it run)
fixed forgoten test
2004-10-10 18:51:02 +03:00
monty@mysql.com
d2a5548431 Using MySQL 4.0 with privilege tables from 5.0 caused a crash.
(Fixed this by backporting some logic from 4.1)
2004-10-08 16:32:56 +03:00
monty@mysql.com
6239edc1d1 After merge fixes
Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code
2004-10-07 10:50:13 +03:00
bell@sanja.is.com.ua
3ef0b19cd3 fixed & added comments (according to Igor's review and a bit more) 2004-10-07 01:45:06 +03:00
monty@mysql.com
c27d22b44e Reverted patch for new usage of open_count as it caused more problems than it solved
Cleaned up patch for checking locks for multi-table updates
2004-10-06 01:24:21 +03:00
dellis@goetia.(none)
ce6f076315 grant.test, grant.result, sql_acl.cc:
BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
2004-10-01 14:48:48 -05:00
dellis@goetia.(none)
8a12b5add0 logging_ok:
Logging to logging@openlogging.org accepted
sql_acl.cc, grant.test, grant.result:
  BUG 5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
2004-10-01 07:50:26 -05:00
bell@sanja.is.com.ua
74e7df0d80 SHOW CREATE VIEW (TABLE) privilege now reqiere show create privilege
(BUG#4777)
2004-09-17 22:23:59 +03:00
monty@mysql.com
31122efde7 Merge with 4.1
(Includes merge of arena code in 4.1 and 5.0)
2004-09-06 15:14:10 +03:00
serg@serg.mylan
62c2f1c161 sql_print_error cleanup 2004-09-04 20:17:09 +02:00
monty@mysql.com
46ff90738b Merge with pulled code 2004-09-03 22:38:45 +03:00
monty@mysql.com
cbd67f49e1 Cleanup of new code pushed into 5.0 since last pull
Merged the different find_xxxx_table_in_list functions to one + some inline functions
2004-09-03 21:43:04 +03:00
serg@serg.mylan
b60713c033 bug in my_strnncoll_utf8 (and friends) fixed
cleanups
better, charset-dependent, ft_max_len_for_sort value
2004-08-30 08:37:36 +02:00
timour@mysql.com
e2cd3dd1ce WL#1724 "Min/Max Optimization for Queries with Group By Clause"
- after-review changes
- merged with the source tree from 204-08-27
2004-08-27 16:37:13 +03:00
bell@sanja.is.com.ua
7e446b8349 Item name for VIEW added to find_field_in_table (BUG#5147) 2004-08-27 00:08:59 +03:00
monty@mysql.com
ea687ba5da Portability fixes
Fixed bug in end space handle for WHERE text_column="constant"
2004-08-26 18:26:38 +03:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
ram@gw.mysql.r18.ru
798952dcf2 A fix (Bug#4898: User privileges depending on ORDER BY Settings of table db) 2004-08-12 09:41:35 +05:00
konstantin@mysql.com
d3e520ce7e Port of cursors to be pushed into 5.0 tree:
- client side part is simple and may be considered stable
- server side part now just joggles with THD state to save execution
  state and has no additional locking wisdom.
  Lot's of it are to be rewritten.
2004-08-03 03:32:21 -07:00
serg@serg.mylan
e8d23cfa26 followup to SET PASSWORD fix 2004-08-01 17:21:55 +02:00
serg@serg.mylan
2852862c68 apply in SET PASSWORD same checks as in GRANT, to let only valid hashes through 2004-07-30 22:05:08 +02:00
bell@sanja.is.com.ua
bc98f2146d made different fields for view updatebility in principle and updatability during this execution (BUG#4601) 2004-07-22 17:52:04 +03:00
bell@sanja.is.com.ua
8bc592f1b0 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2004-07-20 22:10:47 +03:00
serg@serg.mylan
8d080cbcfa manual merge 2004-07-20 15:34:57 +02:00
bell@sanja.is.com.ua
4246f40065 fixed case when frivileges check switched off (BUG#4631) 2004-07-20 01:01:02 +03:00
serg@serg.mylan
acfcf76228 make acl_init() more robust -
don't be confused if  new privilege - ENUM ('N','Y') - columns are added (mostly because of downgrade)
  don't expect NOT NULL fields to never contain a NULL :) - somebody may've changed table definition, or we may be reading the wrong column
2004-07-19 16:01:53 +02:00
miguel@hegel.txg
b3b598d19c Fixes for bug #4571 (Windows compabilities) 2004-07-16 03:47:17 -03:00
bell@sanja.is.com.ua
9336d36cf8 VIEW
two TABLE_LIST copy eliminated
2004-07-16 01:15:55 +03:00
monty@mysql.com
31fe2837f9 Merge with 4.1 2004-07-12 08:20:24 +03:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
antony@ltantony.rdg.cyberkinetica.com
58cec1fd6a Bug#4407 - assertion in ha_myisam.cc
Fix assertion failure where ha_myisam::index_next() is called
  without first calling ha_myisam::ha_index_init()
2004-07-06 16:30:50 +01:00
serg@serg.mylan
c03addab79 merged 2004-06-23 12:36:07 +02:00
serg@serg.mylan
3f1c4ba745 handler interface cleanups:
more logical table/index_flags
  return  HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
  max_keys and other limits renamed to max_supported_keys/etc
  max_keys/etc are now wrappers to max_supported_keys/etc 
  ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing
2004-06-23 12:29:05 +02:00
monty@mysql.com
b11d258835 Merge with 4.0.21 2004-06-18 04:38:58 +03:00
monty@mysql.com
ff223db0fe Merge with 3.23 to get latest bug fixes 2004-06-10 11:59:45 +03:00
monty@mysql.com
d8b6322860 Merge 2004-06-09 12:34:22 +03:00
monty@mysql.com
4cb62eb001 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-06-02 12:14:36 +03:00
serg@serg.mylan
dc5a7f8030 cleanup 2004-06-02 00:27:59 +02:00
serg@serg.mylan
6341c93d77 check_scramble_323 shuold ensure that the scramble has the correct length 2004-06-01 23:58:33 +02:00
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +03:00
bell@sanja.is.com.ua
4c8387706a correct table_hash_search call 2004-05-31 21:10:15 +03:00
serg@serg.mylan
2e1ded2fe1 backport wild_compare fix from 4.1 - bug#3924 2004-05-29 17:52:20 +02:00
pem@mysql.com
71eddc362e Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
dlenev@brandersnatch.localdomain
c095ce828e Fix for bug which caused grant.test fail on darwin7.3. We were converting db and table
names to lower case using latin1 instead of utf-8 in sql_acl.cc if lower_case_table_names 
was on. Also replaced in other such places system_charset_info with files_charset_info
for consistency.
2004-05-22 23:41:58 +04:00
monty@mishka.local
a79a3f5724 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
2004-05-16 14:49:32 +03:00
monty@mishka.local
314a8bf114 key_cmp -> key_cmp_if_same
New records_in_range() interface (similar to read_range())
Macros for faster bitmap handling
Simplify read_range() code (#WL1786)
New general key_cmp() function to compare keys
2004-05-16 14:48:32 +03:00
bar@bar.intranet.mysql.r18.ru
2fc1d5c146 Bug #3403 Wrong encoding in SHOW GRANTS, EPLAIN SELECT output
This change fixes SHOW GRANTS problem, while EXPLAIN will be fixed
in a separate patch.
2004-05-14 12:16:27 +05:00
monty@mysql.com
116f61c656 Don't automaticly generate a new key for a foreign key constraint if there is already a usable key.
Prefer not automatic keys before automatic keys. If there is two conf
2004-05-12 00:29:52 +03:00
monty@mysql.com
1d528a4d55 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-05-11 12:21:38 +03:00
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
monty@mysql.com
28673669a4 Merge with 4.0 to get security patch for check_grant_colum 2004-05-06 13:42:26 +03:00
monty@mysql.com
f2991bc410 Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0 2004-05-06 11:42:35 +03:00
monty@mysql.com
a16c829c04 Remove not used variable 2004-05-06 11:42:23 +03:00
monty@mysql.com
a5d8b846fa after merge fixes 2004-05-05 21:24:21 +03:00
monty@mysql.com
d21d49a32a Merge with 4.0.19 2004-05-05 17:05:24 +03:00
monty@mysql.com
59ddd8c738 Fix to handle unsigned data in prepared statements (Bug #3447)
Fixed security problem that password was temporarly reset when someone changed GRANT for a user. (Bug #3404)
Fixed problem with PROCEDURE analyse() and impossible WHERE (Bug #2238)
Don't auto-repair tables in mysqlcheck if table type doesn't support 'check' command.
2004-05-04 15:02:38 +03:00
bell@sanja.is.com.ua
2fd0a66591 fixed db name and layout (can cause very rare race condition bug) 2004-05-04 13:07:36 +03:00
monty@mysql.com
f10d098f7d Fixed http address in some scripts (Bug #3460)
Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19)) (portability fix)
Fixed that INTERVAL can handle big integers. (Bug #3498)
Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473)
2004-04-28 17:45:08 +03:00
bell@sanja.is.com.ua
a535342d57 after review PS fixes 2004-04-10 01:14:32 +03:00
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
serg@serg.mylan
6ebf869b40 merged 2004-04-07 16:20:46 +02:00
bell@sanja.is.com.ua
560a9f66d3 after review changes 2004-04-07 13:25:24 +03:00
serg@serg.mylan
e8eda8129f ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
Field::val_str simplification, comment
2004-04-06 21:35:26 +02:00
bell@sanja.is.com.ua
1e4af935c1 removed old way to prevent using stack tables for caching Items in PS
fixed error code in union test
2004-04-04 03:05:44 +03:00
dlenev@brandersnatch.localdomain
f38e0a935d Merge of fix for bug #2050 and bug #3307 2004-03-31 22:17:10 +04:00
dlenev@brandersnatch.localdomain
4122188cc2 Fix for Bug #3307 "FLUSH TABLES sometimes breaks prepared statement
table resolution".
Added members to Item_ident for storing original db, table and field
names since those that set later from Field have shorter life-time 
than required by prep. stmt. So we need to restore original names in 
Item_ident::cleanup(). Also now using special construnctor for creation
of Item_field from Field object that ensures that table and field name 
have big enough life-time.

"Fix" for bug #2050 "10 to 1 performance drop with server 4.1.1"
Clean ups in implementation of caching of field number in table.
Added caching of table in which field is found in find_field_in_tables().
2004-03-31 21:25:55 +04:00
monty@mysql.com
4bc6b551f8 false/true -> FALSE/TRUE
Fixes after last merge
2004-03-30 02:32:41 +03:00
dlenev@brandersnatch.localdomain
9e28b7698d "Fix" for BUG #2050 "10 to 1 performance drop with server 4.1.1".
Actually it is not a bug but right behavior observed as pefomance 
degradation after we have forced Item_field::fix_fields() to 
re-execute each time when we are executing prep stmt.

This patch implements small optimization which heals this bad 
behavior. We are caching field position in TABLE::field array in
Item's member and are using this position for speeding up field
lookups in fix_fields() in case of its re-execution.
2004-03-28 04:11:54 +04:00
monty@mysql.com
d54b3f8d25 Merge with 5.0 2004-03-26 13:20:05 +02:00
monty@mysql.com
034a2f357f Speed up things if mysql.proc doesn't exists 2004-03-26 13:14:40 +02:00
gluh@gluh.mysql.r18.ru
84e04c74c5 Fix for bug#3086: SHOW GRANTS doesn't follow ANSI_QUOTES 2004-03-17 16:19:09 +04:00
pem@mysql.comhem.se
1631ba625f Fixed BUG#2777: Stored procedure doesn't observe definer's rights.
SQL SECURITY DEFINER must enforce reduced rights too, not just additional rights.
2004-03-02 11:52:19 +01:00
Sinisa@sinisa.nasamreza.org
7f3771bc76 fix for a bug #2953.
When password was granted with a global grant, then granting 
privileges on database level, without password being specified, 
will temporary (in memory) set password to ''.
2004-03-01 21:54:08 +02:00
guilhem@mysql.com
6ebedbb6e3 temporary undo needed for merge 2004-02-28 22:33:47 +01:00
guilhem@mysql.com
8bfb87ced5 Fix for BUG#2757
"--read-only gives weird error on update".
It is not fixable in 4.0 because it requires modifying
the sql/share/*/errmsg.txt files. So it is fixed in 4.1 like this:
the ER_SKIP_GRANT_TABLES is replaced by a more generic
ER_OPTION_PREVENTS_STATEMENT which can be used both for
"can't do this because of --skip-grant-tables" and
"can't do this because of --read-only" (for this we don't use
ER_CANT_UPDATE_WITH_READLOCK anymore).
So now the message for --read-only is:
"The MySQL server is running with the --read-only option so
cannot execute this statement".
2004-02-21 15:15:26 +01:00
monty@mysql.com
050af89dd8 Merge with public tree 2004-02-16 10:31:05 +02:00
Sinisa@sinisa.nasamreza.org
125fb04b87 merge fixes 2004-02-11 19:15:02 +02:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
pem@mysql.com
c8585f3283 Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
bell@sanja.is.com.ua
ff0a6e9686 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
2004-02-09 15:01:51 +02:00
bell@sanja.is.com.ua
74a9ca1991 ufter revview fix (BUG#2120) 2004-02-09 14:44:03 +02:00
monty@mysql.com
480b082cf4 merge 2004-02-05 18:14:48 +01:00
Sinisa@sinisa.nasamreza.org
9e62e21daa sql_acl.cc:
Fix for a bug #2546 in 4.1.2 that prevented table / column privileges from being loaded on startup.
2004-02-03 22:54:59 +02:00
monty@mysql.com
d51263b6e5 Ensure that privileges are tested properly for multi-table-updates.
Now one need only SELECT privilege for tables that are only read in
UPDATE statements with many tables. (Bug #2377).
2004-02-03 19:17:23 +01:00
bell@sanja.is.com.ua
2a9cd37cd6 now all tables of query are locked in one place (including derived tables)
fixed BUG#2120 and other problem with EXPLAINing derived tables
2004-02-01 15:30:32 +02:00
gluh@gluh.mysql.r18.ru
fb6338d1a3 Fix for bug#2505: MySQL reports "out of memory"
when DROP USER if --skip-grant-tables
2004-01-26 20:31:38 +04:00
monty@mysql.com
8d23612303 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-26 12:32:24 +02:00
monty@mysql.com
458a947f6c Fixed bug in table level privilege GRANT handling. (Bug #2178)
Portability fixes
2003-12-26 12:32:02 +02:00
serg@serg.mylan
0da22d5bd8 typo fixed 2003-12-21 21:18:59 +01:00
pem@mysql.com
12187684ca Merging lex-pointer change from 4.1 to 5.0. 2003-12-19 20:13:48 +01:00
konstantin@oak.local
d37da004f6 THD::lex now points to THD::main_lex like in 5.0
All tests pass (client_test included)
2003-12-19 20:52:13 +03:00
pem@mysql.com
99e0ae85c7 Merge 4.1 to 5.0. 2003-12-19 18:03:27 +01:00
monty@mysql.com
e0cc6799ec Merge with 4.0.17 2003-12-17 17:35:34 +02:00
guilhem@mysql.com
e56c8c61d8 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-12-16 11:12:40 +01:00
guilhem@mysql.com
db2d812d1b Fix for BUG#2083
"EE_ error codes (EE_DELETE, EE_WRITE) end up in the binlog, making slave stop".
The problem was that during execution of the command on the master, an error
can occur (for example, not space left on device, then mysqld waits and when
there is space it completes successfully: so finally it worked but the error
EE_WRITE remains in thd->net.last_errno and thd->net.last_error).
To know if finally the command succeeded, we test the 'error' variable in
every place, and if it shows no failure we reset thd->net.last_err* using
the function THD::clear_error() which is backported from 4.1.
A new test to see if now only real errors get to the binlog (note: the test
uses "rm").

Also a bit of memory free/alloc saving in log_event.cc (do not free the whole
mem_root after every query in the slave SQL thread: we can keep the initial
block of it; which will be freed when the thread terminates).
2003-12-16 11:10:50 +01:00
pem@mysql.comhem.se
07541b6abf WL#1365: Implement definer's rights execution of stored procedures.
(Also put the hostpart back in the definer column.)
2003-12-13 16:40:52 +01:00
monty@mysql.com
f995a5f4aa Fix autoincrement for signed columns (Bug #1366)
Fixed problem with char > 128 in QUOTE() function. (Bug #1868)
Disable creation of symlinks if my_disable_symlink is set
Fixed searching of TEXT with end space. (Bug #1651)
Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711)
Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)
Fixed timestamp.test
2003-12-12 22:26:58 +02:00
pem@mysql.com
24a2ae44a3 Merged 4.1 -> 5.0 2003-12-09 19:00:34 +01:00
monty@mysql.com
e8aef44349 Portability fixes for Windows 2003-12-08 12:25:37 +02:00
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
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
pem@mysql.telia.com
9c3a7a6ba3 Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02: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
monty@mashka.mysql.fi
60dfb25be3 Give warning if MySQL doesn't honor given storage engine
Allow syntax CREATE TABLE t1 (LIKE t2)
2003-05-13 11:15:11 +03:00
monty@mashka.mysql.fi
5d5d5b08ac Merge to get security patch 2003-05-08 00:12:46 +03:00
monty@mashka.mysql.fi
71ce598fa2 Security patch to remove wrong error when one had a global update/delete privilige and a database specific SELECT privilege. 2003-05-07 23:59:24 +03:00
vva@eagle.mysql.r18.ru
afd581edd3 made lex a pointer in THD 2003-05-05 14:54:37 -04:00
serg@serg.mylan
784fb81426 INSERT ... UPDATE ... VALUES() 2003-05-03 01:16:56 +02:00
Sinisa@sinisa.nasamreza.org
7a450cb131 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-04-30 14:27:51 +03:00
monty@narttu.mysql.fi
9e4f394e59 Fix reference to not initialized memory
Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
2003-04-30 10:15:09 +03:00
Sinisa@sinisa.nasamreza.org
b086445181 merge fix 2003-04-29 14:35:10 +03:00
serg@serg.mylan
d13e4fc532 CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is) 2003-04-29 00:15:18 +02:00
monty@mashka.mysql.fi
51eed4b48c Fix for openssl on Solaris
Fix for grant bug with SELECT *
2003-04-28 10:32:56 +03:00
Sinisa@sinisa.nasamreza.org
9298d590ac properly back quoting db.table names in SHOW GRANTS 2003-04-23 20:42:07 +03:00
Sinisa@sinisa.nasamreza.org
fd58dc20bb Fixing few small problems in SET PASSWORD:
* comparison with correct cached variable
* preventing check_change_password to be called twice, once from 
  set_var::check and the other time from change_password itself
2003-04-21 22:54:02 +03:00
gluh@gluh.mysql.r18.ru
05817b7311 Fix bug: Crash server when grant ssl options are used and ssl handshake is not set 2003-04-16 15:05:47 +05:00
monty@mashka.mysql.fi
3e6c350f64 Fixed bug in SUM() with NULL:s
Added logging of warnings for failed connections with ssl.
Fixed bug in symbolic link handling on Windows
2003-04-15 22:04:16 +03:00
pem@mysql.com
736e78251e Merging 4.1 to 5.0. 2003-04-04 13:45:35 +02:00
monty@narttu.mysql.fi
a7708c7904 Merge with 4.0 2003-04-03 21:19:12 +03:00
guilhem@mysql.com
654410a3d3 Deprecated the update log (Sprint task #792). Now --log-update
just turns on --log-bin and prints a warning. SQL_LOG_UPDATE
is handled in two ways (see mysqld.cc for comments).
2003-04-02 00:15:20 +02:00
guilhem@mysql.com
4824d6c66c Sprint task #856 : make table exclusion rules (in replication)
apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
GRANT and REVOKE will not be replicated on the slave.
2003-04-01 22:49:40 +02:00
bar@bar.mysql.r18.ru
5b50426f8f Some optimization in CHARSET_INFO:
We don't need separate hash_sort() and hash_caseup()
  We don't need tosort(). strnxfrm will do the same.
2003-04-01 12:45:16 +05:00
bar@bar.mysql.r18.ru
caf31a0790 Preparing to client<->server autoconvert 2003-03-17 13:14:04 +04:00
bar@bar.mysql.r18.ru
4b5bfe990f sql_acl.cc, item.h:
use of new argument
sql_analyse.h:
  macros from mysql_priv.h. Should be deleted soon.
mysql_priv.h:
  _default_charset_info has been removed
item_cmpfunc.h:
  Use cmp_charset
hostname.cc, hash_filo.h:
  Move charset to constructor argument
2003-03-07 12:21:32 +04:00
lenz@mysql.com
2b1f8fbe67 Reverted Sinisa's patch "Fixing the error messages returned on GRANT
commands" again, since this problem had been fixed differently
already (Thanks to Serg for spotting this)
2003-02-19 16:16:27 +01:00
lenz@mysql.com
64b2048914 - Applying Sinisa's Patch "Fixing the error messages returned on
GRANT commands"
2003-02-19 14:50:40 +01:00
monty@mashka.mysql.fi
acf8993439 Fixed problem when connecting to user without a password.
Fixed problem with LIKE and BINARY
2003-02-14 11:47:41 +02:00
monty@mashka.mysql.fi
e327393e9d Fixed a lot of wrong memory references as reported by valgrind
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
2003-02-12 21:55:37 +02:00
monty@mashka.mysql.fi
15aee37456 merge 2003-02-10 18:01:29 +02:00
serg@sergbook.mysql.com
14b4b58de7 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-02-10 14:56:30 +01:00
serg@sergbook.mysql.com
3cc3ec177f error message fixed (new error code will be introduced in 4.1) 2003-02-10 14:47:39 +01:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
bar@bar.mysql.r18.ru
735399a850 Move latin1 into a separarte file 2003-01-29 17:31:20 +04:00
monty@mashka.mysql.fi
7436e9ec97 Merge 2003-01-21 21:28:51 +02:00
monty@mashka.mysql.fi
25c393a12e Portability fixes (for windows)
Some changes to the prepared statement protocol to make it easier to use and faster.
2003-01-21 21:07:59 +02:00
Sinisa@sinisa.nasamreza.org
74f478f9a5 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-01-21 15:54:36 +02:00
hf@deer.mysql.r18.ru
389680e04e Conflicts resolving 2003-01-20 18:59:45 +04:00