Commit 04011331 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents 97c0c810 734a4c55

.bzrignore

+2 −1
Original line number Diff line number Diff line
@@ -913,6 +913,7 @@ ndb/src/common/mgmcommon/printConfig/*.d 
ndb/src/common/portlib/libportlib.dsp

ndb/src/common/transporter/libtransporter.dsp

ndb/src/common/util/libgeneral.dsp

ndb/src/common/util/testBitmask.cpp

ndb/src/cw/cpcd/ndb_cpcd

ndb/src/dummy.cpp

ndb/src/kernel/blocks/backup/libbackup.dsp
@@ -1138,6 +1139,7 @@ sql/*.ds? 
sql/*.vcproj

sql/.gdbinit

sql/client.c

sql/f.c

sql/gen_lex_hash

sql/gmon.out

sql/lex_hash.h
@@ -1296,4 +1298,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
ndb/src/common/util/testBitmask.cpp

client/mysql_upgrade.c

+14 −2
Original line number Diff line number Diff line
@@ -157,17 +157,29 @@ static int create_defaults_file(const char *path, const char *our_defaults_path) 
  File our_defaults_file, defaults_file;

  char buffer[512];

  char *buffer_end;

  int failed_to_open_count= 0;

  int error;



  /* check if the defaults file is needed at all */

  if (!opt_password)

    return 0;



  defaults_file= my_open(path, O_BINARY | O_CREAT | O_WRONLY,

retry_open:

  defaults_file= my_open(path, O_BINARY | O_CREAT | O_WRONLY | O_EXCL,

                         MYF(MY_FAE | MY_WME));



  if (defaults_file < 0)

  {

    if (failed_to_open_count == 0)

    {

      remove(path);

      failed_to_open_count+= 1;

      goto retry_open;

    }

    else

      return 1;

  }



  upgrade_defaults_created= 1;

  if (our_defaults_path)

  {

include/config-netware.h

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ extern "C" { 
/* On NetWare, to fix the problem with the deletion of open files */

#define CANT_DELETE_OPEN_FILES 1



#define FN_LIBCHAR '\\'

#define FN_ROOTDIR "\\"

#define FN_DEVCHAR ':'



/* default directory information */

#define	DEFAULT_MYSQL_HOME    "sys:/mysql"

#define PACKAGE               "mysql"

mysql-test/r/csv.result

+10 −0
Original line number Diff line number Diff line
@@ -5000,3 +5000,13 @@ insert t1 values (1),(2),(3),(4),(5); 
truncate table t1;

affected rows: 0

drop table t1;

create table bug15205 (val int(11) default null) engine=csv;

create table bug15205_2 (val int(11) default null) engine=csv;

select * from bug15205;

ERROR HY000: Got error 1 from storage engine

select * from bug15205_2;

val

select * from bug15205;

val

drop table bug15205;

drop table bug15205_2;

mysql-test/r/ctype_ucs.result

+44 −0
Original line number Diff line number Diff line
@@ -730,6 +730,49 @@ id MIN(s) 
1	ZZZ

2	ZZZ

DROP TABLE t1;

drop table if exists bug20536;

set names latin1;

create table bug20536 (id bigint not null auto_increment primary key, name

varchar(255) character set ucs2 not null);

insert into `bug20536` (`id`,`name`) values (1, _latin1 x'74657374311a'), (2, "'test\\_2'");

select md5(name) from bug20536;

md5(name)

3417d830fe24ffb2f81a28e54df2d1b3

48d95db0d8305c2fe11548a3635c9385

select sha1(name) from bug20536;

sha1(name)

72228a6d56efb7a89a09543068d5d8fa4c330881

677d4d505355eb5b0549b865fcae4b7f0c28aef5

select make_set(3, name, upper(name)) from bug20536;

make_set(3, name, upper(name))

test1,TEST1

'test\_2','TEST\_2'

select export_set(5, name, upper(name)) from bug20536;

export_set(5, name, upper(name))

test1,TEST1,test1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1

'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2'

select export_set(5, name, upper(name), ",", 5) from bug20536;

export_set(5, name, upper(name), ",", 5)

test1,TEST1,test1,TEST1,TEST1

'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2'

select password(name) from bug20536;

password(name)

????????????????????

????????????????????

select old_password(name) from bug20536;

old_password(name)

????????

????????

select encrypt(name, 'SALT') from bug20536;

encrypt(name, 'SALT')

SA5pDi1UPZdys

SA5pDi1UPZdys

select quote(name) from bug20536;

quote(name)

??????????

????????????????

drop table bug20536;

End of 4.1 tests

CREATE TABLE t1 (a varchar(64) character set ucs2, b decimal(10,3));

INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0);

update t1 set b=a;
@@ -765,3 +808,4 @@ blob 65535 65535 
text	65535	65535

text	65535	32767

drop table t1;

End of 5.0 tests