Commit e2d4dc23 authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
parents c6b3c442 8ec6cf2c

VC++Files/sql/mysqld.dsp

+87 −24
Original line number Diff line number Diff line
@@ -924,76 +924,139 @@ SOURCE=.\message.mc 


!IF  "$(CFG)" == "mysqld - Win32 Release"



# Begin Custom Build

InputPath=.\message.mc



BuildCmds= \

	mc message.mc



"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build



!ELSEIF  "$(CFG)" == "mysqld - Win32 Debug"



# Begin Custom Build

InputPath=.\message.mc



BuildCmds= \

	mc message.mc



"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build



!ELSEIF  "$(CFG)" == "mysqld - Win32 nt"



# Begin Custom Build - Compiling messages

InputDir=.

# Begin Custom Build

InputPath=.\message.mc

InputName=message



BuildCmds= \

	mc.exe "$(InputDir)\$(InputName).mc"

	mc message.mc



"$(InputDir)\$(InputName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"$(InputDir)\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build



!ELSEIF  "$(CFG)" == "mysqld - Win32 Max nt"

# Begin Custom Build - Compiling messages

InputDir=.



# Begin Custom Build

InputPath=.\message.mc

InputName=message



BuildCmds= \

	mc.exe "$(InputDir)\$(InputName).mc"

	mc message.mc



"$(InputDir)\$(InputName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"$(InputDir)\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build



!ELSEIF  "$(CFG)" == "mysqld - Win32 Max"



# Begin Custom Build

InputPath=.\message.mc



BuildCmds= \

	mc message.mc



"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build



!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"



# Begin Custom Build

InputPath=.\message.mc



BuildCmds= \

	mc message.mc



"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build



!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"



# Begin Custom Build

InputPath=.\message.mc



BuildCmds= \

	mc message.mc



"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build



!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"

# Begin Custom Build - Compiling messages

InputDir=.



# Begin Custom Build

InputPath=.\message.mc

InputName=message



BuildCmds= \

	mc.exe "$(InputDir)\$(InputName).mc"

	mc message.mc



"$(InputDir)\$(InputName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"$(InputDir)\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build



!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"

# Begin Custom Build - Compiling messages

InputDir=.



# Begin Custom Build

InputPath=.\message.mc

InputName=message



BuildCmds= \

	mc.exe "$(InputDir)\$(InputName).mc"

	mc message.mc



"$(InputDir)\$(InputName).rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)



"$(InputDir)\$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

   $(BuildCmds)

# End Custom Build



!ENDIF 



# End Source File

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static struct my_option my_long_options[] = 
   (gptr*) &opt_compatible_mode_str, (gptr*) &opt_compatible_mode_str, 0,

   GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"compact", OPT_COMPACT,

   "Give less verbose output (useful for debugging). Disables structure comments and header/footer constructs.  Enables options --skip-add-drop-table --no-set-names --skip-disable-keys --skip-lock-tables",

   "Give less verbose output (useful for debugging). Disables structure comments and header/footer constructs.  Enables options --skip-add-drop-table --no-set-names --skip-disable-keys --skip-add-locks",

   (gptr*) &opt_compact, (gptr*) &opt_compact, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,

   0, 0},

  {"complete-insert", 'c', "Use complete insert statements.", (gptr*) &cFlag,

mysql-test/r/ctype_create.result

+9 −0
Original line number Diff line number Diff line
@@ -63,3 +63,12 @@ ERROR HY000: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET 
create database d1 default character set latin1 collate latin2_bin;

ERROR 42000: COLLATION 'latin2_bin' is not valid for CHARACTER SET 'latin1'

DROP DATABASE mysqltest1;

CREATE DATABASE mysqltest2 DEFAULT CHARACTER SET latin7;

use mysqltest2;

ALTER DATABASE DEFAULT CHARACTER SET latin2;

show create database mysqltest2;

Database	Create Database

mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET latin2 */

drop database mysqltest2;

ALTER DATABASE DEFAULT CHARACTER SET latin2;

ERROR 3D000: No database selected

mysql-test/r/ctype_ucs.result

+56 −0
Original line number Diff line number Diff line
@@ -525,3 +525,59 @@ use test; 
SET TIMESTAMP=10000;

insert into t2 values (@v);

drop table t2;

set names latin1;

create table t1 (a enum('x','y','z') character set ucs2);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` enum('x','y','z') character set ucs2 default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

insert into t1 values ('x');

insert into t1 values ('y');

insert into t1 values ('z');

select a, hex(a) from t1 order by a;

a	hex(a)

x	0078

y	0079

z	007A

alter table t1 change a a enum('x','y','z','d','e','','','') character set ucs2;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` enum('x','y','z','d','e','','','') character set ucs2 default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

insert into t1 values ('D');

insert into t1 values ('E ');

insert into t1 values ('');

insert into t1 values ('');

insert into t1 values ('');

select a, hex(a) from t1 order by a;

a	hex(a)

x	0078

y	0079

z	007A

d	0064

e	0065

	00E4

	00F6

	00FC

drop table t1;

create table t1 (a set ('x','y','z','','','') character set ucs2);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` set('x','y','z','','','') character set ucs2 default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

insert into t1 values ('x');

insert into t1 values ('y');

insert into t1 values ('z');

insert into t1 values ('x,y');

insert into t1 values ('x,y,z,,,');

select a, hex(a) from t1 order by a;

a	hex(a)

x	0078

y	0079

x,y	0078002C0079

z	007A

x,y,z,,,	0078002C0079002C007A002C00E4002C00F6002C00FC

drop table t1;

mysql-test/t/ctype_create.test

+12 −0
Original line number Diff line number Diff line
@@ -86,3 +86,15 @@ create database d1 default character set latin1 collate latin2_bin; 
#

#

DROP DATABASE mysqltest1;





#

# Synatx: 'ALTER DATABASE' without db_name

#

CREATE DATABASE mysqltest2 DEFAULT CHARACTER SET latin7;

use mysqltest2;

ALTER DATABASE DEFAULT CHARACTER SET latin2;

show create database mysqltest2;

drop database mysqltest2;

--error 1046

ALTER DATABASE DEFAULT CHARACTER SET latin2;