summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/fulltext.result14
-rw-r--r--mysql-test/r/func_math.result4
2 files changed, 16 insertions, 2 deletions
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index 7d9ba18d933..a08b5da99a4 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -6,3 +6,17 @@ Full-text indexes are called collections
a b
Full-text indexes are called collections
Only MyISAM tables support collections
+id
+id
+id
+3
+Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment
+t2 1 tig 1 ticket A NULL NULL NULL
+t2 1 tix 1 inhalt A NULL 1 NULL FULLTEXT
+Table Create Table
+t2 CREATE TABLE `t2` (
+ `ticket` int(11) default NULL,
+ `inhalt` text,
+ KEY `tig`(`ticket`),
+ FULLTEXT KEY `tix`(`inhalt`)
+) TYPE=MyISAM
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result
index 33d1dfe65e7..cee67a3e25c 100644
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/r/func_math.result
@@ -16,7 +16,7 @@ pow(10,log10(10)) power(2,4)
10.000000 16.000000
rand(999999) rand()
0.18435012473199 0.76373626176616
-PI() sin(pi()/2) cos(pi()/2) tan(pi()) cot(1) asin(1) acos(0) atan(1)
-3.141593 1.000000 0.000000 -0.000000 0.64209262 1.570796 1.570796 0.785398
+PI() sin(pi()/2) cos(pi()/2) abs(tan(pi())) cot(1) asin(1) acos(0) atan(1)
+3.141593 1.000000 0.000000 0.000000 0.64209262 1.570796 1.570796 0.785398
degrees(pi()) radians(360)
180 6.2831853071796