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
913beda8
Commit
913beda8
authored
Feb 13, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Plain Diff
5.2 merge
parents
3845a89b
48445f35
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
38 additions
and
21 deletions
+38
-21
mysql-test/r/func_misc.result
mysql-test/r/func_misc.result
+7
-0
mysql-test/t/func_misc.test
mysql-test/t/func_misc.test
+10
-0
sql/item.cc
sql/item.cc
+21
-10
sql/scheduler.cc
sql/scheduler.cc
+0
-1
storage/innodb_plugin/row/row0mysql.c
storage/innodb_plugin/row/row0mysql.c
+0
-4
storage/innodb_plugin/row/row0sel.c
storage/innodb_plugin/row/row0sel.c
+0
-1
storage/xtradb/row/row0mysql.c
storage/xtradb/row/row0mysql.c
+0
-4
storage/xtradb/row/row0sel.c
storage/xtradb/row/row0sel.c
+0
-1
No files found.
mysql-test/r/func_misc.result
View file @
913beda8
...
...
@@ -265,3 +265,10 @@ SELECT '1' IN ('1', INET_NTOA(0));
'1' IN ('1', INET_NTOA(0))
1
End of tests
SELECT NAME_CONST('a', -(1 OR 2)) OR 1;
ERROR HY000: Incorrect arguments to NAME_CONST
SELECT NAME_CONST('a', -(1 AND 2)) AND 1;
ERROR HY000: Incorrect arguments to NAME_CONST
SELECT NAME_CONST('a', -(1)) OR 1;
NAME_CONST('a', -(1)) OR 1
1
mysql-test/t/func_misc.test
View file @
913beda8
...
...
@@ -300,3 +300,13 @@ SELECT '1' IN ('1', INET_NTOA(0));
--
echo
End
of
tests
#
# MDEV-5655 Server crashes on NAME_CONST containing AND/OR expressions
#
--
error
ER_WRONG_ARGUMENTS
SELECT
NAME_CONST
(
'a'
,
-
(
1
OR
2
))
OR
1
;
--
error
ER_WRONG_ARGUMENTS
SELECT
NAME_CONST
(
'a'
,
-
(
1
AND
2
))
AND
1
;
SELECT
NAME_CONST
(
'a'
,
-
(
1
))
OR
1
;
sql/item.cc
View file @
913beda8
...
...
@@ -1599,17 +1599,28 @@ bool Item_name_const::is_null()
Item_name_const
::
Item_name_const
(
Item
*
name_arg
,
Item
*
val
)
:
value_item
(
val
),
name_item
(
name_arg
)
{
if
(
!
(
valid_args
=
name_item
->
basic_const_item
()
&&
(
value_item
->
basic_const_item
()
||
((
value_item
->
type
()
==
FUNC_ITEM
)
&&
((((
Item_func
*
)
value_item
)
->
functype
()
==
Item_func
::
COLLATE_FUNC
)
||
((((
Item_func
*
)
value_item
)
->
functype
()
==
Item_func
::
NEG_FUNC
)
&&
(((
Item_func
*
)
value_item
)
->
key_item
()
->
type
()
!=
FUNC_ITEM
)))))))
my_error
(
ER_WRONG_ARGUMENTS
,
MYF
(
0
),
"NAME_CONST"
);
Item
::
maybe_null
=
TRUE
;
valid_args
=
true
;
if
(
!
name_item
->
basic_const_item
())
goto
err
;
if
(
value_item
->
basic_const_item
())
return
;
// ok
if
(
value_item
->
type
()
==
FUNC_ITEM
)
{
Item_func
*
value_func
=
(
Item_func
*
)
value_item
;
if
(
value_func
->
functype
()
!=
Item_func
::
COLLATE_FUNC
&&
value_func
->
functype
()
!=
Item_func
::
NEG_FUNC
)
goto
err
;
if
(
value_func
->
key_item
()
->
basic_const_item
())
return
;
// ok
}
err:
valid_args
=
false
;
my_error
(
ER_WRONG_ARGUMENTS
,
MYF
(
0
),
"NAME_CONST"
);
}
...
...
sql/scheduler.cc
View file @
913beda8
...
...
@@ -69,7 +69,6 @@ static bool no_threads_end(THD *thd, bool put_in_cache)
void
one_thread_scheduler
(
scheduler_functions
*
func
)
{
func
->
max_threads
=
1
;
max_connections
=
1
;
func
->
max_connections
=
&
max_connections
;
func
->
connection_count
=
&
connection_count
;
#ifndef EMBEDDED_LIBRARY
...
...
storage/innodb_plugin/row/row0mysql.c
View file @
913beda8
...
...
@@ -1079,7 +1079,6 @@ row_insert_for_mysql(
ins_node_t
*
node
=
prebuilt
->
ins_node
;
ut_ad
(
trx
);
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
if
(
prebuilt
->
table
->
ibd_file_missing
)
{
ut_print_timestamp
(
stderr
);
...
...
@@ -1313,7 +1312,6 @@ row_update_for_mysql(
trx_t
*
trx
=
prebuilt
->
trx
;
ut_ad
(
prebuilt
&&
trx
);
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
UT_NOT_USED
(
mysql_rec
);
if
(
prebuilt
->
table
->
ibd_file_missing
)
{
...
...
@@ -1483,7 +1481,6 @@ row_unlock_for_mysql(
trx_t
*
trx
=
prebuilt
->
trx
;
ut_ad
(
prebuilt
&&
trx
);
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
if
(
UNIV_UNLIKELY
(
!
srv_locks_unsafe_for_binlog
...
...
@@ -2724,7 +2721,6 @@ row_truncate_table_for_mysql(
redo log records on the truncated tablespace, we will assign
a new tablespace identifier to the truncated tablespace. */
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
ut_ad
(
table
);
if
(
srv_created_new_raw
)
{
...
...
storage/innodb_plugin/row/row0sel.c
View file @
913beda8
...
...
@@ -3434,7 +3434,6 @@ row_search_for_mysql(
rec_offs_init
(
offsets_
);
ut_ad
(
index
&&
pcur
&&
search_tuple
);
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
if
(
UNIV_UNLIKELY
(
prebuilt
->
table
->
ibd_file_missing
))
{
ut_print_timestamp
(
stderr
);
...
...
storage/xtradb/row/row0mysql.c
View file @
913beda8
...
...
@@ -1084,7 +1084,6 @@ row_insert_for_mysql(
ins_node_t
*
node
=
prebuilt
->
ins_node
;
ut_ad
(
trx
);
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
if
(
prebuilt
->
table
->
ibd_file_missing
)
{
ut_print_timestamp
(
stderr
);
...
...
@@ -1326,7 +1325,6 @@ row_update_for_mysql(
trx_t
*
trx
=
prebuilt
->
trx
;
ut_ad
(
prebuilt
&&
trx
);
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
UT_NOT_USED
(
mysql_rec
);
if
(
prebuilt
->
table
->
ibd_file_missing
)
{
...
...
@@ -1497,7 +1495,6 @@ row_unlock_for_mysql(
trx_t
*
trx
=
prebuilt
->
trx
;
ut_ad
(
prebuilt
&&
trx
);
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
if
(
UNIV_UNLIKELY
(
!
srv_locks_unsafe_for_binlog
...
...
@@ -2830,7 +2827,6 @@ row_truncate_table_for_mysql(
redo log records on the truncated tablespace, we will assign
a new tablespace identifier to the truncated tablespace. */
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
ut_ad
(
table
);
if
(
srv_created_new_raw
)
{
...
...
storage/xtradb/row/row0sel.c
View file @
913beda8
...
...
@@ -3553,7 +3553,6 @@ row_search_for_mysql(
rec_offs_init
(
offsets_
);
ut_ad
(
index
&&
pcur
&&
search_tuple
);
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
if
(
UNIV_UNLIKELY
(
prebuilt
->
table
->
ibd_file_missing
))
{
ut_print_timestamp
(
stderr
);
...
...
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