diff options
| author | unknown <monty@mysql.com> | 2004-05-12 00:29:52 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-12 00:29:52 +0300 |
| commit | d3fcd8d4c0e0425433924987afbd5b43bec8e93e (patch) | |
| tree | 11c75fdf1dd0dbc84178dbfbb39f5a584d19d581 /strings/strings-x86.s | |
| parent | 7b4cbde8edeb461ddacdc4d06d33fb8705380f40 (diff) | |
| download | mariadb-git-d3fcd8d4c0e0425433924987afbd5b43bec8e93e.tar.gz | |
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
BitKeeper/etc/ignore:
added *.d
include/my_base.h:
Added flag for automaticly generated key
mysql-test/r/constraints.result:
Update tests after bug fix
mysql-test/r/create.result:
Update tests after bug fix
mysql-test/r/innodb.result:
Added test of automatic creation of foreign keys
mysql-test/t/innodb.test:
Added test of automatic creation of foreign keys
mysql-test/t/key_cache.test:
Portability fixes (64 BIT os)
sql/sql_acl.cc:
Indentation fixes
sql/sql_class.cc:
Fix key comparison to handle prefix and optionally key segments in different order.
sql/sql_class.h:
Added flag for automaticly generated keys
sql/sql_parse.cc:
Added flag for automaticly generated keys
sql/sql_table.cc:
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 conflicting automatic keys, prefer the longer one.
sql/sql_yacc.yy:
Added flag for automaticly generated keys
strings/strings-x86.s:
Portability fix.
Diffstat (limited to 'strings/strings-x86.s')
| -rw-r--r-- | strings/strings-x86.s | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/strings/strings-x86.s b/strings/strings-x86.s index d316c34febb..30a7517a372 100644 --- a/strings/strings-x86.s +++ b/strings/strings-x86.s @@ -43,7 +43,9 @@ bmove_align: .ba_20: pop %esi movl %edx,%edi ret - .size bmove_align,.end-bmove_align + +.bmove_align_end: + .size bmove_align,.bmove_align_end-bmove_align # Move a string from higher to lower # Arg from_end+1,to_end+1,length |