Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
4ab4c99e
Commit
4ab4c99e
authored
May 18, 2006
by
kent@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
type_newdecimal.result, case.result:
Adjusted merge
parent
5842dcaa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
mysql-test/r/case.result
mysql-test/r/case.result
+3
-3
mysql-test/r/type_newdecimal.result
mysql-test/r/type_newdecimal.result
+2
-2
No files found.
mysql-test/r/case.result
View file @
4ab4c99e
...
...
@@ -103,8 +103,8 @@ t1 CREATE TABLE `t1` (
`c2` varchar(1) CHARACTER SET latin1 COLLATE latin1_danish_ci NOT NULL DEFAULT '',
`c3` varbinary(1) NOT NULL DEFAULT '',
`c4` varbinary(1) NOT NULL DEFAULT '',
`c5` varbinary(
3
) NOT NULL DEFAULT '',
`c6` varbinary(
3
) NOT NULL DEFAULT '',
`c5` varbinary(
4
) NOT NULL DEFAULT '',
`c6` varbinary(
4
) NOT NULL DEFAULT '',
`c7` decimal(2,1) NOT NULL DEFAULT '0.0',
`c8` decimal(2,1) NOT NULL DEFAULT '0.0',
`c9` decimal(2,1) DEFAULT NULL,
...
...
@@ -156,7 +156,7 @@ t1 CREATE TABLE `t1` (
`COALESCE('a')` varchar(1) NOT NULL DEFAULT '',
`COALESCE(1,1.0)` decimal(2,1) NOT NULL DEFAULT '0.0',
`COALESCE(1,'1')` varbinary(1) NOT NULL DEFAULT '',
`COALESCE(1.1,'1')` varbinary(
3
) NOT NULL DEFAULT '',
`COALESCE(1.1,'1')` varbinary(
4
) NOT NULL DEFAULT '',
`COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT ''
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
...
...
mysql-test/r/type_newdecimal.result
View file @
4ab4c99e
...
...
@@ -70,7 +70,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`nullif(1.1, 1.1)` decimal(2,1) DEFAULT NULL,
`nullif(1.1, 1.2)` decimal(2,1) DEFAULT NULL,
`nullif(1.1, 0.11e1)` decimal(2,1)
unsigned
DEFAULT NULL,
`nullif(1.1, 0.11e1)` decimal(2,1) DEFAULT NULL,
`nullif(1.0, 1)` decimal(2,1) DEFAULT NULL,
`nullif(1, 1.0)` int(1) DEFAULT NULL,
`nullif(1, 1.1)` int(1) DEFAULT NULL
...
...
@@ -176,7 +176,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`round(15.4,-1)` decimal(3,0) NOT NULL DEFAULT '0',
`truncate(-5678.123451,-3)` decimal(4,0) NOT NULL DEFAULT '0',
`abs(-1.1)` decimal(
2
,1) NOT NULL DEFAULT '0.0',
`abs(-1.1)` decimal(
3
,1) NOT NULL DEFAULT '0.0',
`-(-1.1)` decimal(2,1) NOT NULL DEFAULT '0.0'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment