From 7eff8c8ff7e076071a0437c8d6b098e9ddf43e86 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja.osipov@gmail.com>
Date: Wed, 25 Apr 2012 20:23:00 +0400
Subject: [PATCH] INSERT is REPLACE in test/lib: a post-merge fix.

---
 test/box/sql.result | 3 +++
 test/box/sql.test   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/test/box/sql.result b/test/box/sql.result
index 9c298c7efc..a1ad9bc900 100644
--- a/test/box/sql.result
+++ b/test/box/sql.result
@@ -96,6 +96,9 @@ select * from t65537 where k0 = 0
 An error occurred: ER_NO_SUCH_SPACE, 'Space 65537 does not exist'
 select * from t4294967295 where k0 = 0
 An error occurred: ER_NO_SUCH_SPACE, 'Space 4294967295 does not exist'
+lua box.space[0]:truncate()
+---
+...
 #
 # A test case for: http://bugs.launchpad.net/bugs/716683
 # Admin console should not stall on unknown command.
diff --git a/test/box/sql.test b/test/box/sql.test
index f950f5da8d..3b4fbcd8b0 100644
--- a/test/box/sql.test
+++ b/test/box/sql.test
@@ -57,6 +57,7 @@ print """#
 exec sql "select * from t1 where k0 = 0"
 exec sql "select * from t65537 where k0 = 0"
 exec sql "select * from t4294967295 where k0 = 0"
+exec admin "lua box.space[0]:truncate()"
 
 print """#
 # A test case for: http://bugs.launchpad.net/bugs/716683
-- 
GitLab