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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
6ac52386
Commit
6ac52386
authored
Jan 23, 2013
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix the failing federated.federated_innodb test:
update all start_bulk_insert() methods to the new signature.
parent
eb809ec0
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
6 deletions
+7
-6
sql/sql_insert.cc
sql/sql_insert.cc
+1
-0
storage/archive/ha_archive.cc
storage/archive/ha_archive.cc
+1
-1
storage/archive/ha_archive.h
storage/archive/ha_archive.h
+1
-1
storage/federated/ha_federated.cc
storage/federated/ha_federated.cc
+1
-1
storage/federated/ha_federated.h
storage/federated/ha_federated.h
+1
-1
storage/federatedx/ha_federatedx.cc
storage/federatedx/ha_federatedx.cc
+1
-1
storage/federatedx/ha_federatedx.h
storage/federatedx/ha_federatedx.h
+1
-1
No files found.
sql/sql_insert.cc
View file @
6ac52386
/*
Copyright (c) 2000, 2011, Oracle and/or its affiliates.
Copyright (c) 2009, 2013, Monty Program Ab.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
...
...
storage/archive/ha_archive.cc
View file @
6ac52386
...
...
@@ -1669,7 +1669,7 @@ int ha_archive::info(uint flag)
turn will keep selects from causing a sync to occur.
Basically, yet another optimizations to keep compression working well.
*/
void
ha_archive
::
start_bulk_insert
(
ha_rows
rows
)
void
ha_archive
::
start_bulk_insert
(
ha_rows
rows
,
uint
flags
)
{
DBUG_ENTER
(
"ha_archive::start_bulk_insert"
);
if
(
!
rows
||
rows
>=
ARCHIVE_MIN_ROWS_TO_USE_BULK_INSERT
)
...
...
storage/archive/ha_archive.h
View file @
6ac52386
...
...
@@ -136,7 +136,7 @@ public:
int
optimize
(
THD
*
thd
,
HA_CHECK_OPT
*
check_opt
);
int
repair
(
THD
*
thd
,
HA_CHECK_OPT
*
check_opt
);
int
check_for_upgrade
(
HA_CHECK_OPT
*
check_opt
);
void
start_bulk_insert
(
ha_rows
rows
);
void
start_bulk_insert
(
ha_rows
rows
,
uint
flags
);
int
end_bulk_insert
();
enum
row_type
get_row_type
()
const
{
...
...
storage/federated/ha_federated.cc
View file @
6ac52386
...
...
@@ -1979,7 +1979,7 @@ int ha_federated::write_row(uchar *buf)
@details Initializes memory structures required for bulk insert.
*/
void
ha_federated
::
start_bulk_insert
(
ha_rows
rows
)
void
ha_federated
::
start_bulk_insert
(
ha_rows
rows
,
uint
flags
)
{
uint
page_size
;
DBUG_ENTER
(
"ha_federated::start_bulk_insert"
);
...
...
storage/federated/ha_federated.h
View file @
6ac52386
...
...
@@ -209,7 +209,7 @@ public:
int
open
(
const
char
*
name
,
int
mode
,
uint
test_if_locked
);
// required
int
close
(
void
);
// required
void
start_bulk_insert
(
ha_rows
rows
);
void
start_bulk_insert
(
ha_rows
rows
,
uint
flags
);
int
end_bulk_insert
();
int
write_row
(
uchar
*
buf
);
int
update_row
(
const
uchar
*
old_data
,
uchar
*
new_data
);
...
...
storage/federatedx/ha_federatedx.cc
View file @
6ac52386
...
...
@@ -2126,7 +2126,7 @@ int ha_federatedx::write_row(uchar *buf)
@details Initializes memory structures required for bulk insert.
*/
void
ha_federatedx
::
start_bulk_insert
(
ha_rows
rows
)
void
ha_federatedx
::
start_bulk_insert
(
ha_rows
rows
,
uint
flags
)
{
uint
page_size
;
DBUG_ENTER
(
"ha_federatedx::start_bulk_insert"
);
...
...
storage/federatedx/ha_federatedx.h
View file @
6ac52386
...
...
@@ -390,7 +390,7 @@ public:
int
open
(
const
char
*
name
,
int
mode
,
uint
test_if_locked
);
// required
int
close
(
void
);
// required
void
start_bulk_insert
(
ha_rows
rows
);
void
start_bulk_insert
(
ha_rows
rows
,
uint
flags
);
int
end_bulk_insert
();
int
write_row
(
uchar
*
buf
);
int
update_row
(
const
uchar
*
old_data
,
uchar
*
new_data
);
...
...
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