Skip to content

Commit 336fd6e

Browse files
author
Marko Makela
committed
Bug 19579149 REMOVE UNUSED INNODB API DEFINITIONS
Approved by Vasil Dimov.
1 parent d4f1a52 commit 336fd6e

File tree

2 files changed

+0
-70
lines changed

2 files changed

+0
-70
lines changed

storage/innobase/api/api0api.cc

-48
Original file line numberDiff line numberDiff line change
@@ -731,54 +731,6 @@ ib_normalize_table_name(
731731
}
732732
}
733733

734-
/*****************************************************************//**
735-
Check whether the table name conforms to our requirements. Currently
736-
we only do a simple check for the presence of a '/'.
737-
@return DB_SUCCESS or err code */
738-
739-
ib_err_t
740-
ib_table_name_check(
741-
/*================*/
742-
const char* name) /*!< in: table name to check */
743-
{
744-
const char* slash = NULL;
745-
ulint len = ut_strlen(name);
746-
747-
if (len < 2
748-
|| *name == '/'
749-
|| name[len - 1] == '/'
750-
|| (name[0] == '.' && name[1] == '/')
751-
|| (name[0] == '.' && name[1] == '.' && name[2] == '/')) {
752-
753-
return(DB_DATA_MISMATCH);
754-
}
755-
756-
for ( ; *name; ++name) {
757-
#ifdef _WIN32
758-
/* Check for reserved characters in DOS filenames. */
759-
switch (*name) {
760-
case ':':
761-
case '|':
762-
case '"':
763-
case '*':
764-
case '<':
765-
case '>':
766-
return(DB_DATA_MISMATCH);
767-
}
768-
#endif /* _WIN32 */
769-
if (*name == '/') {
770-
if (slash) {
771-
return(DB_DATA_MISMATCH);
772-
}
773-
slash = name;
774-
}
775-
}
776-
777-
return(slash ? DB_SUCCESS : DB_DATA_MISMATCH);
778-
}
779-
780-
781-
782734
/*****************************************************************//**
783735
Get a table id. The caller must have acquired the dictionary mutex.
784736
@return DB_SUCCESS if found */

storage/innobase/include/api0api.h

-22
Original file line numberDiff line numberDiff line change
@@ -413,18 +413,6 @@ typedef int (*ib_client_cmp_t)(
413413
/* This should be the same as univ.i */
414414
/** Represents SQL_NULL length */
415415
#define IB_SQL_NULL 0xFFFFFFFF
416-
/** The number of system columns in a row. */
417-
#define IB_N_SYS_COLS 3
418-
419-
/** The maximum length of a text column. */
420-
#define MAX_TEXT_LEN 4096
421-
422-
/* MySQL uses 3 byte UTF-8 encoding. */
423-
/** The maximum length of a column name in a table schema. */
424-
#define IB_MAX_COL_NAME_LEN (64 * 3)
425-
426-
/** The maximum length of a table name (plus database name). */
427-
#define IB_MAX_TABLE_NAME_LEN (64 * 3) * 2
428416

429417
/*****************************************************************//**
430418
Start a transaction that's been rolled back. This special function
@@ -1075,16 +1063,6 @@ ib_cursor_set_memcached_sync(
10751063
ib_crsr_t ib_crsr, /*!< in: cursor */
10761064
ib_bool_t flag); /*!< in: true for increasing */
10771065

1078-
/*****************************************************************//**
1079-
Check whether the table name conforms to our requirements. Currently
1080-
we only do a simple check for the presence of a '/'.
1081-
@return DB_SUCCESS or err code */
1082-
1083-
ib_err_t
1084-
ib_table_name_check(
1085-
/*================*/
1086-
const char* name); /*!< in: table name to check */
1087-
10881066
/*****************************************************************//**
10891067
Return isolation configuration set by "innodb_api_trx_level"
10901068
@return trx isolation level*/

0 commit comments

Comments
 (0)