diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-01-15 17:27:55 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-01-15 17:27:55 +0200 |
| commit | d8ecbbe63471f958aa70443545b63d88d2db0230 (patch) | |
| tree | 32a6f432080d9125b3619f8935eb5b1de00e861d /mysql-test/r/bug47671.result | |
| parent | d121e6630519a66eec7c953ee0eae623f592ce87 (diff) | |
| parent | 6d69089845ed4c50df0ca8136a2cdacb8f2e1380 (diff) | |
| download | mariadb-git-d8ecbbe63471f958aa70443545b63d88d2db0230.tar.gz | |
Merge with MySQL 5.1.42
- Marked a couple of tests with --big
- Fixed xtradb/handler/ha_innodb.cc to call explain_filename()
storage/xtradb/handler/ha_innodb.cc:
Call explain_filename() to get proper names for partitioned tables
Diffstat (limited to 'mysql-test/r/bug47671.result')
| -rw-r--r-- | mysql-test/r/bug47671.result | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/bug47671.result b/mysql-test/r/bug47671.result new file mode 100644 index 00000000000..55e422c12d9 --- /dev/null +++ b/mysql-test/r/bug47671.result @@ -0,0 +1,14 @@ +# +# Bug#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39 +# +# Extract only charset information from 'status' command output using regex +-------------- + +Server: MariaDB +Server characterset: utf8 +Db characterset: utf8 +Client characterset: utf8 +Conn. characterset: utf8 + +-------------- + |