Commit afce5415 authored by Sergei Golubchik's avatar Sergei Golubchik

Merge branch 'merge-xtradb-5.5' into 5.5

5.5.47-37.7
parents 5d478f53 3cfd36bb
...@@ -7744,7 +7744,8 @@ create_table_def( ...@@ -7744,7 +7744,8 @@ create_table_def(
/* MySQL does the name length check. But we do additional check /* MySQL does the name length check. But we do additional check
on the name length here */ on the name length here */
if (strlen(table_name) > MAX_FULL_NAME_LEN) { const size_t table_name_len = strlen(table_name);
if (table_name_len > MAX_FULL_NAME_LEN) {
push_warning_printf( push_warning_printf(
(THD*) trx->mysql_thd, MYSQL_ERROR::WARN_LEVEL_WARN, (THD*) trx->mysql_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_TABLE_NAME, ER_TABLE_NAME,
...@@ -7753,6 +7754,15 @@ create_table_def( ...@@ -7753,6 +7754,15 @@ create_table_def(
DBUG_RETURN(ER_TABLE_NAME); DBUG_RETURN(ER_TABLE_NAME);
} }
if (table_name[table_name_len - 1] == '/') {
push_warning_printf(
(THD*) trx->mysql_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_TABLE_NAME,
"InnoDB: Table name is empty");
DBUG_RETURN(ER_WRONG_TABLE_NAME);
}
n_cols = form->s->fields; n_cols = form->s->fields;
/* We pass 0 as the space id, and determine at a lower level the space /* We pass 0 as the space id, and determine at a lower level the space
......
...@@ -64,10 +64,10 @@ component, i.e. we show M.N.P as M.N */ ...@@ -64,10 +64,10 @@ component, i.e. we show M.N.P as M.N */
(INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR) (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
#ifndef PERCONA_INNODB_VERSION #ifndef PERCONA_INNODB_VERSION
#define PERCONA_INNODB_VERSION 37.6 #define PERCONA_INNODB_VERSION 37.7
#endif #endif
#define INNODB_VERSION_STR "5.5.46-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION) #define INNODB_VERSION_STR "5.5.47-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION)
#define REFMAN "http://dev.mysql.com/doc/refman/" \ #define REFMAN "http://dev.mysql.com/doc/refman/" \
IB_TO_STR(MYSQL_MAJOR_VERSION) "." \ IB_TO_STR(MYSQL_MAJOR_VERSION) "." \
......
/***************************************************************************** /*****************************************************************************
Copyright (c) 1997, 2010, Innobase Oy. All Rights Reserved. Copyright (c) 1997, 2015, Oracle and/or its affiliates. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
...@@ -766,6 +766,10 @@ not_consistent: ...@@ -766,6 +766,10 @@ not_consistent:
fprintf(stderr, fprintf(stderr,
"InnoDB: No valid checkpoint found.\n" "InnoDB: No valid checkpoint found.\n"
"InnoDB: If you are attempting downgrade"
" from MySQL 5.7.9 or later,\n"
"InnoDB: please refer to " REFMAN
"upgrading-downgrading.html\n"
"InnoDB: If this error appears when you are" "InnoDB: If this error appears when you are"
" creating an InnoDB database,\n" " creating an InnoDB database,\n"
"InnoDB: the problem may be that during" "InnoDB: the problem may be that during"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment