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

Fixed benchmarks and compare of NULL with <>

parent 828bff91

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -38035,6 +38035,8 @@ though, so 3.23 is not released as a stable version yet. 
@appendixsubsec Changes in release 3.23.26

@itemize @bullet

@item

Fixed that @code{<>} works properly with @code{NULL}.

@item

Fixed problem with @code{SUBSTRING_INDEX()} and @code{REPLACE()}.

(Patch by Alexander Igonitchev)

@item

include/config-win.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#endif



#ifdef _WIN64

#define MACHINE_TYPE	"i64"		/* Define to machine type name */

#define MACHINE_TYPE	"ia64"		/* Define to machine type name */

#else

#define MACHINE_TYPE	"i32"		/* Define to machine type name */

#ifndef _WIN32

sql-bench/test-insert.sh

+8 −0
Original line number Diff line number Diff line
@@ -867,6 +867,10 @@ if ($server->small_rollback_segment()) 


if ($limits->{'insert_select'})

{

  if ($opt_lock_tables)

  {

    $sth = $dbh->do("UNLOCK TABLES") || die $DBI::errstr;

  }

  print "\nTesting INSERT INTO ... SELECT\n";

  do_many($dbh,$server->create("bench2",

			       ["id int NOT NULL",
@@ -911,6 +915,10 @@ if ($limits->{'insert_select'}) 
    $dbh->disconnect;				# close connection

    $dbh = $server->connect();

  }

  if ($opt_lock_tables)

  {

    $sth = $dbh->do("LOCK TABLES bench1 WRITE") || die $DBI::errstr;

  }

}

sql/item_cmpfunc.cc

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ longlong Item_func_equal::val_int() 
longlong Item_func_ne::val_int()

{

  int value=(this->*cmp_func)();

  return value != 0 ? 1 : 0;

  return value != 0 && !null_value ? 1 : 0;

}