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
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
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