Skip to content

Commit 3cfd36b

Browse files
committed
5.5.47-37.7
1 parent 9457139 commit 3cfd36b

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

storage/xtradb/handler/ha_innodb.cc

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7549,7 +7549,8 @@ create_table_def(
75497549

75507550
/* MySQL does the name length check. But we do additional check
75517551
on the name length here */
7552-
if (strlen(table_name) > MAX_FULL_NAME_LEN) {
7552+
const size_ttable_name_len = strlen(table_name);
7553+
if (table_name_len > MAX_FULL_NAME_LEN) {
75537554
push_warning_printf(
75547555
(THD*) trx->mysql_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
75557556
ER_TABLE_NAME,
@@ -7558,6 +7559,15 @@ create_table_def(
75587559
DBUG_RETURN(ER_TABLE_NAME);
75597560
}
75607561

7562+
if (table_name[table_name_len - 1] == '/') {
7563+
push_warning_printf(
7564+
(THD*) trx->mysql_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
7565+
ER_TABLE_NAME,
7566+
"InnoDB: Table name is empty");
7567+
7568+
DBUG_RETURN(ER_WRONG_TABLE_NAME);
7569+
}
7570+
75617571
n_cols = form->s->fields;
75627572

75637573
/* We pass 0 as the space id, and determine at a lower level the space

storage/xtradb/include/univ.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ component, i.e. we show M.N.P as M.N */
6464
(INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
6565

6666
#ifndef PERCONA_INNODB_VERSION
67-
#define PERCONA_INNODB_VERSION 37.6
67+
#define PERCONA_INNODB_VERSION 37.7
6868
#endif
6969

7070
#define INNODB_VERSION_STRMYSQL_SERVER_VERSION

storage/xtradb/log/log0recv.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****************************************************************************
22
3-
Copyright (c) 1997, 2010, Innobase Oy. All Rights Reserved.
3+
Copyright (c) 1997, 2015, Oracle and/or its affiliates. All Rights Reserved.
44
55
This program is free software; you can redistribute it and/or modify it under
66
the terms of the GNU General Public License as published by the Free Software
@@ -759,6 +759,10 @@ recv_find_max_checkpoint(
759759

760760
fprintf(stderr,
761761
"InnoDB: No valid checkpoint found.\n"
762+
"InnoDB: If you are attempting downgrade"
763+
" from MySQL 5.7.9 or later,\n"
764+
"InnoDB: please refer to " REFMAN
765+
"upgrading-downgrading.html\n"
762766
"InnoDB: If this error appears when you are"
763767
" creating an InnoDB database,\n"
764768
"InnoDB: the problem may be that during"

0 commit comments

Comments
 (0)