summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorunknown <holyfoot@deer.(none)>2006-01-23 11:58:14 +0400
committerunknown <holyfoot@deer.(none)>2006-01-23 11:58:14 +0400
commit823ec15c65d9831fdf3a3521b214dbf1a20ca1ec (patch)
tree8f492f3265c018e9b62222f1c6928c045bcb9d0c /mysql-test/r/mysqltest.result
parentd07932a3f19aa5bbaf50ea40aca9ad5cce5abb54 (diff)
downloadmariadb-git-823ec15c65d9831fdf3a3521b214dbf1a20ca1ec.tar.gz
Fixes about the embedded-server in 5.1
libmysqld/lib_sql.cc: logger initialization added mysql-test/mysql-test-run.pl: ndbcluster and ssl disabled in embedded server mysql-test/mysql-test-run.sh: ndbcluster disabled in embedded server mysql-test/r/mysqltest.result: result fixed mysql-test/r/sp_notembedded.result: result fixed mysql-test/t/log_tables.test: test disabled in embedded server mysql-test/t/sp_notembedded.test: test fixed
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index ed474265b9b..3e1bf1946ff 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -1,6 +1,6 @@
-select -1 as "before_use_test" ;
+select 0 as "before_use_test" ;
before_use_test
--1
+0
select otto from (select 1 as otto) as t1;
otto
1