From c73e02756f3f08e1c1decd903aa7a1052ba231a3 Mon Sep 17 00:00:00 2001
From: unknown <hf@deer.mysql.r18.ru>
Date: Wed, 22 Jan 2003 20:08:12 +0400
Subject: SCRUM DEFAULT in SELECT & UPDATE corrections

mysql-test/r/replace.result:
  test slightly extended
mysql-test/t/replace.test:
  test slightly extended with replace(default)
sql/item.cc:
  DEFAULT_ITEM replaced
sql/item.h:
  some modifications after talking with Sergey
---
 mysql-test/r/replace.result | 6 ++++--
 mysql-test/t/replace.test   | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/r/replace.result b/mysql-test/r/replace.result
index 0aa80e18ccc..4a71428b2f4 100644
--- a/mysql-test/r/replace.result
+++ b/mysql-test/r/replace.result
@@ -12,15 +12,17 @@ replace into t1 (gesuchnr,benutzer_id) values (1,1);
 alter table t1 type=heap;
 replace into t1 (gesuchnr,benutzer_id) values (1,1);
 drop table t1;
-create table t1 (a tinyint not null auto_increment primary key, b char(20));
-insert into t1 values (126,"first"),(0,"last");
+create table t1 (a tinyint not null auto_increment primary key, b char(20) default "default_value");
+insert into t1 values (126,"first"),(63, "middle"),(0,"last");
 insert into t1 values (0,"error");
 Duplicate entry '127' for key 1
 replace into t1 values (0,"error");
 Duplicate entry '127' for key 1
 replace into t1 values (126,"first updated");
+replace into t1 values (63,default);
 select * from t1;
 a	b
 126	first updated
+63	default_value
 127	last
 drop table t1;
diff --git a/mysql-test/t/replace.test b/mysql-test/t/replace.test
index 7aeb2475ab5..2afce2fcc84 100644
--- a/mysql-test/t/replace.test
+++ b/mysql-test/t/replace.test
@@ -27,12 +27,13 @@ drop table t1;
 # Test when using replace on a key that has used up it's whole range
 #
 
-create table t1 (a tinyint not null auto_increment primary key, b char(20));
-insert into t1 values (126,"first"),(0,"last");
+create table t1 (a tinyint not null auto_increment primary key, b char(20) default "default_value");
+insert into t1 values (126,"first"),(63, "middle"),(0,"last");
 --error 1062
 insert into t1 values (0,"error");
 --error 1062
 replace into t1 values (0,"error");
 replace into t1 values (126,"first updated");
+replace into t1 values (63,default);
 select * from t1;
 drop table t1;
-- 
cgit v1.2.1