summaryrefslogtreecommitdiff
path: root/innobase/dict
diff options
context:
space:
mode:
authorunknown <marko@hundin.mysql.fi>2004-03-31 11:26:56 +0300
committerunknown <marko@hundin.mysql.fi>2004-03-31 11:26:56 +0300
commit7c9dba225113c4c0c891a17f88492edeffbc0471 (patch)
tree949265f6e4c66c8760da61187b436231f22f924d /innobase/dict
parent19b727adac9eb98dc10b09437965352b33cb42dc (diff)
downloadmariadb-git-7c9dba225113c4c0c891a17f88492edeffbc0471.tar.gz
InnoDB: Remove ut_str_contains() and replace it with strchr()
innobase/dict/dict0dict.c: Replace ut_str_contains() with strchr() innobase/include/ut0mem.h: Remove ut_str_contains(), a reinvented strchr() innobase/row/row0mysql.c: Replace ut_str_contains() with strchr() innobase/ut/ut0mem.c: Remove ut_str_contains(), a reinvented strchr()
Diffstat (limited to 'innobase/dict')
-rw-r--r--innobase/dict/dict0dict.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c
index 40697578cc5..67452c154e7 100644
--- a/innobase/dict/dict0dict.c
+++ b/innobase/dict/dict0dict.c
@@ -1002,7 +1002,7 @@ dict_table_rename_in_cache(
sprintf(foreign->foreign_table_name, "%s", table->name);
- if (ut_str_contains(foreign->id, '/')) {
+ if (strchr(foreign->id, '/')) {
ulint db_len;
char old_id[2000];
@@ -3331,7 +3331,7 @@ loop:
while (foreign != NULL) {
if (0 == ut_strcmp(foreign->id, id)
- || (ut_str_contains(foreign->id, '/')
+ || (strchr(foreign->id, '/')
&& 0 == ut_strcmp(id,
dict_remove_db_name(foreign->id)))) {
/* Found */
@@ -4059,7 +4059,7 @@ dict_print_info_on_foreign_key_in_create_format(
ulint cpy_len;
ulint i;
- if (ut_str_contains(foreign->id, '/')) {
+ if (strchr(foreign->id, '/')) {
/* Strip the preceding database name from the constraint id */
stripped_id = foreign->id + 1
+ dict_get_db_name_len(foreign->id);