database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity

Merge mysql.com:/usr/home/bar/mysql-4.1.num-conv

Browse Source 
into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/item.cc:
  After merge fix.
This commit is contained in:
unknown
2005-07-14 16:11:55 +05:00
parent c0e325a35c 86cb32b7b0
commit 212345b400
5 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/ctype_utf8.result
View File

@@ -905,6 +905,10 @@ select * from t1 where city = 'Durban ';
id city
2 Durban
drop table t1;
create table t1 (x set('A', 'B') default 0) character set utf8;
ERROR 42000: Invalid default value for 'x'
create table t1 (x enum('A', 'B') default 0) character set utf8;
ERROR 42000: Invalid default value for 'x'
SET NAMES UTF8;
CREATE TABLE t1 (
`id` int(20) NOT NULL auto_increment,