mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
Update to innoplug-1.0.4.
This commit is contained in:
parent
058cd62565
commit
bae6276d45
104 changed files with 5341 additions and 1173 deletions
|
|
@ -1693,6 +1693,11 @@ dict_index_find_cols(
|
|||
}
|
||||
|
||||
/* It is an error not to find a matching column. */
|
||||
fputs("InnoDB: Error: no matching column for ", stderr);
|
||||
ut_print_name(stderr, NULL, FALSE, field->name);
|
||||
fputs(" in ", stderr);
|
||||
dict_index_name_print(stderr, NULL, index);
|
||||
fputs("!\n", stderr);
|
||||
ut_error;
|
||||
|
||||
found:
|
||||
|
|
@ -2974,7 +2979,7 @@ scan_more:
|
|||
} else if (quote) {
|
||||
/* Within quotes: do not look for
|
||||
starting quotes or comments. */
|
||||
} else if (*sptr == '"' || *sptr == '`') {
|
||||
} else if (*sptr == '"' || *sptr == '`' || *sptr == '\'') {
|
||||
/* Starting quote: remember the quote character. */
|
||||
quote = *sptr;
|
||||
} else if (*sptr == '#'
|
||||
|
|
|
|||
|
|
@ -103,7 +103,9 @@ dict_mem_table_free(
|
|||
ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
|
||||
ut_d(table->cached = FALSE);
|
||||
|
||||
#ifndef UNIV_HOTBACKUP
|
||||
mutex_free(&(table->autoinc_mutex));
|
||||
#endif /* UNIV_HOTBACKUP */
|
||||
mem_heap_free(table->heap);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue