Commit fb0f88aa authored by unknown's avatar unknown
Browse files

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
parents 65d9e36f 074cdd62

mysql-test/r/innodb_mysql.result

0 → 100644
+1 −0
Original line number Diff line number Diff line 
drop table if exists t1;

mysql-test/t/innodb.test

+13 −0
Original line number Diff line number Diff line 
#######################################################################

#                                                                     #

# Please, DO NOT TOUCH this file as well as the innodb.result file.   #

# These files are to be modified ONLY BY INNOBASE guys.               #

#                                                                     #

# Use innodb_mysql.[test|result] files instead.                       #

#                                                                     #

# If nevertheless you need to make some changes here, please, forward #

# your commit message To: dev@innodb.com Cc: dev-innodb@mysql.com     #

# (otherwise your changes may be erased).                             #

#                                                                     #

#######################################################################



-- source include/have_innodb.inc



#

mysql-test/t/innodb_mysql.test

0 → 100644
+5 −0
Original line number Diff line number Diff line 
-- source include/have_innodb.inc



--disable_warnings

drop table if exists t1;

--enable_warnings

storage/innobase/dict/dict0dict.c

+3 −4
Original line number Diff line number Diff line
@@ -243,11 +243,10 @@ dict_remove_db_name( 
	const char*	name)	/* in: table name in the form

				dbname '/' tablename */

{

	const char*	s;

	s = strchr(name, '/');

	const char*	s = strchr(name, '/');

	ut_a(s);

	if (s) s++;

	return(s);



	return(s + 1);

}



/************************************************************************

storage/innobase/dict/dict0load.c

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ dict_load_indexes( 
			break;

		}



		if (rec_get_deleted_flag(rec, dict_table_is_comp(table))) {

		if (rec_get_deleted_flag(rec, 0)) {

			dict_load_report_deleted_index(table->name,

				ULINT_UNDEFINED);