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
fd502407
Commit
fd502407
authored
Jun 14, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
parents
261e8ea0
b07ac7ae
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+4
-0
No files found.
sql/ha_ndbcluster.cc
View file @
fd502407
...
...
@@ -6399,6 +6399,7 @@ void ndb_serialize_cond(const Item *item, void *arg)
case
(
REAL_RESULT
):
context
->
expect_only
(
Item
::
REAL_ITEM
);
context
->
expect
(
Item
::
DECIMAL_ITEM
);
context
->
expect
(
Item
::
INT_ITEM
);
break
;
case
(
INT_RESULT
):
context
->
expect_only
(
Item
::
INT_ITEM
);
...
...
@@ -6407,6 +6408,7 @@ void ndb_serialize_cond(const Item *item, void *arg)
case
(
DECIMAL_RESULT
):
context
->
expect_only
(
Item
::
DECIMAL_ITEM
);
context
->
expect
(
Item
::
REAL_ITEM
);
context
->
expect
(
Item
::
INT_ITEM
);
break
;
default:
break
;
...
...
@@ -6809,6 +6811,8 @@ void ndb_serialize_cond(const Item *item, void *arg)
// We have not seen the field argument yet
context
->
expect_only
(
Item
::
FIELD_ITEM
);
context
->
expect_only_field_result
(
INT_RESULT
);
context
->
expect_field_result
(
REAL_RESULT
);
context
->
expect_field_result
(
DECIMAL_RESULT
);
}
else
{
...
...
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