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
4a6457c8
Commit
4a6457c8
authored
Feb 03, 2010
by
Alexander Nozdrin
Browse files
Options
Browse Files
Download
Plain Diff
Manual merge from mysql-trunk-merge.
Conflicts: - sql/sql_select.cc
parents
f2360c90
e4b71385
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
9 deletions
+27
-9
mysql-test/r/fulltext.result
mysql-test/r/fulltext.result
+8
-0
mysql-test/t/fulltext.test
mysql-test/t/fulltext.test
+10
-0
sql/sql_select.cc
sql/sql_select.cc
+9
-9
No files found.
mysql-test/r/fulltext.result
View file @
4a6457c8
...
...
@@ -611,4 +611,12 @@ WHERE t3.a=t1.a AND MATCH(b2) AGAINST('scargill' IN BOOLEAN MODE)
count(*)
0
DROP TABLE t1,t2,t3;
#
# Bug #49445: Assertion failed: 0, file .\item_row.cc, line 55 with
# fulltext search and row op
#
CREATE TABLE t1(a CHAR(1),FULLTEXT(a));
SELECT 1 FROM t1 WHERE MATCH(a) AGAINST ('') AND ROW(a,a) > ROW(1,1);
1
DROP TABLE t1;
End of 5.1 tests
mysql-test/t/fulltext.test
View file @
4a6457c8
...
...
@@ -554,4 +554,14 @@ SELECT count(*) FROM t1 WHERE
DROP
TABLE
t1
,
t2
,
t3
;
--
echo
#
--
echo
# Bug #49445: Assertion failed: 0, file .\item_row.cc, line 55 with
--
echo
# fulltext search and row op
--
echo
#
CREATE
TABLE
t1
(
a
CHAR
(
1
),
FULLTEXT
(
a
));
SELECT
1
FROM
t1
WHERE
MATCH
(
a
)
AGAINST
(
''
)
AND
ROW
(
a
,
a
)
>
ROW
(
1
,
1
);
DROP
TABLE
t1
;
--
echo
End
of
5.1
tests
sql/sql_select.cc
View file @
4a6457c8
...
...
@@ -3673,20 +3673,20 @@ add_ft_keys(DYNAMIC_ARRAY *keyuse_array,
cond_func
=
(
Item_func_match
*
)
cond
;
else
if
(
func
->
arg_count
==
2
)
{
Item
_func
*
arg0
=
(
Item_func
*
)(
func
->
arguments
()[
0
]),
*
arg1
=
(
Item_func
*
)(
func
->
arguments
()[
1
]);
if
(
arg1
->
const_item
()
&&
Item
*
arg0
=
(
Item
*
)(
func
->
arguments
()[
0
]),
*
arg1
=
(
Item
*
)(
func
->
arguments
()[
1
]);
if
(
arg1
->
const_item
()
&&
arg1
->
cols
()
==
1
&&
arg0
->
type
()
==
Item
::
FUNC_ITEM
&&
arg0
->
functype
()
==
Item_func
::
FT_FUNC
&&
((
Item_func
*
)
arg0
)
->
functype
()
==
Item_func
::
FT_FUNC
&&
((
functype
==
Item_func
::
GE_FUNC
&&
arg1
->
val_real
()
>
0
)
||
(
functype
==
Item_func
::
GT_FUNC
&&
arg1
->
val_real
()
>=
0
)))
cond_func
=
(
Item_func_match
*
)
arg0
;
cond_func
=
(
Item_func_match
*
)
arg0
;
else
if
(
arg0
->
const_item
()
&&
arg1
->
type
()
==
Item
::
FUNC_ITEM
&&
arg1
->
functype
()
==
Item_func
::
FT_FUNC
&&
((
Item_func
*
)
arg1
)
->
functype
()
==
Item_func
::
FT_FUNC
&&
((
functype
==
Item_func
::
LE_FUNC
&&
arg0
->
val_real
()
>
0
)
||
(
functype
==
Item_func
::
LT_FUNC
&&
arg0
->
val_real
()
>=
0
)))
cond_func
=
(
Item_func_match
*
)
arg1
;
cond_func
=
(
Item_func_match
*
)
arg1
;
}
}
else
if
(
cond
->
type
()
==
Item
::
COND_ITEM
)
...
...
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