diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-13 20:54:20 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-13 20:54:20 +0200 |
| commit | 6e31c2ca7d7881d26c86c29e8abd0e1528d6613b (patch) | |
| tree | 053b9c4d48bf88ba54d5cf728bfebadb38d1a548 /innobase/dict | |
| parent | 9385d3aba530562b1ddcecedeb6dd61cd3d63d96 (diff) | |
| parent | b554ef6b10db3d6640935cafe0d7ebaf8034ae13 (diff) | |
| download | mariadb-git-6e31c2ca7d7881d26c86c29e8abd0e1528d6613b.tar.gz | |
merge
innobase/btr/btr0cur.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
Docs/manual.texi:
Merge
Diffstat (limited to 'innobase/dict')
| -rw-r--r-- | innobase/dict/dict0dict.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c index 4b503a3dc49..e68e815f0c9 100644 --- a/innobase/dict/dict0dict.c +++ b/innobase/dict/dict0dict.c @@ -1765,9 +1765,8 @@ dict_scan_col( col = dict_table_get_nth_col(table, i); if (ut_strlen(col->name) == (ulint)(ptr - old_ptr) - && 0 == ut_memcmp(col->name, old_ptr, + && 0 == ut_cmp_in_lower_case(col->name, old_ptr, (ulint)(ptr - old_ptr))) { - /* Found */ *success = TRUE; @@ -1831,11 +1830,20 @@ dict_scan_table_name( break; } } - +#ifdef __WIN__ + ut_cpy_in_lower_case(second_table_name + i, old_ptr, + ptr - old_ptr); +#else ut_memcpy(second_table_name + i, old_ptr, ptr - old_ptr); +#endif second_table_name[i + (ptr - old_ptr)] = '\0'; } else { +#ifdef __WIN__ + ut_cpy_in_lower_case(second_table_name, old_ptr, + ptr - old_ptr); +#else ut_memcpy(second_table_name, old_ptr, ptr - old_ptr); +#endif second_table_name[dot_ptr - old_ptr] = '/'; second_table_name[ptr - old_ptr] = '\0'; } |