Commit 73e15f57 authored by unknown's avatar unknown
Browse files

Merge 


client/mysqltest.c:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/metadata.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/type_enum.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  SCCS merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  SCCS merged
sql/sql_union.cc:
  DBUG_ASSERT(TRUE) is useless so assume opposite
parents 0e13f97e 5fb52827

BitKeeper/triggers/pre-commit

+11 −0
Original line number Diff line number Diff line 
#!/bin/sh



if [ "$BK_USER" = "Administrator" -o "$BK_USER" = "mysqldev" ]

then

 echo "Error: you cannot commit as 'Administrator' or 'mysqldev' user."

 echo "as a workaround set BK_USER to your nickname"

 echo "e.g.: export BK_USER='bar'"

 echo ""

 echo "Checkin FAILED!"

 echo "Set BK_USER and retry."

 exit 1

fi



if [ "$REAL_EMAIL" = "" ]

then

 echo "Error: you must set REAL_EMAIL in your profile"

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -3311,7 +3311,7 @@ static void run_query_display_metadata(MYSQL_FIELD *field, uint num_fields, 
{

  MYSQL_FIELD *field_end;

  dynstr_append(ds,"Catalog\tDatabase\tTable\tTable_alias\tColumn\t"

                "Column_alias\tName\tType\tLength\tMax length\tIs_null\t"

                "Column_alias\tType\tLength\tMax length\tIs_null\t"

                "Flags\tDecimals\tCharsetnr\n");



  for (field_end= field+num_fields ;

mysql-test/r/grant2.result

+20 −3
Original line number Diff line number Diff line 
SET NAMES binary;

drop database if exists mysqltest;

drop database if exists mysqltest_1;

delete from mysql.user where user like 'mysqltest\_%';

delete from mysql.db where user like 'mysqltest\_%';

delete from mysql.tables_priv where user like 'mysqltest\_%';
@@ -27,9 +28,6 @@ grant create user on *.* to mysqltest_1@localhost; 
select current_user();

current_user()

mysqltest_1@localhost

select current_user;

current_user

mysqltest_1@localhost

grant all privileges on `my\_1`.* to mysqltest_2@localhost with grant option;

grant all privileges on `my_%`.* to mysqltest_3@localhost with grant option;

ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'my_%'
@@ -54,6 +52,25 @@ ERROR 42000: There is no such grant defined for user 'mysqltest_3' on host 'loca 
delete from mysql.user where user like 'mysqltest\_%';

delete from mysql.db where user like 'mysqltest\_%';

flush privileges;

create database mysqltest_1;

grant all privileges on `mysqltest\_1`.* to mysqltest_1@localhost with grant option;

select current_user();

current_user()

mysqltest_1@localhost

show databases;

Database

mysqltest_1

test

grant all privileges on `mysqltest_1`.* to mysqltest_1@localhost with grant option;

ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysqltest_1'

show grants for mysqltest_1@localhost;

Grants for mysqltest_1@localhost

GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'

GRANT ALL PRIVILEGES ON `mysqltest\_1`.* TO 'mysqltest_1'@'localhost' WITH GRANT OPTION

delete from mysql.user where user like 'mysqltest\_%';

delete from mysql.db where user like 'mysqltest\_%';

drop database mysqltest_1;

flush privileges;

create database mysqltest;

grant INSERT, SELECT on mysqltest.* to mysqltest_1@localhost;

flush privileges;

mysql-test/r/metadata.result

+6 −6
Original line number Diff line number Diff line 
drop table if exists t1,t2;

select 1, 1.0, -1, "hello", NULL;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					1	8	1	1	N	32897	0	63

def					1.0	246	4	3	N	161	1	63

def					-1	8	2	2	N	32897	0	63
@@ -10,7 +10,7 @@ def NULL 6 0 0 Y 32896 0 63 
1	1.0	-1	hello	NULL

create table t1 (a tinyint, b smallint, c mediumint, d int, e bigint, f float(3,2), g double(4,3), h decimal(5,4), i year, j date, k timestamp, l datetime, m enum('a','b'), n set('a','b'), o char(10));

select * from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t1	a	a	1	4	0	Y	32768	0	63

def	test	t1	t1	b	b	2	6	0	Y	32768	0	63

def	test	t1	t1	c	c	9	9	0	Y	32768	0	63
@@ -28,7 +28,7 @@ def test t1 t1 n n 254 3 0 Y 2048 0 8 
def	test	t1	t1	o	o	254	10	0	Y	0	0	8

a	b	c	d	e	f	g	h	i	j	k	l	m	n	o

select a b, b c from t1 as t2;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t2	a	b	1	4	0	Y	32768	0	63

def	test	t1	t2	b	c	2	6	0	Y	32768	0	63

b	c
@@ -38,7 +38,7 @@ INSERT INTO t1 VALUES (1,'male'),(2,'female'); 
CREATE TABLE t2 (id tinyint(3) unsigned default NULL, data char(3) default '0');

INSERT INTO t2 VALUES (1,'yes'),(2,'no');

select t1.id, t1.data, t2.data from t1, t2 where t1.id = t2.id;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t1	id	id	1	3	1	Y	32768	0	63

def	test	t1	t1	data	data	253	255	6	Y	0	0	8

def	test	t2	t2	data	data	254	3	3	Y	0	0	8
@@ -46,7 +46,7 @@ id data data 
1	male	yes

2	female	no

select t1.id, t1.data, t2.data from t1, t2 where t1.id = t2.id order by t1.id;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t1	id	id	1	3	1	Y	32768	0	63

def	test	t1	t1	data	data	253	255	6	Y	0	0	8

def	test	t2	t2	data	data	254	3	3	Y	0	0	8
@@ -54,7 +54,7 @@ id data data 
1	male	yes

2	female	no

select t1.id from t1 union select t2.id from t2;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t1	id	id	1	3	1	Y	32768	0	63

id

1

mysql-test/r/ps_1general.result

+2 −2
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ prepare stmt1 from ' KILL 0 '; 
ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt1 from ' explain select a from t1 order by b ';

execute stmt1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32929	0	63

def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	N	1	31	8
@@ -500,7 +500,7 @@ id select_type table type possible_keys key key_len ref rows Extra 
SET @arg00=1 ;

prepare stmt1 from ' explain select a from t1 where a > ? order by b ';

execute stmt1 using @arg00;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32929	0	63

def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	N	1	31	8