summaryrefslogtreecommitdiff
path: root/storage/innobase/dict
diff options
context:
space:
mode:
authorunknown <tsmith/tim@siva.hindu.god>2006-10-20 13:44:49 -0600
committerunknown <tsmith/tim@siva.hindu.god>2006-10-20 13:44:49 -0600
commitff66bc05f741ec1d3041413f8dba14b4f7891501 (patch)
tree47207793ee0142b5f6b040246d711a34508ab320 /storage/innobase/dict
parent5fda3c2c88ddd016ba3c7065c1f265ce7db8f6cc (diff)
downloadmariadb-git-ff66bc05f741ec1d3041413f8dba14b4f7891501.tar.gz
Applied InnoDB snapshot 5.1-ss927
Fixes: - Bug #23368: crash during insert, table has foreign key pointing into other schema,permission storage/innobase/dict/dict0dict.c: Applied InnoDB snapshot 5.1-ss927 Revision r927: dict_print_info_on_foreign_key_in_create_format(): Use ut_print_name() instead of passing the wrong length to ut_print_namel(). (Bug #23368) ut_print_name(), ut_print_namel(): Document the special treatment of '/'. ut_print_namel(): Replace strchr() with memchr(), as the string might not be NUL-terminated. storage/innobase/include/ut0ut.h: Applied InnoDB snapshot 5.1-ss927 Revision r927: dict_print_info_on_foreign_key_in_create_format(): Use ut_print_name() instead of passing the wrong length to ut_print_namel(). (Bug #23368) ut_print_name(), ut_print_namel(): Document the special treatment of '/'. ut_print_namel(): Replace strchr() with memchr(), as the string might not be NUL-terminated. storage/innobase/ut/ut0ut.c: Applied InnoDB snapshot 5.1-ss927 Revision r927: dict_print_info_on_foreign_key_in_create_format(): Use ut_print_name() instead of passing the wrong length to ut_print_namel(). (Bug #23368) ut_print_name(), ut_print_namel(): Document the special treatment of '/'. ut_print_namel(): Replace strchr() with memchr(), as the string might not be NUL-terminated.
Diffstat (limited to 'storage/innobase/dict')
-rw-r--r--storage/innobase/dict/dict0dict.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
index d74d5036b1a..7c2fc18accd 100644
--- a/storage/innobase/dict/dict0dict.c
+++ b/storage/innobase/dict/dict0dict.c
@@ -4146,18 +4146,8 @@ dict_print_info_on_foreign_key_in_create_format(
dict_remove_db_name(
foreign->referenced_table_name));
} else {
- /* Look for the '/' in the table name */
-
- i = 0;
- while (foreign->referenced_table_name[i] != '/') {
- i++;
- }
-
- ut_print_namel(file, trx, TRUE,
- foreign->referenced_table_name, i);
- putc('.', file);
ut_print_name(file, trx, TRUE,
- foreign->referenced_table_name + i + 1);
+ foreign->referenced_table_name);
}
putc(' ', file);