mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-24 09:15:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.1 into 10.2

Browse source
This commit is contained in:
Marko Mäkelä 2019-03-26 17:38:33 +02:00
commit c676f58c27
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/item_cmpfunc.cc
View file

@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
Copyright (c) 2009, 2016, MariaDB
Copyright (c) 2009, 2019, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -4678,7 +4678,7 @@ Item_cond::eval_not_null_tables(void *opt_arg)
if (item->const_item() && !item->with_param &&
!item->is_expensive() && !cond_has_datetime_is_null(item))
{
if (item->val_int() == is_and_cond && top_level())
if (item->eval_const_cond() == is_and_cond && top_level())
{
/*
a. This is "... AND true_cond AND ..."