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
1c6cccea
Commit
1c6cccea
authored
Jun 29, 2013
by
Andrew McDonnell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed no_search to ''
parent
dd7e37d5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
storage/oqgraph/ha_oqgraph.cc
storage/oqgraph/ha_oqgraph.cc
+3
-3
No files found.
storage/oqgraph/ha_oqgraph.cc
View file @
1c6cccea
...
@@ -81,7 +81,7 @@ static MYSQL_SYSVAR_BOOL(allow_create_integer_latch, g_allow_create_integer_latc
...
@@ -81,7 +81,7 @@ static MYSQL_SYSVAR_BOOL(allow_create_integer_latch, g_allow_create_integer_latc
// In the future this needs to be refactactored to live somewhere else
// In the future this needs to be refactactored to live somewhere else
struct
oqgraph_latch_op_table
{
const
char
*
key
;
int
latch
;
};
struct
oqgraph_latch_op_table
{
const
char
*
key
;
int
latch
;
};
static
const
oqgraph_latch_op_table
latch_ops_table
[]
=
{
static
const
oqgraph_latch_op_table
latch_ops_table
[]
=
{
{
"
no_search"
,
oqgraph
::
NO_SEARCH
}
,
{
"
"
,
oqgraph
::
NO_SEARCH
}
,
// suggested by Arjen, use empty string instead of no_search
{
"dijkstras"
,
oqgraph
::
DIJKSTRAS
}
,
{
"dijkstras"
,
oqgraph
::
DIJKSTRAS
}
,
{
"breadth_first"
,
oqgraph
::
BREADTH_FIRST
}
,
{
"breadth_first"
,
oqgraph
::
BREADTH_FIRST
}
,
{
NULL
,
-
1
}
{
NULL
,
-
1
}
...
@@ -786,7 +786,7 @@ static int parse_latch_string_to_legacy_int(const String& value, int &latch)
...
@@ -786,7 +786,7 @@ static int parse_latch_string_to_legacy_int(const String& value, int &latch)
char
*
eptr
;
char
*
eptr
;
unsigned
long
int
v
=
strtoul
(
latchValue
.
c_ptr_safe
(),
&
eptr
,
10
);
unsigned
long
int
v
=
strtoul
(
latchValue
.
c_ptr_safe
(),
&
eptr
,
10
);
if
(
!*
eptr
)
{
if
(
!*
eptr
)
{
// we had an unsigned number; remember 0 is valid too (
nosearch
))
// we had an unsigned number; remember 0 is valid too (
'vertices' aka 'no_search'
))
if
(
v
>=
0
&&
v
<
oqgraph
::
NUM_SEARCH_OP
)
{
if
(
v
>=
0
&&
v
<
oqgraph
::
NUM_SEARCH_OP
)
{
latch
=
v
;
latch
=
v
;
return
true
;
return
true
;
...
@@ -996,7 +996,7 @@ int ha_oqgraph::rnd_next(byte *buf)
...
@@ -996,7 +996,7 @@ int ha_oqgraph::rnd_next(byte *buf)
{
{
int
res
;
int
res
;
open_query
::
row
row
;
open_query
::
row
row
;
if
(
!
(
res
=
graph
->
fetch_row
(
row
)))
if
(
!
(
res
=
graph
->
fetch_row
(
row
)))
// FIXME - this called after DELETE FROM graph_base; hangs...
res
=
fill_record
(
buf
,
row
);
res
=
fill_record
(
buf
,
row
);
table
->
status
=
res
?
STATUS_NOT_FOUND
:
0
;
table
->
status
=
res
?
STATUS_NOT_FOUND
:
0
;
return
error_code
(
res
);
return
error_code
(
res
);
...
...
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