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
a48c2f46
Commit
a48c2f46
authored
Jan 24, 2013
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ha_cassandra to compile
parent
259a9404
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
storage/cassandra/ha_cassandra.cc
storage/cassandra/ha_cassandra.cc
+3
-3
No files found.
storage/cassandra/ha_cassandra.cc
View file @
a48c2f46
...
@@ -879,7 +879,7 @@ static void alloc_strings_memroot(MEM_ROOT *mem_root)
...
@@ -879,7 +879,7 @@ static void alloc_strings_memroot(MEM_ROOT *mem_root)
(
36
+
1
+
ALIGN_SIZE
(
sizeof
(
USED_MEM
)))
*
10
+
(
36
+
1
+
ALIGN_SIZE
(
sizeof
(
USED_MEM
)))
*
10
+
ALLOC_ROOT_MIN_BLOCK_SIZE
,
ALLOC_ROOT_MIN_BLOCK_SIZE
,
(
36
+
1
+
ALIGN_SIZE
(
sizeof
(
USED_MEM
)))
*
10
+
(
36
+
1
+
ALIGN_SIZE
(
sizeof
(
USED_MEM
)))
*
10
+
ALLOC_ROOT_MIN_BLOCK_SIZE
);
ALLOC_ROOT_MIN_BLOCK_SIZE
,
MYF
(
MY_THREAD_SPECIFIC
)
);
}
}
}
}
...
@@ -1469,12 +1469,12 @@ bool ha_cassandra::setup_field_converters(Field **field_arg, uint n_fields)
...
@@ -1469,12 +1469,12 @@ bool ha_cassandra::setup_field_converters(Field **field_arg, uint n_fields)
if
(
my_init_dynamic_array
(
&
dynamic_values
,
if
(
my_init_dynamic_array
(
&
dynamic_values
,
sizeof
(
DYNAMIC_COLUMN_VALUE
),
sizeof
(
DYNAMIC_COLUMN_VALUE
),
DYNCOL_USUAL
,
DYNCOL_DELTA
))
DYNCOL_USUAL
,
DYNCOL_DELTA
,
MYF
(
0
)
))
DBUG_RETURN
(
true
);
DBUG_RETURN
(
true
);
else
else
if
(
my_init_dynamic_array
(
&
dynamic_names
,
if
(
my_init_dynamic_array
(
&
dynamic_names
,
sizeof
(
LEX_STRING
),
sizeof
(
LEX_STRING
),
DYNCOL_USUAL
,
DYNCOL_DELTA
))
DYNCOL_USUAL
,
DYNCOL_DELTA
,
MYF
(
0
)
))
{
{
delete_dynamic
(
&
dynamic_values
);
delete_dynamic
(
&
dynamic_values
);
DBUG_RETURN
(
true
);
DBUG_RETURN
(
true
);
...
...
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