Commit ee763533 authored by monty@donna.mysql.com's avatar monty@donna.mysql.com

Fixed benchmarks and compare of NULL with <>

parent 828bff91
...@@ -38035,6 +38035,8 @@ though, so 3.23 is not released as a stable version yet. ...@@ -38035,6 +38035,8 @@ though, so 3.23 is not released as a stable version yet.
@appendixsubsec Changes in release 3.23.26 @appendixsubsec Changes in release 3.23.26
@itemize @bullet @itemize @bullet
@item @item
Fixed that @code{<>} works properly with @code{NULL}.
@item
Fixed problem with @code{SUBSTRING_INDEX()} and @code{REPLACE()}. Fixed problem with @code{SUBSTRING_INDEX()} and @code{REPLACE()}.
(Patch by Alexander Igonitchev) (Patch by Alexander Igonitchev)
@item @item
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#endif #endif
#ifdef _WIN64 #ifdef _WIN64
#define MACHINE_TYPE "i64" /* Define to machine type name */ #define MACHINE_TYPE "ia64" /* Define to machine type name */
#else #else
#define MACHINE_TYPE "i32" /* Define to machine type name */ #define MACHINE_TYPE "i32" /* Define to machine type name */
#ifndef _WIN32 #ifndef _WIN32
......
...@@ -867,6 +867,10 @@ if ($server->small_rollback_segment()) ...@@ -867,6 +867,10 @@ if ($server->small_rollback_segment())
if ($limits->{'insert_select'}) if ($limits->{'insert_select'})
{ {
if ($opt_lock_tables)
{
$sth = $dbh->do("UNLOCK TABLES") || die $DBI::errstr;
}
print "\nTesting INSERT INTO ... SELECT\n"; print "\nTesting INSERT INTO ... SELECT\n";
do_many($dbh,$server->create("bench2", do_many($dbh,$server->create("bench2",
["id int NOT NULL", ["id int NOT NULL",
...@@ -911,6 +915,10 @@ if ($limits->{'insert_select'}) ...@@ -911,6 +915,10 @@ if ($limits->{'insert_select'})
$dbh->disconnect; # close connection $dbh->disconnect; # close connection
$dbh = $server->connect(); $dbh = $server->connect();
} }
if ($opt_lock_tables)
{
$sth = $dbh->do("LOCK TABLES bench1 WRITE") || die $DBI::errstr;
}
} }
......
...@@ -185,7 +185,7 @@ longlong Item_func_equal::val_int() ...@@ -185,7 +185,7 @@ longlong Item_func_equal::val_int()
longlong Item_func_ne::val_int() longlong Item_func_ne::val_int()
{ {
int value=(this->*cmp_func)(); int value=(this->*cmp_func)();
return value != 0 ? 1 : 0; return value != 0 && !null_value ? 1 : 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment