summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql.result
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-12 15:10:26 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-12 15:10:26 +0300
commit0e7c10445f42af4b61d738034e63303b88bf570f (patch)
tree620a4604b76d4dc5951c401d1c4131a79bbfcd3a /mysql-test/r/mysql.result
parent25067ea7e15276dc2c7739015c6a8900805548db (diff)
parentad6883c4f2df12fe054d996e3ed32669248bfb08 (diff)
downloadmariadb-git-0e7c10445f42af4b61d738034e63303b88bf570f.tar.gz
Auto-merge from mysql-trunk.
Diffstat (limited to 'mysql-test/r/mysql.result')
-rw-r--r--mysql-test/r/mysql.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index c02073df677..70e93c3e01f 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -207,6 +207,8 @@ Warning (Code 1286): Unknown table engine 'nonexistent2'
Warning (Code 1266): Using storage engine MyISAM for table 't2'
Error (Code 1050): Table 't2' already exists
drop tables t1, t2;
+Variable_name Value
+lc_messages ru_RU
<TABLE BORDER=1><TR><TH>&lt;</TH></TR><TR><TD>&lt; &amp; &gt;</TD></TR></TABLE>create table t1 (a char(5));
insert into t1 values ('\0b\0');
a