dlenev@mysql.com
0ea8f29186
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-tzfix
2004-10-22 20:21:55 +04:00
monty@mysql.com
3afecef4df
Fix compiler warnings (detected by Intel's C++ compiler)
...
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094 )
2004-10-22 18:44:51 +03:00
hf@deer.(none)
497fe7f71e
Fix for bug #6117 (Centroid() crashes server)
...
I learned that one shouldn't use String::set in val_str() methods...
2004-10-22 20:32:02 +05:00
ingo@mysql.com
20cea41f76
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug6151
2004-10-22 17:03:26 +02:00
bell@sanja.is.com.ua
3288007235
fixed db/user privileges getting (BUG#5976)
2004-10-22 15:43:22 +03:00
konstantin@mysql.com
33c97a499b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/media/sda1/mysql/mysql-4.1-6050
2004-10-22 15:59:58 +04:00
konstantin@mysql.com
a7c52d755b
A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field
...
names with ident. tables fr. diff. schemata": revise all uses of
Item_field and make them prepared-statements friendly when necessary.
2004-10-22 14:47:35 +04:00
guilhem@mysql.com
42d103b67a
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-10-22 11:12:14 +02:00
ram@gw.mysql.r18.ru
7590eed389
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
2004-10-22 12:48:37 +05:00
ram@gw.mysql.r18.ru
b7c57329a4
A fix (bug #5999 Typo in code, wrong config variable naming).
2004-10-22 12:47:32 +05:00
bell@sanja.is.com.ua
7f896917b8
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-10-22 09:53:08 +03:00
bell@sanja.is.com.ua
b1617371d2
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-22 09:51:20 +03:00
kent@mysql.com
7a640b44dd
mysqltest.c, mysqltest.result, mysqltest.test:
...
Added SQLSTATE matching support to test engine
mysqltest.result, mysqltest.test:
new file
2004-10-22 05:56:27 +02:00
igor@rurik.mysql.com
dd44a4b4d4
ps.result:
...
Post-merge fixes.
sql_select.cc:
Post-merge cleanup.
2004-10-21 14:46:40 -07:00
bell@sanja.is.com.ua
ded12c828d
Check of temporary tables hiding for query fetched from QC (BUG#6084)
2004-10-21 23:56:12 +03:00
ingo@mysql.com
0d044c6869
BUG#6151 - myisam index corruption.
...
Removed the assumption of a certain key order.
Since 4.1, keys are padded with blanks for comparison.
Hence, shorter keys sort behind longer keys, if the
data bytes have values below BLANK.
2004-10-21 22:17:10 +02:00
bell@sanja.is.com.ua
ed7b229a28
added support of view and CHECK OPTION of view to LOAD DATA (BUG#5996)
2004-10-21 21:53:27 +03:00
dlenev@brandersnatch.localdomain
e6a44b719a
Fix for bug #6116 "SET time_zone := ... requires access to
...
mysql.time_zone* tables".
We are excluding implicitly used time zone tables from privilege
checking.
2004-10-21 22:18:00 +04:00
joerg@mysql.com
a7d054d18f
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2004-10-21 17:57:48 +02:00
joerg@mysql.com
a77d91e82e
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1
2004-10-21 17:47:05 +02:00
bell@sanja.is.com.ua
926537600e
new behaviour of CHECK option build, for mor efficience and more correct:
...
check option build only according most top VIEW CHECK OPTION TYPE (BUG#5993)
2004-10-21 18:10:59 +03:00
ram@gw.mysql.r18.ru
136652522e
A fix (bug #6138 : MOD operator should not round non-integral argument).
2004-10-21 19:52:55 +05:00
bell@sanja.is.com.ua
1bd699e04c
value should be checked after 'before' trigger work (BUG#5992)
2004-10-21 17:05:45 +03:00
joerg@mysql.com
61ca493a8d
Adapt 'ps_10nestset' to standard test style; correct a typing error in 'ps_11bugs'.
2004-10-21 16:02:12 +02:00
bell@sanja.is.com.ua
73e4ac715d
inserting single value with check option failed always get error (part of BUG#5995)
2004-10-21 14:32:10 +03:00
bell@sanja.is.com.ua
05af0c26c1
fixed default behaviour of WITH CHECK OPTIONS according to standard (BUG#5989)
2004-10-21 13:39:17 +03:00
bell@sanja.is.com.ua
370edf063d
Allow inheriting check options if view have not WHERE clause (BUG#5988)
2004-10-21 13:30:25 +03:00
bell@sanja.is.com.ua
84d4c4eb05
fixed printing of substring_index (BUG#5911)
2004-10-21 13:11:15 +03:00
bar@mysql.com
636ddd4128
ctype_uca.result:
...
Forgot to commit in the previous changeset
2004-10-21 14:54:17 +05:00
bar@mysql.com
e28976e0ef
Bug #5679 utf8_unicode_ci LIKE--trailing % doesn't equal zero characters
2004-10-21 14:48:37 +05:00
bar@mysql.com
e9fde8f54e
Allow cp932 characters to be stored in a SJIS column
2004-10-21 12:17:59 +05:00
igor@rurik.mysql.com
14641772ba
func_test.result, item_cmpfunc.cc:
...
Fixed bug #6187 : a wrong initial setting for const_item_cache
in Item_cond::fix_fields.
2004-10-20 14:52:30 -07:00
igor@rurik.mysql.com
f0bc019c86
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2004-10-20 13:17:06 -07:00
tomas@poseidon.ndb.mysql.com
eda3eb378d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-20 17:31:59 +00:00
tomas@poseidon.ndb.mysql.com
8ae6219c26
fix so that ndb handler can cope with char(0), mapped to char(1) for now
2004-10-20 17:22:58 +00:00
ram@gw.mysql.r18.ru
5c8a14e9b7
A fix (bug #6142 : SELECT DISTINCT on key field crashes server)
2004-10-20 21:01:52 +05:00
monty@mysql.com
b686f98f50
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-10-20 18:58:01 +03:00
tomas@poseidon.ndb.mysql.com
a1bd5432c4
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-20 15:58:00 +00:00
tomas@poseidon.ndb.mysql.com
0e114cc7e6
fix for wrong use of shell test
2004-10-20 15:56:57 +00:00
monty@mysql.com
4e63fb9891
After merge fixes
2004-10-20 17:28:40 +03:00
monty@mysql.com
e1218474b8
Merge with 4.0
2004-10-20 16:24:28 +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
d409547de4
changed function name to prevent injection wrong code from 4.1 (WL#2133)
2004-10-20 16:06:54 +03:00
monty@mysql.com
b32ffec8fd
Fix test case for innodb-lock
2004-10-20 16:04:28 +03:00
dlenev@mysql.com
a10ce662b4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-secfix
2004-10-20 17:02:15 +04:00
serg@serg.mylan
30947b7b0e
make linux to behave (like freebsd does :)
2004-10-20 14:13:07 +02:00
dlenev@brandersnatch.localdomain
75d816627c
Fix for bug #6173 "One can circumvent missing UPDATE privilege if
...
he has SELECT and INSERT privileges for table with primary key"
Now we set lex->duplicates= DUP_UPDATE right in parser if INSERT has
ON DUPLICATE KEY UPDATE clause, this simplifies insert_precheck()
function (this also fixes a bug) and some other code.
2004-10-20 16:04:43 +04:00
serg@serg.mylan
bbfb5f244a
the test moved from range.test to innodb.test - it should not be run when innodb is disabled
2004-10-20 12:56:49 +02:00
monty@mysql.com
1f8b3d0f22
Code cleanups (done during review of new code)
...
Rename innodb_table_locks_old_behavior -> innodb_table_locks
Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
(This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
2004-10-20 11:24:08 +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