Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
1e02b2ad
Commit
1e02b2ad
authored
May 22, 2011
by
Vasil Dimov
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql-5.1-innodb -> mysql-5.1
parents
4f0032d5
6e54707d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
116 additions
and
13 deletions
+116
-13
storage/innobase/dict/dict0load.c
storage/innobase/dict/dict0load.c
+58
-6
storage/innodb_plugin/dict/dict0load.c
storage/innodb_plugin/dict/dict0load.c
+57
-6
storage/innodb_plugin/include/univ.i
storage/innodb_plugin/include/univ.i
+1
-1
No files found.
storage/innobase/dict/dict0load.c
View file @
1e02b2ad
...
...
@@ -454,9 +454,11 @@ dict_load_report_deleted_index(
/************************************************************************
Loads definitions for index fields. */
static
void
ulint
dict_load_fields
(
/*=============*/
/* out: DB_SUCCESS if ok, DB_CORRUPTION
if failed */
dict_table_t
*
table
,
/* in: table */
dict_index_t
*
index
,
/* in: index whose fields to load */
mem_heap_t
*
heap
)
/* in: memory heap for temporary storage */
...
...
@@ -474,6 +476,7 @@ dict_load_fields(
byte
*
buf
;
ulint
i
;
mtr_t
mtr
;
ulint
error
=
DB_SUCCESS
;
ut_ad
(
mutex_own
(
&
(
dict_sys
->
mutex
)));
...
...
@@ -535,6 +538,26 @@ dict_load_fields(
field
=
rec_get_nth_field_old
(
rec
,
4
,
&
len
);
if
(
prefix_len
>=
DICT_MAX_INDEX_COL_LEN
)
{
fprintf
(
stderr
,
"InnoDB: Error: load index"
" '%s' failed.
\n
"
"InnoDB: index field '%s' has a prefix"
" length of %lu bytes,
\n
"
"InnoDB: which exceeds the"
" maximum limit of %lu bytes.
\n
"
"InnoDB: Please use server that"
" supports long index prefix
\n
"
"InnoDB: or turn on"
" innodb_force_recovery to load"
" the table
\n
"
,
index
->
name
,
mem_heap_strdupl
(
heap
,
(
char
*
)
field
,
len
),
(
ulong
)
prefix_len
,
(
ulong
)
(
DICT_MAX_INDEX_COL_LEN
-
1
));
error
=
DB_CORRUPTION
;
goto
func_exit
;
}
dict_mem_index_add_field
(
index
,
mem_heap_strdupl
(
heap
,
(
char
*
)
field
,
len
),
...
...
@@ -543,8 +566,10 @@ dict_load_fields(
btr_pcur_move_to_next_user_rec
(
&
pcur
,
&
mtr
);
}
func_exit:
btr_pcur_close
(
&
pcur
);
mtr_commit
(
&
mtr
);
return
(
error
);
}
/************************************************************************
...
...
@@ -701,10 +726,28 @@ dict_load_indexes(
space
,
type
,
n_fields
);
index
->
id
=
id
;
dict_load_fields
(
table
,
index
,
heap
);
error
=
dict_load_fields
(
table
,
index
,
heap
);
if
(
error
!=
DB_SUCCESS
)
{
fprintf
(
stderr
,
"InnoDB: Error: load index '%s'"
" for table '%s' failed
\n
"
,
index
->
name
,
table
->
name
);
/* If the force recovery flag is set, and
if the failed index is not the primary index, we
will continue and open other indexes */
if
(
srv_force_recovery
&&
!
(
index
->
type
&
DICT_CLUSTERED
))
{
error
=
DB_SUCCESS
;
goto
next_rec
;
}
else
{
goto
func_exit
;
}
}
dict_index_add_to_cache
(
table
,
index
,
page_no
);
}
next_rec:
btr_pcur_move_to_next_user_rec
(
&
pcur
,
&
mtr
);
}
...
...
@@ -881,9 +924,18 @@ dict_load_table(
}
else
{
table
->
fk_max_recusive_level
=
0
;
}
}
else
if
(
!
srv_force_recovery
)
{
dict_table_remove_from_cache
(
table
);
table
=
NULL
;
}
else
{
dict_index_t
*
index
;
/* Make sure that at least the clustered index was loaded.
Otherwise refuse to load the table */
index
=
dict_table_get_first_index
(
table
);
if
(
!
srv_force_recovery
||
!
index
||
!
(
index
->
type
&
DICT_CLUSTERED
))
{
dict_table_remove_from_cache
(
table
);
table
=
NULL
;
}
}
#if 0
if (err != DB_SUCCESS && table != NULL) {
...
...
storage/innodb_plugin/dict/dict0load.c
View file @
1e02b2ad
...
...
@@ -553,9 +553,10 @@ dict_load_columns(
}
/********************************************************************//**
Loads definitions for index fields. */
Loads definitions for index fields.
@return DB_SUCCESS if ok, DB_CORRUPTION if failed */
static
void
ulint
dict_load_fields
(
/*=============*/
dict_index_t
*
index
,
/*!< in: index whose fields to load */
...
...
@@ -574,6 +575,7 @@ dict_load_fields(
byte
*
buf
;
ulint
i
;
mtr_t
mtr
;
ulint
error
=
DB_SUCCESS
;
ut_ad
(
mutex_own
(
&
(
dict_sys
->
mutex
)));
...
...
@@ -640,6 +642,26 @@ dict_load_fields(
field
=
rec_get_nth_field_old
(
rec
,
4
,
&
len
);
if
(
prefix_len
>=
DICT_MAX_INDEX_COL_LEN
)
{
fprintf
(
stderr
,
"InnoDB: Error: load index"
" '%s' failed.
\n
"
"InnoDB: index field '%s' has a prefix"
" length of %lu bytes,
\n
"
"InnoDB: which exceeds the"
" maximum limit of %lu bytes.
\n
"
"InnoDB: Please use server that"
" supports long index prefix
\n
"
"InnoDB: or turn on"
" innodb_force_recovery to load"
" the table
\n
"
,
index
->
name
,
mem_heap_strdupl
(
heap
,
(
char
*
)
field
,
len
),
(
ulong
)
prefix_len
,
(
ulong
)
(
DICT_MAX_INDEX_COL_LEN
-
1
));
error
=
DB_CORRUPTION
;
goto
func_exit
;
}
dict_mem_index_add_field
(
index
,
mem_heap_strdupl
(
heap
,
(
char
*
)
field
,
len
),
...
...
@@ -649,8 +671,10 @@ dict_load_fields(
btr_pcur_move_to_next_user_rec
(
&
pcur
,
&
mtr
);
}
func_exit:
btr_pcur_close
(
&
pcur
);
mtr_commit
(
&
mtr
);
return
(
error
);
}
/********************************************************************//**
...
...
@@ -801,7 +825,25 @@ dict_load_indexes(
space
,
type
,
n_fields
);
index
->
id
=
id
;
dict_load_fields
(
index
,
heap
);
error
=
dict_load_fields
(
index
,
heap
);
if
(
error
!=
DB_SUCCESS
)
{
fprintf
(
stderr
,
"InnoDB: Error: load index '%s'"
" for table '%s' failed
\n
"
,
index
->
name
,
table
->
name
);
/* If the force recovery flag is set, and
if the failed index is not the primary index, we
will continue and open other indexes */
if
(
srv_force_recovery
&&
!
(
index
->
type
&
DICT_CLUSTERED
))
{
error
=
DB_SUCCESS
;
goto
next_rec
;
}
else
{
goto
func_exit
;
}
}
error
=
dict_index_add_to_cache
(
table
,
index
,
page_no
,
FALSE
);
/* The data dictionary tables should never contain
...
...
@@ -1027,9 +1069,18 @@ dict_load_table(
}
else
{
table
->
fk_max_recusive_level
=
0
;
}
}
else
if
(
!
srv_force_recovery
)
{
dict_table_remove_from_cache
(
table
);
table
=
NULL
;
}
else
{
dict_index_t
*
index
;
/* Make sure that at least the clustered index was loaded.
Otherwise refuse to load the table */
index
=
dict_table_get_first_index
(
table
);
if
(
!
srv_force_recovery
||
!
index
||
!
(
index
->
type
&
DICT_CLUSTERED
))
{
dict_table_remove_from_cache
(
table
);
table
=
NULL
;
}
}
#if 0
if (err != DB_SUCCESS && table != NULL) {
...
...
storage/innodb_plugin/include/univ.i
View file @
1e02b2ad
...
...
@@ -46,7 +46,7 @@ Created 1/20/1994 Heikki Tuuri
#
define
INNODB_VERSION_MAJOR
1
#
define
INNODB_VERSION_MINOR
0
#
define
INNODB_VERSION_BUGFIX
1
6
#
define
INNODB_VERSION_BUGFIX
1
7
/* The following is the InnoDB version as shown in
SELECT plugin_version FROM information_schema.plugins;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment