mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

InnoDB: Fix ALTER TABLE t DISCARD TABLESPACE (Bug #5851)

Browse source
This commit is contained in:
marko@hundin.mysql.fi 2004-10-04 20:38:23 +03:00
commit d4b3df6d31
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
innobase/include/ut0mem.h
View file

@ -117,7 +117,7 @@ int
ut_strcmp(const void* str1, const void* str2);
/**************************************************************************
Determine the length of a string when it is quoted with ut_strcpyq(). */
Compute strlen(ut_strcpyq(str, q)). */
UNIV_INLINE
ulint
ut_strlenq(
@ -127,7 +127,9 @@ ut_strlenq(
char q); /* in: the quote character */
/**************************************************************************
Make a quoted copy of a string. */
Make a quoted copy of a NUL-terminated string. Leading and trailing
quotes will not be included; only embedded quotes will be escaped.
See also ut_strlenq() and ut_memcpyq(). */
char*
ut_strcpyq(
@ -138,7 +140,9 @@ ut_strcpyq(
const char* src); /* in: null-terminated string */
/**************************************************************************
Make a quoted copy of a fixed-length string. */
Make a quoted copy of a fixed-length string. Leading and trailing
quotes will not be included; only embedded quotes will be escaped.
See also ut_strlenq() and ut_strcpyq(). */
char*
ut_memcpyq(

2
innobase/include/ut0mem.ic
View file

@ -49,7 +49,7 @@ ut_strcmp(const void* str1, const void* str2)
}
/**************************************************************************
Determine the length of a string when it is quoted with ut_strcpyq(). */
Compute strlen(ut_strcpyq(str, q)). */
UNIV_INLINE
ulint
ut_strlenq(

4
innobase/row/row0mysql.c
View file

@ -1988,9 +1988,9 @@ row_discard_tablespace_for_mysql(
"new_id_high INT;\n"
"table_name CHAR;\n"
"BEGIN\n"
"table_name := ";
"table_name := '";
static const char discard_tablespace_proc2[] =
";\n"
"';\n"
"new_id_high := %lu;\n"
"new_id_low := %lu;\n"
"new_id := CONCAT(TO_BINARY(new_id_high, 4), TO_BINARY(new_id_low, 4));\n"

8
innobase/ut/ut0mem.c
View file

@ -313,7 +313,9 @@ ut_free_all_mem(void)
}
/**************************************************************************
Make a quoted copy of a string. */
Make a quoted copy of a NUL-terminated string. Leading and trailing
quotes will not be included; only embedded quotes will be escaped.
See also ut_strlenq() and ut_memcpyq(). */
char*
ut_strcpyq(
@ -333,7 +335,9 @@ ut_strcpyq(
}
/**************************************************************************
Make a quoted copy of a fixed-length string. */
Make a quoted copy of a fixed-length string. Leading and trailing
quotes will not be included; only embedded quotes will be escaped.
See also ut_strlenq() and ut_strcpyq(). */
char*
ut_memcpyq(