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
igor@rurik.mysql.com
a03e5ad8e4
Merge for post-merge fixes for Item_equal patch.
2004-10-19 16:07:10 -07:00
igor@rurik.mysql.com
4c8e391718
table.h, sql_select.h:
...
Added the code processing on expressions for applying
multiple equalities.
sql_select.cc:
Post-merge fixes for Item_equal patch.
Added the code processing on expressions for applying
multiple equalities.
Many files:
Post-merge fixes for Item_equal patch.
item_cmpfunc.cc:
Post-merge fixes for Item_equal patch.
Fixed a problem when an equality field=const cannot be applied to
the predicate P(field,c) for constant propagation as a conversion
of field is needed.
item.h, item.cc:
Fixed a problem when an equality field=const cannot be applied to
the predicate P(field,c) for constant propagation as a conversion
of field is needed.
2004-10-19 14:12:55 -07:00
guilhem@mysql.com
2146e31ad8
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-10-19 22:33:39 +02:00
guilhem@mysql.com
41b808d224
Optimization: in the replication slave, we can avoid doing one strlen() per event's execution,
...
as we already have db_len in Log_event. Only if rewrite_db() changed the db we need a strlen
(so we now do the strlen() in rewrite_db). Plus a test (we had none for --replicate-rewrite-db :( ).
2004-10-19 22:27:19 +02:00
tomas@poseidon.ndb.mysql.com
8476fe9757
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-10-19 15:00:02 +00:00
ram@gw.mysql.r18.ru
ece5c9f293
A fix (bug #6101 : mysqldump writes invalid SQL).
2004-10-19 11:00:44 +05:00
tomas@poseidon.ndb.mysql.com
aed0390662
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-18 13:39:19 +00:00
serg@serg.mylan
5fd2c489fb
compatibility fix
...
test results corrected
2004-10-18 15:32:06 +02:00
bar@mysql.com
47f638054e
Bug #6139 UNION doesn't understand collate in the column of second select
2004-10-18 17:56:25 +05:00
tomas@poseidon.ndb.mysql.com
60cf2213fd
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-18 12:12:02 +00:00
bar@mysql.com
1596d46528
Bug #6040 can't retrieve records with umlaut characters in case insensitive manner
2004-10-18 15:23:24 +05:00
jan@hundin.mysql.fi
3c49aa7cfa
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/talle/mysql-4.1
2004-10-16 08:17:50 +03:00
joerg@mysql.com
1354b1bd5d
New tests for bug#1644 and bug#1676,
...
test for bug#1180 changed to table naming scheme 't#'.
2004-10-15 12:56:57 +02:00
joerg@mysql.com
09c09f04fb
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1
2004-10-15 10:34:40 +02:00
joreland@mysql.com
273209d259
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-15 08:11:45 +02:00
joreland@mysql.com
f5e57076d2
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-10-15 08:10:08 +02:00
jan@hundin.mysql.fi
d0930b8efd
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/talle/mysql-4.1
2004-10-15 08:24:58 +03:00
pem@mysql.comhem.se
4043c0f3db
Implemented the stored procedure data access characteristics:
...
NO SQL
CONTAINS SQL (default)
READS SQL DATA
MODIFIES SQL DATA
These are needed as hints for the replication.
(Before this, we did have the default in the mysql.proc table, but no support in the parser.)
2004-10-14 18:07:09 +02:00
jan@hundin.mysql.fi
d07ade5579
This patch removes unnecessary lock from the supremum record, takes
...
X-locks on duplicates also on LOAD DATA...REPLACE clause and
fixes a bug #6086 adding --disable_warnings and --enable_warnings around
the create table clauses in ctype_utf8 tests for InnoDB.
2004-10-14 15:36:36 +03:00