summaryrefslogtreecommitdiff
path: root/mysql-test/suite/pbxt
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2010-10-28 19:04:23 +0200
committerSergei Golubchik <sergii@pisem.net>2010-10-28 19:04:23 +0200
commit8e7ebfbce89a472b3c5a6c30e6de101e567a8218 (patch)
tree9f9950feb45222c7df4f37c841f4af593ec75ee5 /mysql-test/suite/pbxt
parent3bdede3c67032345ca5f71dd53ca308377dc2398 (diff)
parent7c24e8d54d1d41374b7836e3273e7e5eaf22e2c4 (diff)
downloadmariadb-git-8e7ebfbce89a472b3c5a6c30e6de101e567a8218.tar.gz
5.2 merge
Diffstat (limited to 'mysql-test/suite/pbxt')
-rw-r--r--mysql-test/suite/pbxt/r/func_sapdb.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/pbxt/r/func_sapdb.result b/mysql-test/suite/pbxt/r/func_sapdb.result
index 7a61f434d2f..b0c697e54ac 100644
--- a/mysql-test/suite/pbxt/r/func_sapdb.result
+++ b/mysql-test/suite/pbxt/r/func_sapdb.result
@@ -185,7 +185,7 @@ date("1997-12-31 23:59:59.000001") as f8,
time("1997-12-31 23:59:59.000001") as f9;
describe t1;
Field Type Null Key Default Extra
-f1 date NO 0000-00-00
+f1 date YES NULL
f2 datetime YES NULL
f3 time YES NULL
f4 time YES NULL