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
f7819504
Commit
f7819504
authored
Apr 19, 2006
by
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WL 2826: Error handling of ALTER TABLE for partitioning
Fixed a number of bugs
parent
22ed19e4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
sql/sql_table.cc
sql/sql_table.cc
+11
-9
No files found.
sql/sql_table.cc
View file @
f7819504
...
...
@@ -424,9 +424,10 @@ static uint read_ddl_log_header()
bzero
(
file_entry_buf
,
sizeof
(
global_ddl_log
.
file_entry_buf
));
global_ddl_log
.
inited
=
FALSE
;
global_ddl_log
.
recovery_phase
=
TRUE
;
global_ddl_log
.
io_size
=
IO_SIZE
;
create_ddl_log_file_name
(
file_name
);
if
(
!
(
global_ddl_log
.
file_id
=
my_open
(
file_name
,
O_RDWR
|
O_BINARY
,
MYF
(
MY_WME
))))
if
((
global_ddl_log
.
file_id
=
my_open
(
file_name
,
O_RDWR
|
O_BINARY
,
MYF
(
MY_WME
)))
>=
0
)
{
if
(
read_ddl_log_file_entry
(
0UL
))
{
...
...
@@ -446,7 +447,6 @@ static uint read_ddl_log_header()
}
else
{
global_ddl_log
.
io_size
=
IO_SIZE
;
entry_no
=
0
;
}
global_ddl_log
.
first_free
=
NULL
;
...
...
@@ -519,6 +519,7 @@ static bool init_ddl_log()
DBUG_RETURN
(
FALSE
);
}
global_ddl_log
.
io_size
=
IO_SIZE
;
create_ddl_log_file_name
(
file_name
);
if
((
global_ddl_log
.
file_id
=
my_create
(
file_name
,
CREATE_MODE
,
O_RDWR
|
O_TRUNC
|
O_BINARY
,
...
...
@@ -567,18 +568,19 @@ static bool execute_ddl_log_action(THD *thd, DDL_LOG_ENTRY *ddl_log_entry)
}
handler_name
.
str
=
(
char
*
)
ddl_log_entry
->
handler_name
;
handler_name
.
length
=
strlen
(
ddl_log_entry
->
handler_name
);
hton
=
ha_resolve_by_name
(
thd
,
&
handler_name
);
if
(
!
hton
)
{
my_error
(
ER_ILLEGAL_HA
,
MYF
(
0
),
ddl_log_entry
->
handler_name
);
DBUG_RETURN
(
TRUE
);
}
init_sql_alloc
(
&
mem_root
,
TABLE_ALLOC_BLOCK_SIZE
,
0
);
if
(
strcmp
(
"frm"
,
ddl_log_entry
->
handler_name
))
frm_action
=
TRUE
;
else
{
TABLE_SHARE
dummy
;
hton
=
ha_resolve_by_name
(
thd
,
&
handler_name
);
if
(
!
hton
)
{
my_error
(
ER_ILLEGAL_HA
,
MYF
(
0
),
ddl_log_entry
->
handler_name
);
goto
error
;
}
bzero
(
&
dummy
,
sizeof
(
TABLE_SHARE
));
file
=
get_new_handler
(
&
dummy
,
&
mem_root
,
hton
);
if
(
!
file
)
...
...
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