1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

field.cc, sql_mode.result, sql_mode.test:

Browse Source 
"SHOW CREATE TABLE" mysql-4.0 and mysql-3.23 
  compatibiliry mode change:
  Check that a binary collation adds 'binary'
  suffix into a char() column definition in
  mysql40 and mysql2323 modes. This allows
  not to lose the column's case sensitivity
  when loading the dump in pre-4.1 servers.
This commit is contained in:
bar@mysql.com 2004-11-04 08:50:07 +04:00
parent 13a60a7631
commit f979603cf2
3 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mysql-test/r/sql_mode.result
View File

@ -85,6 +85,36 @@ t1 CREATE TABLE "t1" (
UNIQUE KEY "email" ("email") UNIQUE KEY "email" ("email")
) )
drop table t1; drop table t1;
CREATE TABLE t1 (
a char(10),
b char(10) collate latin1_bin,
c binary(10)
) character set latin1;
set @@sql_mode="";
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` char(10) default NULL,
`b` char(10) character set latin1 collate latin1_bin default NULL,
`c` binary(10) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
set @@sql_mode="mysql323";
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` char(10) default NULL,
`b` char(10) binary default NULL,
`c` binary(10) default NULL
) TYPE=MyISAM
set @@sql_mode="mysql40";
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` char(10) default NULL,
`b` char(10) binary default NULL,
`c` binary(10) default NULL
) TYPE=MyISAM
drop table t1;
set session sql_mode = ''; set session sql_mode = '';
create table t1 ( min_num dec(6,6) default .000001); create table t1 ( min_num dec(6,6) default .000001);
show create table t1; show create table t1;

31
mysql-test/t/sql_mode.test
View File

@ -29,6 +29,37 @@ select @@sql_mode;
show create table t1; show create table t1;
drop table t1; drop table t1;
#
# Check that a binary collation adds 'binary'
# suffix into a char() column definition in
# mysql40 and mysql2323 modes. This allows
# not to lose the column's case sensitivity
# when loading the dump in pre-4.1 servers.
#
# Thus, in 4.0 and 3.23 modes we dump:
#
# 'char(10) collate xxx_bin' as 'char(10) binary'
# 'binary(10)' as 'binary(10)'
#
# In mysql-4.1 these types are different, and they will
# be recreated differently.
#
# In mysqld-4.0 the the above two types were the same,
# so it will create a 'char(10) binary' column for both definitions.
#
CREATE TABLE t1 (
a char(10),
b char(10) collate latin1_bin,
c binary(10)
) character set latin1;
set @@sql_mode="";
show create table t1;
set @@sql_mode="mysql323";
show create table t1;
set @@sql_mode="mysql40";
show create table t1;
drop table t1;
# #
# BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT # BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT
# #

4
sql/field.cc
View File

@ -4417,6 +4417,7 @@ void Field_string::sort_string(char *to,uint length)
void Field_string::sql_type(String &res) const void Field_string::sql_type(String &res) const
{ {
THD *thd= table->in_use;
CHARSET_INFO *cs=res.charset(); CHARSET_INFO *cs=res.charset();
ulong length= cs->cset->snprintf(cs,(char*) res.ptr(), ulong length= cs->cset->snprintf(cs,(char*) res.ptr(),
res.alloced_length(), "%s(%d)", res.alloced_length(), "%s(%d)",
@ -4427,6 +4428,9 @@ void Field_string::sql_type(String &res) const
(has_charset() ? "char" : "binary")), (has_charset() ? "char" : "binary")),
(int) field_length / charset()->mbmaxlen); (int) field_length / charset()->mbmaxlen);
res.length(length); res.length(length);
if ((thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40)) &&
has_charset() && (charset()->state & MY_CS_BINSORT))
res.append(" binary");
} }
char *Field_string::pack(char *to, const char *from, uint max_length) char *Field_string::pack(char *to, const char *from, uint max_length)