diff options
| author | Jim Winstead <jimw@mysql.com> | 2009-07-14 10:08:38 -0700 |
|---|---|---|
| committer | Jim Winstead <jimw@mysql.com> | 2009-07-14 10:08:38 -0700 |
| commit | 1286d0f3f92784ddadc55f68707b45dbc6922aa2 (patch) | |
| tree | 621df211e8838b5cbacf88d7e41019a2401d4f4f /mysql-test/r/mysql.result | |
| parent | ed3b0a69cfbc5778f000df4d2e46baa1f1173c57 (diff) | |
| parent | f0f4efd77e3eb7d62176396b5ccf53d7a7029c85 (diff) | |
| download | mariadb-git-1286d0f3f92784ddadc55f68707b45dbc6922aa2.tar.gz | |
Merge in bug fixes for client tools
Diffstat (limited to 'mysql-test/r/mysql.result')
| -rw-r--r-- | mysql-test/r/mysql.result | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index e704f81e187..b77d30a4973 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 |