Merge from mysql-5.1-security to mysql-5.5-security

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);
 	}
 

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];

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;
 	}