diff options
Diffstat (limited to 'mysql-test/r')
76 files changed, 275 insertions, 268 deletions
diff --git a/mysql-test/r/3.23/README b/mysql-test/r/3.23/README deleted file mode 100644 index e69de29bb2d..00000000000 --- a/mysql-test/r/3.23/README +++ /dev/null diff --git a/mysql-test/r/alt000001.result b/mysql-test/r/alt000001.result index cc95b808d23..d8594916c0b 100644 --- a/mysql-test/r/alt000001.result +++ b/mysql-test/r/alt000001.result @@ -1,5 +1,5 @@ -n -3 -9 -10 -12 +n +3 +9 +10 +12 diff --git a/mysql-test/r/bdb.result b/mysql-test/r/bdb.result index 957f1803079..1ac0a8ea62d 100644 --- a/mysql-test/r/bdb.result +++ b/mysql-test/r/bdb.result @@ -1,24 +1,27 @@ -id code name -1 1 Tim -2 1 Monty -3 2 David -4 2 Erik -5 3 Sasha -6 3 Jeremy -7 4 Matt -id code name -2 1 Monty -3 2 David -4 2 Erik -5 3 Sasha -6 3 Jeremy -7 4 Matt -8 1 Sinisa -id code name -3 2 David -4 2 Erik -5 3 Sasha -6 3 Jeremy -7 4 Matt -8 1 Sinisa -12 1 Ralph +id code name +1 1 Tim +2 1 Monty +3 2 David +4 2 Erik +5 3 Sasha +6 3 Jeremy +7 4 Matt +id code name +2 1 Monty +3 2 David +4 2 Erik +5 3 Sasha +6 3 Jeremy +7 4 Matt +8 1 Sinisa +id code name +3 2 David +4 2 Erik +5 3 Sasha +6 3 Jeremy +7 4 Matt +8 1 Sinisa +12 1 Ralph +gesuchnr benutzer_id +1 1 +2 1 diff --git a/mysql-test/r/crypt.result b/mysql-test/r/crypt.result index fe3f80dc90d..7e0f5f7981d 100644 --- a/mysql-test/r/crypt.result +++ b/mysql-test/r/crypt.result @@ -1,2 +1,2 @@ -encrypt('foo', 'ff') -ffTU0fyIP09Z. +encrypt('foo', 'ff') +ffTU0fyIP09Z. diff --git a/mysql-test/r/equal.result b/mysql-test/r/equal.result index 9de9eafee6a..6e2933641aa 100644 --- a/mysql-test/r/equal.result +++ b/mysql-test/r/equal.result @@ -1,15 +1,15 @@ -0<=>0 0.0<=>0.0 "A"<=>"A" NULL<=>NULL -1 1 1 1 -1<=>0 0<=>NULL NULL<=>0 -0 0 0 -1.0<=>0.0 0.0<=>NULL NULL<=>0.0 -0 0 0 -"A"<=>"B" "A"<=>NULL NULL<=>"A" -0 0 0 -id value id value t1.value<=>t2.value -1 NULL 1 NULL 1 -id value -1 NULL -id value -1 NULL -id value +0<=>0 0.0<=>0.0 "A"<=>"A" NULL<=>NULL +1 1 1 1 +1<=>0 0<=>NULL NULL<=>0 +0 0 0 +1.0<=>0.0 0.0<=>NULL NULL<=>0.0 +0 0 0 +"A"<=>"B" "A"<=>NULL NULL<=>"A" +0 0 0 +id value id value t1.value<=>t2.value +1 NULL 1 NULL 1 +id value +1 NULL +id value +1 NULL +id value diff --git a/mysql-test/r/ft0000001.a.result b/mysql-test/r/ft0000001.a.result index 2b9a1515532..0a99bccec1e 100644 --- a/mysql-test/r/ft0000001.a.result +++ b/mysql-test/r/ft0000001.a.result @@ -1,3 +1,3 @@ -a MATCH (message) AGAINST ('steve') -4 0.90587321329654 -7 0.89568988462614 +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 index 2b9a1515532..0a99bccec1e 100644 --- a/mysql-test/r/ft0000001.b.result +++ b/mysql-test/r/ft0000001.b.result @@ -1,3 +1,3 @@ -a MATCH (message) AGAINST ('steve') -4 0.90587321329654 -7 0.89568988462614 +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 index a88e4b25f2e..0a495a119e2 100644 --- a/mysql-test/r/ft0000001.c.result +++ b/mysql-test/r/ft0000001.c.result @@ -1,3 +1,3 @@ -a MATCH (message) AGAINST ('steve') -7 0.89568988462614 -4 0.90587321329654 +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 index f9ffb78d49d..c3c145b2744 100644 --- a/mysql-test/r/ft0000001.d.result +++ b/mysql-test/r/ft0000001.d.result @@ -1,2 +1,2 @@ -a MATCH (message) AGAINST ('steve') -7 0.89568988462614 +a MATCH (message) AGAINST ('steve') +7 0.89568988462614 diff --git a/mysql-test/r/ft0000001.e.result b/mysql-test/r/ft0000001.e.result index 90d27233ec5..372839e5cf8 100644 --- a/mysql-test/r/ft0000001.e.result +++ b/mysql-test/r/ft0000001.e.result @@ -1,8 +1,8 @@ -a rel -1 0 -2 0 -3 0 -5 0 -6 0 -7 0.89568988462614 -4 0.90587321329654 +a rel +1 0 +2 0 +3 0 +5 0 +6 0 +7 0.89568988462614 +4 0.90587321329654 diff --git a/mysql-test/r/ft0000002.a.result b/mysql-test/r/ft0000002.a.result index f48a6a4fb5e..576b086d13c 100644 --- a/mysql-test/r/ft0000002.a.result +++ b/mysql-test/r/ft0000002.a.result @@ -1,4 +1,4 @@ -a MATCH b AGAINST ('lala lkjh') -1 0.67003110026735 -2 0 -3 0 +a MATCH b AGAINST ('lala lkjh') +1 0.67003110026735 +2 0 +3 0 diff --git a/mysql-test/r/ft0000002.b.result b/mysql-test/r/ft0000002.b.result index aeaf0283ba6..d18d3484f21 100644 --- a/mysql-test/r/ft0000002.b.result +++ b/mysql-test/r/ft0000002.b.result @@ -1,4 +1,4 @@ -a MATCH c AGAINST ('lala lkjh') -1 0 -2 0.67756324121582 -3 0 +a MATCH c AGAINST ('lala lkjh') +1 0 +2 0.67756324121582 +3 0 diff --git a/mysql-test/r/ft0000002.c.result b/mysql-test/r/ft0000002.c.result index 2993e25d842..58179329034 100644 --- a/mysql-test/r/ft0000002.c.result +++ b/mysql-test/r/ft0000002.c.result @@ -1,4 +1,4 @@ -a MATCH b,c AGAINST ('lala lkjh') -1 0.64840710366884 -2 0.66266459031789 -3 0 +a MATCH b,c AGAINST ('lala lkjh') +1 0.64840710366884 +2 0.66266459031789 +3 0 diff --git a/mysql-test/r/have_bdb.require b/mysql-test/r/have_bdb.require new file mode 100644 index 00000000000..969cd6863db --- /dev/null +++ b/mysql-test/r/have_bdb.require @@ -0,0 +1,2 @@ +Variable_name Value +have_bdb YES diff --git a/mysql-test/r/have_isam.require b/mysql-test/r/have_isam.require new file mode 100644 index 00000000000..9b4142361ed --- /dev/null +++ b/mysql-test/r/have_isam.require @@ -0,0 +1,2 @@ +Variable_name Value +have_isam YES diff --git a/mysql-test/r/ins000001.result b/mysql-test/r/ins000001.result index 1003b3b6b18..0db93d6732d 100644 --- a/mysql-test/r/ins000001.result +++ b/mysql-test/r/ins000001.result @@ -1,4 +1,4 @@ -id domain -1 mysql.com -2 hotmail.com -3 aol.com +id domain +1 mysql.com +2 hotmail.com +3 aol.com diff --git a/mysql-test/r/mrg000001.dummy.result b/mysql-test/r/mrg000001.dummy.result index 767f92bc2cb..4c969dfa3bf 100644 --- a/mysql-test/r/mrg000001.dummy.result +++ b/mysql-test/r/mrg000001.dummy.result @@ -1 +1 @@ -incr othr +incr othr diff --git a/mysql-test/r/mrg000001.result b/mysql-test/r/mrg000001.result index 8b351ebe780..97dc723f349 100644 --- a/mysql-test/r/mrg000001.result +++ b/mysql-test/r/mrg000001.result @@ -1,5 +1,5 @@ -incr othr -1 10 -2 24 -4 33 -3 53 +incr othr +1 10 +2 24 +4 33 +3 53 diff --git a/mysql-test/r/mrg000002.result b/mysql-test/r/mrg000002.result index b4960c74ae6..f2ad6c76f01 100644 --- a/mysql-test/r/mrg000002.result +++ b/mysql-test/r/mrg000002.result @@ -1 +1 @@ -c +c diff --git a/mysql-test/r/rpl000001.a.result b/mysql-test/r/rpl000001.a.result index 982e0523cfb..c52b83d729a 100644 --- a/mysql-test/r/rpl000001.a.result +++ b/mysql-test/r/rpl000001.a.result @@ -1,3 +1,3 @@ -n -1 -2 +n +1 +2 diff --git a/mysql-test/r/rpl000001.b.result b/mysql-test/r/rpl000001.b.result index 17cdaf46fa6..5108cfdaf26 100644 --- a/mysql-test/r/rpl000001.b.result +++ b/mysql-test/r/rpl000001.b.result @@ -1,2 +1,2 @@ -sum(length(word)) -71 +sum(length(word)) +71 diff --git a/mysql-test/r/rpl000002.result b/mysql-test/r/rpl000002.result index c76fc46ae97..5b34f36bd05 100644 --- a/mysql-test/r/rpl000002.result +++ b/mysql-test/r/rpl000002.result @@ -1,4 +1,4 @@ -n -2000 -2001 -2002 +n +2000 +2001 +2002 diff --git a/mysql-test/r/rpl000003.result b/mysql-test/r/rpl000003.result index c62967af0bb..f85b057eefa 100644 --- a/mysql-test/r/rpl000003.result +++ b/mysql-test/r/rpl000003.result @@ -1,4 +1,4 @@ -n -1 -2 -3 +n +1 +2 +3 diff --git a/mysql-test/r/rpl000004.a.result b/mysql-test/r/rpl000004.a.result index 4061fdb4a0d..2c9c8bf0c4f 100644 --- a/mysql-test/r/rpl000004.a.result +++ b/mysql-test/r/rpl000004.a.result @@ -1,2 +1,2 @@ -Table Op Msg_type Msg_text -test.words check status OK +Table Op Msg_type Msg_text +test.words check status OK diff --git a/mysql-test/r/rpl000004.b.result b/mysql-test/r/rpl000004.b.result index c71e0b46471..7e05933909e 100644 --- a/mysql-test/r/rpl000004.b.result +++ b/mysql-test/r/rpl000004.b.result @@ -1,2 +1,2 @@ -count(*) -10 +count(*) +10 diff --git a/mysql-test/r/rpl000005.result b/mysql-test/r/rpl000005.result index 763154b938e..2be354af151 100644 --- a/mysql-test/r/rpl000005.result +++ b/mysql-test/r/rpl000005.result @@ -1,4 +1,4 @@ -name age id -Andy 31 00000001 -Jacob 2 00000002 -Caleb 1 00000003 +name age id +Andy 31 00000001 +Jacob 2 00000002 +Caleb 1 00000003 diff --git a/mysql-test/r/rpl000006.result b/mysql-test/r/rpl000006.result index c3e4a2326d0..d2a036b9154 100644 --- a/mysql-test/r/rpl000006.result +++ b/mysql-test/r/rpl000006.result @@ -1,2 +1,2 @@ -unix_timestamp(t) -200006 +unix_timestamp(t) +200006 diff --git a/mysql-test/r/rpl000007.result b/mysql-test/r/rpl000007.result index 08f13272f2a..d5b4cdf3bee 100644 --- a/mysql-test/r/rpl000007.result +++ b/mysql-test/r/rpl000007.result @@ -1,2 +1,2 @@ -n m -4 15 +n m +4 15 diff --git a/mysql-test/r/rpl000008.result b/mysql-test/r/rpl000008.result index 964ea8d84de..870e8a5510d 100644 --- a/mysql-test/r/rpl000008.result +++ b/mysql-test/r/rpl000008.result @@ -1,2 +1,2 @@ -n m k -4 15 55 +n m k +4 15 55 diff --git a/mysql-test/r/rpl000009.result b/mysql-test/r/rpl000009.result index 08f13272f2a..d5b4cdf3bee 100644 --- a/mysql-test/r/rpl000009.result +++ b/mysql-test/r/rpl000009.result @@ -1,2 +1,2 @@ -n m -4 15 +n m +4 15 diff --git a/mysql-test/r/rpl000010.result b/mysql-test/r/rpl000010.result index 982e0523cfb..c52b83d729a 100644 --- a/mysql-test/r/rpl000010.result +++ b/mysql-test/r/rpl000010.result @@ -1,3 +1,3 @@ -n -1 -2 +n +1 +2 diff --git a/mysql-test/r/rpl000011.result b/mysql-test/r/rpl000011.result index 982e0523cfb..c52b83d729a 100644 --- a/mysql-test/r/rpl000011.result +++ b/mysql-test/r/rpl000011.result @@ -1,3 +1,3 @@ -n -1 -2 +n +1 +2 diff --git a/mysql-test/r/rpl000012.result b/mysql-test/r/rpl000012.result index 22fd6be3003..414468f0998 100644 --- a/mysql-test/r/rpl000012.result +++ b/mysql-test/r/rpl000012.result @@ -1,7 +1,7 @@ -n -1 -2 -3 -4 -5 -6 +n +1 +2 +3 +4 +5 +6 diff --git a/mysql-test/r/rpl000012.status.result b/mysql-test/r/rpl000012.status.result index fbbae06c3f9..c03e09c99bc 100644 --- a/mysql-test/r/rpl000012.status.result +++ b/mysql-test/r/rpl000012.status.result @@ -1,2 +1,2 @@ -Variable_name Value -Slave_open_temp_tables 0 +Variable_name Value +Slave_open_temp_tables 0 diff --git a/mysql-test/r/rpl000013.result b/mysql-test/r/rpl000013.result index 22fd6be3003..414468f0998 100644 --- a/mysql-test/r/rpl000013.result +++ b/mysql-test/r/rpl000013.result @@ -1,7 +1,7 @@ -n -1 -2 -3 -4 -5 -6 +n +1 +2 +3 +4 +5 +6 diff --git a/mysql-test/r/rpl000013.status.result b/mysql-test/r/rpl000013.status.result index fbbae06c3f9..c03e09c99bc 100644 --- a/mysql-test/r/rpl000013.status.result +++ b/mysql-test/r/rpl000013.status.result @@ -1,2 +1,2 @@ -Variable_name Value -Slave_open_temp_tables 0 +Variable_name Value +Slave_open_temp_tables 0 diff --git a/mysql-test/r/rpl000014.result b/mysql-test/r/rpl000014.result index 25082dcc60f..40421f71fee 100644 --- a/mysql-test/r/rpl000014.result +++ b/mysql-test/r/rpl000014.result @@ -1,16 +1,16 @@ -File Position Binlog_do_db Binlog_ignore_db -master-bin.001 73 -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db -127.0.0.1 root 9306 1 73 Yes -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db -127.0.0.1 root 9306 1 73 No -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db -127.0.0.1 root 9306 1 73 Yes -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db -127.0.0.1 root 9306 1 173 Yes -File Position Binlog_do_db Binlog_ignore_db -master-bin.001 73 -n -1 -2 -3 +File Position Binlog_do_db Binlog_ignore_db +master-bin.001 73 +Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db +127.0.0.1 root 9306 1 73 Yes +Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db +127.0.0.1 root 9306 1 73 No +Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db +127.0.0.1 root 9306 1 73 Yes +Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db +127.0.0.1 root 9306 1 173 Yes +File Position Binlog_do_db Binlog_ignore_db +master-bin.001 73 +n +1 +2 +3 diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result index 199c2410a09..45abae3976e 100644 --- a/mysql-test/r/rpl000015.result +++ b/mysql-test/r/rpl000015.result @@ -1,14 +1,14 @@ -File Position Binlog_do_db Binlog_ignore_db -master-bin.001 73 -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db - 0 0 0 No -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db -127.0.0.1 test 3306 60 4 No -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db -127.0.0.1 root 9306 60 4 No -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db -127.0.0.1 root 9306 60 4 Yes -n -10 -45 -90 +File Position Binlog_do_db Binlog_ignore_db +master-bin.001 73 +Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db + 0 0 0 No +Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db +127.0.0.1 test 3306 60 4 No +Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db +127.0.0.1 root 9306 60 4 No +Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db +127.0.0.1 root 9306 60 4 Yes +n +10 +45 +90 diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result index 56108ae37cc..5d0ff3877b8 100644 --- a/mysql-test/r/rpl000016.result +++ b/mysql-test/r/rpl000016.result @@ -1,14 +1,14 @@ -s -Could not break slave -Tried hard -Log_name -master-bin.001 -master-bin.002 -master-bin.003 -Log_name -master-bin.003 -m -34 -67 -123 -65 +s +Could not break slave +Tried hard +Log_name +master-bin.001 +master-bin.002 +master-bin.003 +Log_name +master-bin.003 +m +34 +67 +123 +65 diff --git a/mysql-test/r/sel000001.result b/mysql-test/r/sel000001.result index 749778fabac..bee97cc7b53 100644 --- a/mysql-test/r/sel000001.result +++ b/mysql-test/r/sel000001.result @@ -1,2 +1,2 @@ -s id -mouse 3 +s id +mouse 3 diff --git a/mysql-test/r/sel000002.result b/mysql-test/r/sel000002.result index c62967af0bb..f85b057eefa 100644 --- a/mysql-test/r/sel000002.result +++ b/mysql-test/r/sel000002.result @@ -1,4 +1,4 @@ -n -1 -2 -3 +n +1 +2 +3 diff --git a/mysql-test/r/sel000003.result b/mysql-test/r/sel000003.result index 098e2cce1b0..77312414818 100644 --- a/mysql-test/r/sel000003.result +++ b/mysql-test/r/sel000003.result @@ -1,3 +1,3 @@ -n score -4 10 -2 20 +n score +4 10 +2 20 diff --git a/mysql-test/r/sel000004.result b/mysql-test/r/sel000004.result index 7ef0cdabb96..81b7f808dd5 100644 --- a/mysql-test/r/sel000004.result +++ b/mysql-test/r/sel000004.result @@ -1,2 +1,2 @@ -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 +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 b213d603c4e..0b81584ba16 100644 --- a/mysql-test/r/sel000005.result +++ b/mysql-test/r/sel000005.result @@ -1,2 +1,2 @@ -FLOOR(5.5) FLOOR(-5.5) CEILING(5.5) CEILING(-5.5) ROUND(5.5) ROUND(-5.5) -5 -6 6 -5 6 -6 +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/sel000006.result b/mysql-test/r/sel000006.result index 82967786fce..78876f03c96 100644 --- a/mysql-test/r/sel000006.result +++ b/mysql-test/r/sel000006.result @@ -1,2 +1,2 @@ -ROUND(5.64,1) ROUND(5.64,2) ROUND(5.64,-1) ROUND(5.64,-2) -5.6 5.64 10 0 +ROUND(5.64,1) ROUND(5.64,2) ROUND(5.64,-1) ROUND(5.64,-2) +5.6 5.64 10 0 diff --git a/mysql-test/r/sel000007.result b/mysql-test/r/sel000007.result index 2a175b2d723..a1243aa547f 100644 --- a/mysql-test/r/sel000007.result +++ b/mysql-test/r/sel000007.result @@ -1,2 +1,2 @@ -TRUNCATE(52.64,1) TRUNCATE(52.64,2) TRUNCATE(52.64,-1) TRUNCATE(52.64,-2) -52.6 52.64 50 0 +TRUNCATE(52.64,1) TRUNCATE(52.64,2) TRUNCATE(52.64,-1) TRUNCATE(52.64,-2) +52.6 52.64 50 0 diff --git a/mysql-test/r/sel000008.result b/mysql-test/r/sel000008.result index 3438a3e6970..8129d7951f5 100644 --- a/mysql-test/r/sel000008.result +++ b/mysql-test/r/sel000008.result @@ -1,2 +1,2 @@ -ABS(-10) LOG(EXP(10)) EXP(LOG(SQRT(10))*2) POW(10,LOG10(10)) RAND(999999) RAND() POWER(2,4) -10 10.000000 10.000000 10.000000 0.18435012473199 0.76373626176616 16.000000 +ABS(-10) LOG(EXP(10)) EXP(LOG(SQRT(10))*2) POW(10,LOG10(10)) RAND(999999) RAND() POWER(2,4) +10 10.000000 10.000000 10.000000 0.18435012473199 0.76373626176616 16.000000 diff --git a/mysql-test/r/sel000009.result b/mysql-test/r/sel000009.result index 410b404774f..5118e2d3966 100644 --- a/mysql-test/r/sel000009.result +++ b/mysql-test/r/sel000009.result @@ -1,2 +1,2 @@ -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) 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 diff --git a/mysql-test/r/sel000010.result b/mysql-test/r/sel000010.result index 439e30093aa..2a76c331cb3 100644 --- a/mysql-test/r/sel000010.result +++ b/mysql-test/r/sel000010.result @@ -1,2 +1,2 @@ -1 | (1+1) 5 & 3 BIT_COUNT(7) -3 1 3 +1 | (1+1) 5 & 3 BIT_COUNT(7) +3 1 3 diff --git a/mysql-test/r/sel000011.result b/mysql-test/r/sel000011.result index a0e5f33bc6b..00ca3a4d917 100644 --- a/mysql-test/r/sel000011.result +++ b/mysql-test/r/sel000011.result @@ -1,2 +1,2 @@ -1 << 32 1 << 63 1 << 64 4 >> 2 4 >> 63 1<< 63 >> 60 -4294967296 -9223372036854775808 0 1 0 8 +1 << 32 1 << 63 1 << 64 4 >> 2 4 >> 63 1<< 63 >> 60 +4294967296 -9223372036854775808 0 1 0 8 diff --git a/mysql-test/r/sel000012.result b/mysql-test/r/sel000012.result index 579fe8d87a3..79108ddfd9f 100644 --- a/mysql-test/r/sel000012.result +++ b/mysql-test/r/sel000012.result @@ -1,2 +1,2 @@ -10 10.0 10. .1e+2 100.0e-1 -10 10.0 10 10 10 +10 10.0 10. .1e+2 100.0e-1 +10 10.0 10 10 10 diff --git a/mysql-test/r/sel000013.result b/mysql-test/r/sel000013.result index eda7608ef4d..9c1be0bf4b2 100644 --- a/mysql-test/r/sel000013.result +++ b/mysql-test/r/sel000013.result @@ -1,2 +1,2 @@ -6e-05 -6e-05 --6e-05 -6e-05+1.000000 -6e-05 -6e-05 6e-05 0.99994 +6e-05 -6e-05 --6e-05 -6e-05+1.000000 +6e-05 -6e-05 6e-05 0.99994 diff --git a/mysql-test/r/sel000014.result b/mysql-test/r/sel000014.result index bd8b967d300..ad3c1f9a0a3 100644 --- a/mysql-test/r/sel000014.result +++ b/mysql-test/r/sel000014.result @@ -1,2 +1,2 @@ -0 256 00000000000000065536 2147483647 -2147483648 2147483648 +4294967296 -0 256 65536 2147483647 -2147483648 2147483648 4294967296 +0 256 00000000000000065536 2147483647 -2147483648 2147483648 +4294967296 +0 256 65536 2147483647 -2147483648 2147483648 4294967296 diff --git a/mysql-test/r/sel000015.result b/mysql-test/r/sel000015.result index e4fca79f398..61e880eee90 100644 --- a/mysql-test/r/sel000015.result +++ b/mysql-test/r/sel000015.result @@ -1,2 +1,2 @@ -922337203685477580 92233720368547758000 -922337203685477580 92233720368547758080 +922337203685477580 92233720368547758000 +922337203685477580 92233720368547758080 diff --git a/mysql-test/r/sel000016.result b/mysql-test/r/sel000016.result index 58384e104cc..a5deee463f4 100644 --- a/mysql-test/r/sel000016.result +++ b/mysql-test/r/sel000016.result @@ -1,2 +1,2 @@ --922337203685477580 -92233720368547758000 --922337203685477580 -92233720368547758080 +-922337203685477580 -92233720368547758000 +-922337203685477580 -92233720368547758080 diff --git a/mysql-test/r/sel000017.result b/mysql-test/r/sel000017.result index d68bb440274..62c695d4cd9 100644 --- a/mysql-test/r/sel000017.result +++ b/mysql-test/r/sel000017.result @@ -1,2 +1,2 @@ -9223372036854775807 -009223372036854775808 -9223372036854775807 -9223372036854775808 +9223372036854775807 -009223372036854775808 +9223372036854775807 -9223372036854775808 diff --git a/mysql-test/r/sel000018.result b/mysql-test/r/sel000018.result index 1155ffd553e..60c53c39bb5 100644 --- a/mysql-test/r/sel000018.result +++ b/mysql-test/r/sel000018.result @@ -1,2 +1,2 @@ -+9999999999999999999 -9999999999999999999 -10000000000000000000 -10000000000000000000 ++9999999999999999999 -9999999999999999999 +10000000000000000000 -10000000000000000000 diff --git a/mysql-test/r/sel000019.result b/mysql-test/r/sel000019.result index 56e8bfebdcd..c08322d34eb 100644 --- a/mysql-test/r/sel000019.result +++ b/mysql-test/r/sel000019.result @@ -1,2 +1,2 @@ -DEGREES(PI()) RADIANS(360) -180 6.2831853071796 +DEGREES(PI()) RADIANS(360) +180 6.2831853071796 diff --git a/mysql-test/r/sel000020.result b/mysql-test/r/sel000020.result index 3d3b68fca73..5be406f52c6 100644 --- a/mysql-test/r/sel000020.result +++ b/mysql-test/r/sel000020.result @@ -1,2 +1,2 @@ -0=0 1>0 1>=1 1<0 1<=0 1!=0 STRCMP("abc","abcd") STRCMP("b","a") STRCMP("a","a") -1 1 1 0 0 1 -1 1 0 +0=0 1>0 1>=1 1<0 1<=0 1!=0 STRCMP("abc","abcd") STRCMP("b","a") STRCMP("a","a") +1 1 1 0 0 1 -1 1 0 diff --git a/mysql-test/r/sel000021.result b/mysql-test/r/sel000021.result index 03ab284ac5d..8ad4705eb95 100644 --- a/mysql-test/r/sel000021.result +++ b/mysql-test/r/sel000021.result @@ -1,2 +1,2 @@ -"a"<"b" "a"<="b" "b">="a" "b">"a" "a"="A" "a"<>"b" -1 1 1 1 1 1 +"a"<"b" "a"<="b" "b">="a" "b">"a" "a"="A" "a"<>"b" +1 1 1 1 1 1 diff --git a/mysql-test/r/sel000022.result b/mysql-test/r/sel000022.result index 4f6dedaa83f..43006335b13 100644 --- a/mysql-test/r/sel000022.result +++ b/mysql-test/r/sel000022.result @@ -1,2 +1,2 @@ -"a "="A" "A "="a" "a " <= "A b" -1 1 1 +"a "="A" "A "="a" "a " <= "A b" +1 1 1 diff --git a/mysql-test/r/sel000023.result b/mysql-test/r/sel000023.result index 835c340b686..0f88219b1c3 100644 --- a/mysql-test/r/sel000023.result +++ b/mysql-test/r/sel000023.result @@ -1,2 +1,2 @@ -"abc" LIKE "a%" "abc" NOT LIKE "%d%" "a%" LIKE "a\%" "abc%" LIKE "a%\%" "abcd" LIKE "a%b_%d" "a" LIKE "%%a" "abcde" LIKE "a%_e" "abc" LIKE "abc%" -1 1 1 1 1 1 1 1 +"abc" LIKE "a%" "abc" NOT LIKE "%d%" "a%" LIKE "a\%" "abc%" LIKE "a%\%" "abcd" LIKE "a%b_%d" "a" LIKE "%%a" "abcde" LIKE "a%_e" "abc" LIKE "abc%" +1 1 1 1 1 1 1 1 diff --git a/mysql-test/r/sel000024.result b/mysql-test/r/sel000024.result index daa9a143b60..a0ceee902bd 100644 --- a/mysql-test/r/sel000024.result +++ b/mysql-test/r/sel000024.result @@ -1,2 +1,2 @@ -"a" LIKE "%%b" "a" LIKE "%%ab" "ab" LIKE "a\%" "ab" LIKE "_" "ab" LIKE "ab_" "abc" LIKE "%_d" "abc" LIKE "abc%d" -0 0 0 0 0 0 0 +"a" LIKE "%%b" "a" LIKE "%%ab" "ab" LIKE "a\%" "ab" LIKE "_" "ab" LIKE "ab_" "abc" LIKE "%_d" "abc" LIKE "abc%d" +0 0 0 0 0 0 0 diff --git a/mysql-test/r/sel000025.result b/mysql-test/r/sel000025.result index caf244be1d9..12a2cce2067 100644 --- a/mysql-test/r/sel000025.result +++ b/mysql-test/r/sel000025.result @@ -1,2 +1,2 @@ -'?' LIKE '|%' '?' LIKE '|%' ESCAPE '|' '%' LIKE '|%' '%' LIKE '|%' ESCAPE '|' '%' LIKE '%' -0 0 0 1 1 +'?' LIKE '|%' '?' LIKE '|%' ESCAPE '|' '%' LIKE '|%' '%' LIKE '|%' ESCAPE '|' '%' LIKE '%' +0 0 0 1 1 diff --git a/mysql-test/r/sel000026.result b/mysql-test/r/sel000026.result index acf301a349f..1f268717bcc 100644 --- a/mysql-test/r/sel000026.result +++ b/mysql-test/r/sel000026.result @@ -1,2 +1,2 @@ -'abc' LIKE '%c' 'abcabc' LIKE '%c' "ab" LIKE "" "ab" LIKE "a" "ab" LIKE "ab" -1 1 0 0 1 +'abc' LIKE '%c' 'abcabc' LIKE '%c' "ab" LIKE "" "ab" LIKE "a" "ab" LIKE "ab" +1 1 0 0 1 diff --git a/mysql-test/r/sel000027.result b/mysql-test/r/sel000027.result index df2945c6da8..0541b8a7037 100644 --- a/mysql-test/r/sel000027.result +++ b/mysql-test/r/sel000027.result @@ -1,2 +1,2 @@ -"Det här är svenska" REGEXP "h[[:alpha:]]+r" "aba" REGEXP "^(a|b)*$" -1 1 +"Det här är svenska" REGEXP "h[[:alpha:]]+r" "aba" REGEXP "^(a|b)*$" +1 1 diff --git a/mysql-test/r/sel000028.result b/mysql-test/r/sel000028.result index cd5b3268b53..ecb81bdbf23 100644 --- a/mysql-test/r/sel000028.result +++ b/mysql-test/r/sel000028.result @@ -1,2 +1,2 @@ -"aba" REGEXP CONCAT("^","a") -1 +"aba" REGEXP CONCAT("^","a") +1 diff --git a/mysql-test/r/sel000029.result b/mysql-test/r/sel000029.result index 0ceb7494fd3..2df43a28462 100644 --- a/mysql-test/r/sel000029.result +++ b/mysql-test/r/sel000029.result @@ -1,2 +1,2 @@ -!0 NOT 0=1 !(0=0) 1 AND 1 1 && 0 0 OR 1 1 || NULL 1=1 OR 1=1 AND 1=0 -1 1 0 1 0 1 1 1 +!0 NOT 0=1 !(0=0) 1 AND 1 1 && 0 0 OR 1 1 || NULL 1=1 OR 1=1 AND 1=0 +1 1 0 1 0 1 1 1 diff --git a/mysql-test/r/sel000030.result b/mysql-test/r/sel000030.result index 575549b600f..460df893025 100644 --- a/mysql-test/r/sel000030.result +++ b/mysql-test/r/sel000030.result @@ -1,2 +1,2 @@ -IF(0,"ERROR","this") IF(1,"is","ERROR") IF(NULL,"ERROR","a") IF(1,2,3)|0 IF(1,2.0,3.0)+0 -this is a 2 2.0 +IF(0,"ERROR","this") IF(1,"is","ERROR") IF(NULL,"ERROR","a") IF(1,2,3)|0 IF(1,2.0,3.0)+0 +this is a 2 2.0 diff --git a/mysql-test/r/sel000031.result b/mysql-test/r/sel000031.result index 26f5563f3df..c1caa04a00a 100644 --- a/mysql-test/r/sel000031.result +++ b/mysql-test/r/sel000031.result @@ -1,4 +1,4 @@ -id elt(two.val,'one','two') -1 one -2 one -4 two +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 index 26f5563f3df..c1caa04a00a 100644 --- a/mysql-test/r/sel000032.result +++ b/mysql-test/r/sel000032.result @@ -1,4 +1,4 @@ -id elt(two.val,'one','two') -1 one -2 one -4 two +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 index 201d8bc9e0e..1a1325d4360 100644 --- a/mysql-test/r/sel000033.result +++ b/mysql-test/r/sel000033.result @@ -1,4 +1,4 @@ -id -2 -5 -9 +id +2 +5 +9 diff --git a/mysql-test/r/sel000100.result b/mysql-test/r/sel000100.result index 6c204279c28..e7d8cf0e7ac 100644 --- a/mysql-test/r/sel000100.result +++ b/mysql-test/r/sel000100.result @@ -1,2 +1,2 @@ -key_link_id link -NULL NULL +key_link_id link +NULL NULL diff --git a/mysql-test/r/shw000001.result b/mysql-test/r/shw000001.result index f38d2f1ef36..28ad1296d67 100644 --- a/mysql-test/r/shw000001.result +++ b/mysql-test/r/shw000001.result @@ -1,5 +1,5 @@ -Table Create Table +Table Create Table test CREATE TABLE `test` ( `test_set` set('val1','val2','val3') NOT NULL default '', `name` char(20) default 'O''Brien' -) TYPE=MyISAM COMMENT='it''s a table' +) TYPE=MyISAM COMMENT='it''s a table' diff --git a/mysql-test/r/slave-running.result b/mysql-test/r/slave-running.result index 1dc7c7ddd9c..794d0935ef4 100644 --- a/mysql-test/r/slave-running.result +++ b/mysql-test/r/slave-running.result @@ -1,2 +1,2 @@ -Variable_name Value -Slave_running ON +Variable_name Value +Slave_running ON diff --git a/mysql-test/r/slave-stopped.result b/mysql-test/r/slave-stopped.result index 64323ecc0f3..29ab2ac73e4 100644 --- a/mysql-test/r/slave-stopped.result +++ b/mysql-test/r/slave-stopped.result @@ -1,2 +1,2 @@ -Variable_name Value -Slave_running OFF +Variable_name Value +Slave_running OFF |