diff options
| author | unknown <jan@hundin.mysql.fi> | 2004-10-14 15:36:36 +0300 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2004-10-14 15:36:36 +0300 |
| commit | dbe2739292987f9c310a392ebd8af8dd96f75b6b (patch) | |
| tree | 9a624ca9a10ab262e3fd87d859d44617a85f4e78 /innobase/dict | |
| parent | 761ae02ca77722f34744a912315d52a0c0f7fca6 (diff) | |
| download | mariadb-git-dbe2739292987f9c310a392ebd8af8dd96f75b6b.tar.gz | |
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.
innobase/dict/dict0dict.c:
Remove static.
innobase/include/dict0dict.h:
Add prototype for a function dict_scan_to
innobase/row/row0ins.c:
Add support for a LOAD DATA INFILE 'xxx' REPLACE INTO TABLE x. We should
take X-locks on both REPLACE and LOAD DATA...REPLACE queries to duplicate
records.
innobase/row/row0sel.c:
If innodb_locks_unsafe_for_binlog options is used we do not lock
gaps. Supremum record is really a dummy record i.e. gap, therefore
we do set locks there.
mysql-test/t/ctype_utf8.test:
Fix bug #6086: Add --disable_warnings and --enable_warnings around the
create table where engine=innodb.
Diffstat (limited to 'innobase/dict')
| -rw-r--r-- | innobase/dict/dict0dict.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c index fd98538d2ad..f670c0dc16d 100644 --- a/innobase/dict/dict0dict.c +++ b/innobase/dict/dict0dict.c @@ -2244,7 +2244,7 @@ dict_foreign_add_to_cache( Scans from pointer onwards. Stops if is at the start of a copy of 'string' where characters are compared without case sensitivity. Stops also at '\0'. */ -static + const char* dict_scan_to( /*=========*/ |