diff options
| author | Jim Winstead <jimw@mysql.com> | 2009-05-20 17:04:44 -0700 |
|---|---|---|
| committer | Jim Winstead <jimw@mysql.com> | 2009-05-20 17:04:44 -0700 |
| commit | 1e9a02c943101bfd75d539ee58eeed4caf1a17d9 (patch) | |
| tree | cf1a7333e44698490dec53901a753f4dbe68437b /mysql-test/r | |
| parent | 50e7c391122e7d89b4fca0399375a406f36df9ee (diff) | |
| download | mariadb-git-1e9a02c943101bfd75d539ee58eeed4caf1a17d9.tar.gz | |
The mysql command-line client would include superfluous spaces at the end of
some result set lines. (Bug #29622)
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/mysql.result | 36 | ||||
| -rw-r--r-- | mysql-test/r/parser_not_embedded.result | 18 |
2 files changed, 27 insertions, 27 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index c53a2243811..101518289e9 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -64,28 +64,28 @@ drop table t1; +----------------------+------------+--------+ | concat('>',col1,'<') | col2 | col3 | +----------------------+------------+--------+ -| >a < | b | 123421 | -| >a < | 0123456789 | 4 | -| >abcd< | | 4 | +| >a < | b | 123421 | +| >a < | 0123456789 | 4 | +| >abcd< | | 4 | +----------------------+------------+--------+ +-------------------+ | __tañgè Ñãmé | +-------------------+ -| John Doe | +| John Doe | +-------------------+ +-------------------+ | John Doe | +-------------------+ -| __tañgè Ñãmé | +| __tañgè Ñãmé | +-------------------+ +------+------+---------------------------+ | i | j | k | +------+------+---------------------------+ -| 1 | NULL | NULL | -| NULL | NULL | <-----------------------> | -| NULL | NULL | <----- | -| NULL | NULL | Τη γλώσσα | -| NULL | NULL | ᛖᚴ ᚷᛖᛏ | +| 1 | NULL | NULL | +| NULL | NULL | <-----------------------> | +| NULL | NULL | <----- | +| NULL | NULL | Τη γλώσσα | +| NULL | NULL | ᛖᚴ ᚷᛖᛏ | +------+------+---------------------------+ i j k NULL 1 NULL @@ -96,14 +96,14 @@ k int(11) YES NULL +------+---+------+ | i | j | k | +------+---+------+ -| NULL | 1 | NULL | +| NULL | 1 | NULL | +------+---+------+ +-------+---------+------+-----+---------+-------+ | Field | Type | Null | Key | Default | Extra | +-------+---------+------+-----+---------+-------+ -| i | int(11) | YES | | NULL | | -| j | int(11) | NO | | NULL | | -| k | int(11) | YES | | NULL | | +| i | int(11) | YES | | NULL | | +| j | int(11) | NO | | NULL | | +| k | int(11) | YES | | NULL | | +-------+---------+------+-----+---------+-------+ i s1 1 x @@ -112,16 +112,16 @@ i s1 +------+------+ | i | s1 | +------+------+ -| 1 | x | -| 2 | NULL | -| 3 | | +| 1 | x | +| 2 | NULL | +| 3 | | +------+------+ unhex('zz') NULL +-------------+ | unhex('zz') | +-------------+ -| NULL | +| NULL | +-------------+ create table t1(a int, b varchar(255), c int); Field Type Null Key Default Extra diff --git a/mysql-test/r/parser_not_embedded.result b/mysql-test/r/parser_not_embedded.result index 871eb226cc4..140b13c9864 100644 --- a/mysql-test/r/parser_not_embedded.result +++ b/mysql-test/r/parser_not_embedded.result @@ -5,45 +5,45 @@ +----------+--------+ | expected | result | +----------+--------+ -| 2 | 2 | +| 2 | 2 | +----------+--------+ +----------+--------+ | expected | result | +----------+--------+ -| 1 | 1 | +| 1 | 1 | +----------+--------+ +----------+--------+ | expected | result | +----------+--------+ -| 3 | 3 | +| 3 | 3 | +----------+--------+ +----------+--------+ | expected | result | +----------+--------+ -| 2 | 2 | +| 2 | 2 | +----------+--------+ +----------+--------+ | expected | result | +----------+--------+ -| 7 | 7 | +| 7 | 7 | +----------+--------+ +----------+--------+ | expected | result | +----------+--------+ -| 8 | 8 | +| 8 | 8 | +----------+--------+ +----------+--------+ | expected | result | +----------+--------+ -| 7 | 7 | +| 7 | 7 | +----------+--------+ +----------+--------+ | expected | result | +----------+--------+ -| 4 | 4 | +| 4 | 4 | +----------+--------+ +----------+--------+ | expected | result | +----------+--------+ -| 4 | 4 | +| 4 | 4 | +----------+--------+ |