diff options
author | unknown <monty@mashka.mysql.fi> | 2003-01-14 14:28:36 +0200 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2003-01-14 14:28:36 +0200 |
commit | 910c125bb6528b08f7c30b7b75650076b7b953fe (patch) | |
tree | 7a63ba29620ada893aa14d1984554e0af0a0deaa /mysql-test/r/merge.result | |
parent | 91f18f0a26e3714bd9edc78b1c6fe7a1fd243167 (diff) | |
download | mariadb-git-910c125bb6528b08f7c30b7b75650076b7b953fe.tar.gz |
Updates for multi-byte character sets
(Note: test 'union' fails, but Sanja promised to fix this)
include/m_ctype.h:
Changed prototype for strntod() to inform the user that source may be modified.
include/m_string.h:
Moved my_vsnprintf to strings library
include/my_sys.h:
Moved my_vsnprintf to strings library
libmysql/Makefile.shared:
Moved my_vsnprintf to strings library
mysql-test/r/alter_table.result:
Moved my_vsnprintf to strings library
mysql-test/r/create.result:
Moved my_vsnprintf to strings library
mysql-test/r/ctype_many.result:
Moved my_vsnprintf to strings library
mysql-test/r/fulltext.result:
Moved my_vsnprintf to strings library
mysql-test/r/innodb.result:
Moved my_vsnprintf to strings library
mysql-test/r/merge.result:
Moved my_vsnprintf to strings library
mysql-test/r/select.result:
Moved my_vsnprintf to strings library
mysql-test/r/show_check.result:
Moved my_vsnprintf to strings library
mysql-test/r/type_blob.result:
Moved my_vsnprintf to strings library
mysql-test/r/type_enum.result:
Moved my_vsnprintf to strings library
mysql-test/r/type_ranges.result:
Moved my_vsnprintf to strings library
mysql-test/r/type_set.result:
Moved my_vsnprintf to strings library
mysys/Makefile.am:
Moved my_vsnprintf to strings library
sql/field.cc:
Fixed for character set handling
sql/field.h:
Fixed for character set handling
sql/item.cc:
Fixed for character set handling
sql/item.h:
Fixed for character set handling
sql/item_func.cc:
Fixed for character set handling
sql/item_func.h:
Fixed for character set handling
sql/item_strfunc.cc:
Fixed for character set handling
sql/item_sum.cc:
Fixed for character set handling
sql/item_sum.h:
Fixed for character set handling
sql/item_timefunc.cc:
Fixed for character set handling
sql/mysqld.cc:
Update to use new test_if_int()
sql/opt_range.cc:
Fixed for character set handling
sql/procedure.h:
Fixed for character set handling
sql/sql_class.cc:
Fixed for character set handling
sql/sql_string.cc:
Added multi byte support to append.
Added set_latin1()
sql/sql_string.h:
Added set_latin1()
sql/sql_update.cc:
Cosmetic changes
strings/Makefile.am:
Moved my_vsnprintf to strings library
strings/ctype-simple.c:
Code review + cleanup
strings/ctype-utf8.c:
Fixed strntod()
strings/my_vsnprintf.c:
Added support for %#d and %#u
Diffstat (limited to 'mysql-test/r/merge.result')
-rw-r--r-- | mysql-test/r/merge.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 772ed0349da..9199f291c08 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -172,7 +172,7 @@ show create table t3; Table Create Table t3 CREATE TABLE `t3` ( `a` int(11) NOT NULL default '0', - `b` char(20) character set latin1 default NULL, + `b` char(20) default NULL, KEY `a` (`a`) ) TYPE=MRG_MyISAM CHARSET=latin1 UNION=(t1,t2) create table t4 (a int not null, b char(10), key(a)) type=MERGE UNION=(t1,t2); |