Commit c490d7ab authored by unknown's avatar unknown
Browse files

Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-tree 

into  alik.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged
parents 026737aa 3fa0f96b

configure.in

+4 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.25)

AM_INIT_AUTOMAKE(mysql, 5.0.26)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=25

NDB_VERSION_BUILD=26

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?
@@ -2826,8 +2826,9 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl 
 include/mysql_version.h dnl

 cmd-line-utils/Makefile dnl

 cmd-line-utils/libedit/Makefile dnl

 win/Makefile dnl

 zlib/Makefile dnl

 cmd-line-utils/readline/Makefile win/Makefile)

 cmd-line-utils/readline/Makefile)

 AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)

 AC_OUTPUT

include/mysql_com.h

+4 −1
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
#define USERNAME_LENGTH 16

#define SERVER_VERSION_LENGTH 60

#define SQLSTATE_LENGTH 5

#define SYSTEM_CHARSET_MBMAXLEN 3

#define NAME_BYTE_LEN   NAME_LEN*SYSTEM_CHARSET_MBMAXLEN

#define USERNAME_BYTE_LENGTH USERNAME_LENGTH*SYSTEM_CHARSET_MBMAXLEN



/*

  USER_HOST_BUFF_SIZE -- length of string buffer, that is enough to contain
@@ -33,7 +36,7 @@ 
  MySQL standard format:

  user_name_part@host_name_part\0

*/

#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_LENGTH + 2

#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_BYTE_LENGTH + 2



#define LOCAL_HOST	"localhost"

#define LOCAL_HOST_NAMEDPIPE "."

mysql-test/include/loaddata_autocom.inc

0 → 100644
+21 −0
Original line number Diff line number Diff line 
# Test if the engine does autocommit in LOAD DATA INFILE, or not

# (NDB wants to do, others don't).



eval SET SESSION STORAGE_ENGINE = $engine_type;



--disable_warnings

drop table if exists t1;

--enable_warnings



create table t1 (a text, b text);

start transaction;

load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';

commit;

select count(*) from t1;

truncate table t1;

start transaction;

load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';

rollback;

select count(*) from t1;



drop table t1;

mysql-test/r/ctype_utf8.result

+13 −0
Original line number Diff line number Diff line
@@ -1340,6 +1340,19 @@ select a from t1 group by a; 
a

e

drop table t1;

set names utf8;

grant select on test.* to юзер_юзер@localhost;

user()

юзер_юзер@localhost

revoke all on test.* from юзер_юзер@localhost;

drop user юзер_юзер@localhost;

create database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;

use имя_базы_в_кодировке_утф8_длиной_больше_чем_45;

select database();

database()

имя_базы_в_кодировке_утф8_длиной_больше_чем_45

drop database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;

use test;

CREATE TABLE t1(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8;

INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa');

SELECT id FROM t1;

mysql-test/r/loaddata_autocom_innodb.result

0 → 100644
+21 −0
Original line number Diff line number Diff line 
SET SESSION STORAGE_ENGINE = InnoDB;

drop table if exists t1;

create table t1 (a text, b text);

start transaction;

load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';

Warnings:

Warning	1261	Row 3 doesn't contain data for all columns

commit;

select count(*) from t1;

count(*)

4

truncate table t1;

start transaction;

load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';

Warnings:

Warning	1261	Row 3 doesn't contain data for all columns

rollback;

select count(*) from t1;

count(*)

0

drop table t1;