mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
This commit is contained in:
aivanov@mysql.com 2006-04-26 12:45:29 +04:00
commit 419d4980e0
4 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
innobase/dict/dict0load.c
View file

@ -617,7 +617,7 @@ dict_load_indexes(
break;
}
if (rec_get_deleted_flag(rec, table->comp)) {
if (rec_get_deleted_flag(rec, 0)) {
dict_load_report_deleted_index(table->name,
ULINT_UNDEFINED);

1
mysql-test/r/innodb_mysql.result Normal file
View file

@ -0,0 +1 @@
drop table if exists t1;

13
mysql-test/t/innodb.test
View file

@ -1,3 +1,16 @@
#######################################################################
# #
# 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
#

5
mysql-test/t/innodb_mysql.test Normal file
View file

@ -0,0 +1,5 @@
-- source include/have_innodb.inc
--disable_warnings
drop table if exists t1;
--enable_warnings