summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2000-12-11 14:09:31 +0100
committerunknown <serg@serg.mysql.com>2000-12-11 14:09:31 +0100
commit4c6a415233e76ca0eaa95172ff12ea8eaabe345f (patch)
tree1b2dc10daab96d2874b3b131078bf003e10ca094 /mysql-test/r
parent8beb43501be6bb4a4bd09e2b0aadc815dcc2f606 (diff)
downloadmariadb-git-4c6a415233e76ca0eaa95172ff12ea8eaabe345f.tar.gz
Tests backpropagated from mysql-4.0 bk tree
mysql-test/t/sel000004.test: backpropagated from mysql-4.0 mysql-test/t/sel000005.test: backpropagated from mysql-4.0 mysql-test/r/sel000004.result: backpropagated from mysql-4.0 mysql-test/r/sel000005.result: backpropagated from mysql-4.0
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/ft0000001.a.result3
-rw-r--r--mysql-test/r/ft0000001.b.result3
-rw-r--r--mysql-test/r/ft0000001.c.result3
-rw-r--r--mysql-test/r/ft0000001.d.result2
-rw-r--r--mysql-test/r/sel000004.result6
-rw-r--r--mysql-test/r/sel000005.result6
-rw-r--r--mysql-test/r/sel000031.result4
-rw-r--r--mysql-test/r/sel000032.result4
-rw-r--r--mysql-test/r/sel000033.result4
9 files changed, 27 insertions, 8 deletions
diff --git a/mysql-test/r/ft0000001.a.result b/mysql-test/r/ft0000001.a.result
new file mode 100644
index 00000000000..2b9a1515532
--- /dev/null
+++ b/mysql-test/r/ft0000001.a.result
@@ -0,0 +1,3 @@
+a MATCH (message) AGAINST ('steve')
+4 0.90587321329654
+7 0.89568988462614
diff --git a/mysql-test/r/ft0000001.b.result b/mysql-test/r/ft0000001.b.result
new file mode 100644
index 00000000000..2b9a1515532
--- /dev/null
+++ b/mysql-test/r/ft0000001.b.result
@@ -0,0 +1,3 @@
+a MATCH (message) AGAINST ('steve')
+4 0.90587321329654
+7 0.89568988462614
diff --git a/mysql-test/r/ft0000001.c.result b/mysql-test/r/ft0000001.c.result
new file mode 100644
index 00000000000..a88e4b25f2e
--- /dev/null
+++ b/mysql-test/r/ft0000001.c.result
@@ -0,0 +1,3 @@
+a MATCH (message) AGAINST ('steve')
+7 0.89568988462614
+4 0.90587321329654
diff --git a/mysql-test/r/ft0000001.d.result b/mysql-test/r/ft0000001.d.result
new file mode 100644
index 00000000000..f9ffb78d49d
--- /dev/null
+++ b/mysql-test/r/ft0000001.d.result
@@ -0,0 +1,2 @@
+a MATCH (message) AGAINST ('steve')
+7 0.89568988462614
diff --git a/mysql-test/r/sel000004.result b/mysql-test/r/sel000004.result
index 26f5563f3df..7ef0cdabb96 100644
--- a/mysql-test/r/sel000004.result
+++ b/mysql-test/r/sel000004.result
@@ -1,4 +1,2 @@
-id elt(two.val,'one','two')
-1 one
-2 one
-4 two
+1+1 1-1 1+1*2 8/5 8%5 MOD(8,5) MOD(8,5)|0 -(1+1)*-2 SIGN(-5)
+2 0 3 1.60 3 3 3 4 -1
diff --git a/mysql-test/r/sel000005.result b/mysql-test/r/sel000005.result
index 26f5563f3df..b213d603c4e 100644
--- a/mysql-test/r/sel000005.result
+++ b/mysql-test/r/sel000005.result
@@ -1,4 +1,2 @@
-id elt(two.val,'one','two')
-1 one
-2 one
-4 two
+FLOOR(5.5) FLOOR(-5.5) CEILING(5.5) CEILING(-5.5) ROUND(5.5) ROUND(-5.5)
+5 -6 6 -5 6 -6
diff --git a/mysql-test/r/sel000031.result b/mysql-test/r/sel000031.result
new file mode 100644
index 00000000000..26f5563f3df
--- /dev/null
+++ b/mysql-test/r/sel000031.result
@@ -0,0 +1,4 @@
+id elt(two.val,'one','two')
+1 one
+2 one
+4 two
diff --git a/mysql-test/r/sel000032.result b/mysql-test/r/sel000032.result
new file mode 100644
index 00000000000..26f5563f3df
--- /dev/null
+++ b/mysql-test/r/sel000032.result
@@ -0,0 +1,4 @@
+id elt(two.val,'one','two')
+1 one
+2 one
+4 two
diff --git a/mysql-test/r/sel000033.result b/mysql-test/r/sel000033.result
new file mode 100644
index 00000000000..201d8bc9e0e
--- /dev/null
+++ b/mysql-test/r/sel000033.result
@@ -0,0 +1,4 @@
+id
+2
+5
+9