diff options
| author | Jimmy Yang <jimmy.yang@oracle.com> | 2011-01-07 00:00:36 -0800 |
|---|---|---|
| committer | Jimmy Yang <jimmy.yang@oracle.com> | 2011-01-07 00:00:36 -0800 |
| commit | 3bdaf405693eb51343f316b30f2ccd75dea6544d (patch) | |
| tree | 3639428cd7d933bc8dd3f15fee3a26b59db50f61 | |
| parent | bb996a29ccd33f6620bd6e5b8c1c84a6358395c8 (diff) | |
| parent | 95cc85dbf515991ea1b19307cacce5c4ba24f21d (diff) | |
| download | mariadb-git-3bdaf405693eb51343f316b30f2ccd75dea6544d.tar.gz | |
Merge from mysql-5.1-security to mysql-5.5-security
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/handler/i_s.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/row/row0merge.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index bdb10c5a187..165ff662353 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -6220,8 +6220,8 @@ create_table_def( push_warning_printf( (THD*) trx->mysql_thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_TABLE_NAME, - "InnoDB: Failed to create table %s. Table Name" - " or Database Name is too long", table_name); + "InnoDB: Table Name or Database Name is too long"); + DBUG_RETURN(ER_TABLE_NAME); } diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc index d8361900095..3bcc399a070 100644 --- a/storage/innobase/handler/i_s.cc +++ b/storage/innobase/handler/i_s.cc @@ -759,7 +759,7 @@ fill_innodb_locks_from_cache( for (i = 0; i < rows_num; i++) { i_s_locks_row_t* row; - char buf[MAX_FULL_NAME_LEN]; + char buf[MAX_FULL_NAME_LEN + 1]; const char* bufend; char lock_trx_id[TRX_ID_MAX_LEN + 1]; diff --git a/storage/innobase/row/row0merge.c b/storage/innobase/row/row0merge.c index 0c68d6477a4..2ab93a2e151 100644 --- a/storage/innobase/row/row0merge.c +++ b/storage/innobase/row/row0merge.c @@ -2364,7 +2364,7 @@ row_merge_rename_tables( { ulint err = DB_ERROR; pars_info_t* info; - char old_name[MAX_TABLE_NAME_LEN + 1]; + char old_name[MAX_FULL_NAME_LEN + 1]; ut_ad(trx->mysql_thread_id == os_thread_get_curr_id()); ut_ad(old_table != new_table); @@ -2379,7 +2379,7 @@ row_merge_rename_tables( ut_print_timestamp(stderr); fprintf(stderr, "InnoDB: too long table name: '%s', " "max length is %d\n", old_table->name, - MAX_TABLE_NAME_LEN); + MAX_FULL_NAME_LEN); ut_error; } |