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
b0df2034
Commit
b0df2034
authored
Jul 15, 2004
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
failing fulltext_order_by.test fixed
myisam/sort.c: warning fixed sql/ha_myisam.h: not necessary
parent
a96bb92f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
3 deletions
+3
-3
myisam/sort.c
myisam/sort.c
+1
-1
sql/ha_myisam.h
sql/ha_myisam.h
+0
-1
sql/handler.h
sql/handler.h
+1
-0
sql/opt_range.h
sql/opt_range.h
+1
-1
No files found.
myisam/sort.c
View file @
b0df2034
...
@@ -852,7 +852,7 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file,
...
@@ -852,7 +852,7 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file,
uchar
*
strpos
;
uchar
*
strpos
;
BUFFPEK
*
buffpek
,
**
refpek
;
BUFFPEK
*
buffpek
,
**
refpek
;
QUEUE
queue
;
QUEUE
queue
;
int
*
killed
=
killed_ptr
(
info
->
sort_info
->
param
);
volatile
int
*
killed
=
killed_ptr
(
info
->
sort_info
->
param
);
DBUG_ENTER
(
"merge_buffers"
);
DBUG_ENTER
(
"merge_buffers"
);
...
...
sql/ha_myisam.h
View file @
b0df2034
...
@@ -81,7 +81,6 @@ class ha_myisam: public handler
...
@@ -81,7 +81,6 @@ class ha_myisam: public handler
int
index_first
(
byte
*
buf
);
int
index_first
(
byte
*
buf
);
int
index_last
(
byte
*
buf
);
int
index_last
(
byte
*
buf
);
int
index_next_same
(
byte
*
buf
,
const
byte
*
key
,
uint
keylen
);
int
index_next_same
(
byte
*
buf
,
const
byte
*
key
,
uint
keylen
);
int
index_end
()
{
ft_handler
=
NULL
;
return
0
;
}
int
ft_init
()
int
ft_init
()
{
{
if
(
!
ft_handler
)
if
(
!
ft_handler
)
...
...
sql/handler.h
View file @
b0df2034
...
@@ -367,6 +367,7 @@ class handler :public Sql_alloc
...
@@ -367,6 +367,7 @@ class handler :public Sql_alloc
virtual
int
read_range_next
();
virtual
int
read_range_next
();
int
compare_key
(
key_range
*
range
);
int
compare_key
(
key_range
*
range
);
virtual
int
ft_init
()
{
return
HA_ERR_WRONG_COMMAND
;
}
virtual
int
ft_init
()
{
return
HA_ERR_WRONG_COMMAND
;
}
void
ft_end
()
{
ft_handler
=
NULL
;
}
virtual
FT_INFO
*
ft_init_ext
(
uint
flags
,
uint
inx
,
const
byte
*
key
,
virtual
FT_INFO
*
ft_init_ext
(
uint
flags
,
uint
inx
,
const
byte
*
key
,
uint
keylen
)
uint
keylen
)
{
return
NULL
;
}
{
return
NULL
;
}
...
...
sql/opt_range.h
View file @
b0df2034
...
@@ -563,7 +563,7 @@ class FT_SELECT: public QUICK_RANGE_SELECT {
...
@@ -563,7 +563,7 @@ class FT_SELECT: public QUICK_RANGE_SELECT {
public:
public:
FT_SELECT
(
THD
*
thd
,
TABLE
*
table
,
uint
key
)
:
FT_SELECT
(
THD
*
thd
,
TABLE
*
table
,
uint
key
)
:
QUICK_RANGE_SELECT
(
thd
,
table
,
key
,
1
)
{
init
();
}
QUICK_RANGE_SELECT
(
thd
,
table
,
key
,
1
)
{
init
();
}
~
FT_SELECT
()
{
file
->
ft_end
();
}
int
init
()
{
return
error
=
file
->
ft_init
();
}
int
init
()
{
return
error
=
file
->
ft_init
();
}
int
get_next
()
{
return
error
=
file
->
ft_read
(
record
);
}
int
get_next
()
{
return
error
=
file
->
ft_read
(
record
);
}
int
get_type
()
{
return
QS_TYPE_FULLTEXT
;
}
int
get_type
()
{
return
QS_TYPE_FULLTEXT
;
}
...
...
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