Commit 83ad38ab authored by unknown's avatar unknown
Browse files

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

into  eel.(none):/home/jonas/src/mysql-4.1-push
parents 91b19214 9df32ec8

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1054,3 +1054,5 @@ vio/test-sslclient 
vio/test-sslserver

vio/viotest-ssl

ndb/tools/ndb_config

support-files/MacOSX/postflight

support-files/MacOSX/preflight

heap/hp_delete.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ int hp_rb_delete_key(HP_INFO *info, register HP_KEYDEF *keyinfo, 
  custom_arg.search_flag= SEARCH_SAME;

  old_allocated= keyinfo->rb_tree.allocated;

  res= tree_delete(&keyinfo->rb_tree, info->recbuf, &custom_arg);

  info->s->index_length+= (keyinfo->rb_tree.allocated-old_allocated);

  info->s->index_length-= (old_allocated - keyinfo->rb_tree.allocated);

  return res;

}

include/my_sys.h

+0 −1
Original line number Diff line number Diff line
@@ -788,7 +788,6 @@ extern my_bool init_compiled_charsets(myf flags); 
extern void add_compiled_collation(CHARSET_INFO *cs);

extern ulong escape_string_for_mysql(CHARSET_INFO *charset_info, char *to,

                                     const char *from, ulong length);

extern char *bare_str_to_hex(char *to, const char *from, uint len);

#ifdef __WIN__

#define BACKSLASH_MBTAIL

/* File system character set */

mysql-test/r/ctype_cp932.result

+17 −0
Original line number Diff line number Diff line
@@ -8576,6 +8576,23 @@ FC4B 
DROP TABLE t1;

DROP TABLE t2;

DROP TABLE t3;

RESET MASTER;

CREATE TABLE t1(f1 blob);

PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';

SET @var1= x'8300';

EXECUTE stmt1 USING @var1;

SHOW BINLOG EVENTS;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	#	Start	1	#	Server ver: 4.1.15-debug-log, Binlog ver: 3

master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8

master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1(f1 blob)

master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8

master-bin.000001	#	User var	1	#	@`var1`=_binary 0x8300 COLLATE binary

master-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES(@'var1')

SELECT HEX(f1) FROM t1;

HEX(f1)

8300

DROP table t1;

SET collation_connection='cp932_japanese_ci';

create table t1 select repeat('a',4000) a;

delete from t1;

mysql-test/r/distinct.result

+40 −0
Original line number Diff line number Diff line
@@ -464,3 +464,43 @@ SELECT DISTINCT html,SUM(out)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin; 
html	prod

1	0.00

drop table t1;

CREATE TABLE t1 (a int);

INSERT INTO t1 VALUES (1),(2),(3),(4),(5);

SELECT DISTINCT a, 1 FROM t1;

a	1

1	1

2	1

3	1

4	1

5	1

SELECT DISTINCT 1, a FROM t1;

1	a

1	1

1	2

1	3

1	4

1	5

CREATE TABLE t2 (a int, b int);

INSERT INTO t2 VALUES (1,1),(2,2),(2,3),(2,4),(3,5);

SELECT DISTINCT a, b, 2 FROM t2;

a	b	2

1	1	2

2	2	2

2	3	2

2	4	2

3	5	2

SELECT DISTINCT 2, a, b FROM t2;

2	a	b

2	1	1

2	2	2

2	2	3

2	2	4

2	3	5

SELECT DISTINCT a, 2, b FROM t2;

a	2	b

1	2	1

2	2	2

2	2	3

2	2	4

3	2	5

DROP TABLE t1,t2;