mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source 
Docs/manual.texi:
  merged
This commit is contained in:
unknown 2000-10-18 00:04:20 +02:00
commit 228daf0ac7
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Docs/manual.texi
View file

@ -38047,6 +38047,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

2
include/config-win.h
View file

@ -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

8
sql-bench/test-insert.sh
View file

@ -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;
}
}

2
sql/item_cmpfunc.cc
View file

@ -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;
}