Commit 19d3b53a authored by unknown's avatar unknown
Browse files

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint


client/mysql.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents 7547a3f1 749242b6

client/mysql.cc

+3 −0
Original line number Diff line number Diff line
@@ -1957,6 +1957,9 @@ com_charset(String *buffer __attribute__((unused)), char *line) 
  if (new_cs)

  {

    charset_info= new_cs;

    mysql_set_character_set(&mysql, charset_info->csname);

    default_charset= (char *)charset_info->csname;

    default_charset_used= 1;

    put_info("Charset changed", INFO_INFO);

  }

  else put_info("Charset is not found", INFO_INFO);

extra/yassl/include/openssl/prefix_ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -150,3 +150,4 @@ 
#define MD5_Init yaMD5_Init

#define MD5_Update yaMD5_Update

#define MD5_Final yaMD5_Final

#define SSL_peek yaSSL_peek

include/config-netware.h

+4 −0
Original line number Diff line number Diff line
@@ -122,6 +122,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
@@ -5140,6 +5140,16 @@ 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;

create table t1 (v varchar(32));

insert into t1 values ('def'),('abc'),('hij'),('3r4f');

select * from t1;

mysql-test/r/mysql.result

+7 −7
Original line number Diff line number Diff line
@@ -59,16 +59,16 @@ database() 
test

unlock tables;

drop table t1;

ソ

ソ

\

\

c_cp932

\

\

\

ソ

ソ

ソ

ソ

ソ

ソ

ソ

\

\

+----------------------+------------+--------+

| concat('>',col1,'<') | col2       | col3   |

+----------------------+------------+--------+