Commit 90cc9c6b authored by unknown's avatar unknown
Browse files

Merge 


BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Update results
scripts/mysql_create_system_tables.sh:
  Merge fix for Bug #7617, making enum fields in grant tables
  case-insensitive.
scripts/mysql_fix_privilege_tables.sql:
  Merge fix for Bug #7617, and fix additional enum/set columns.
sql/sql_acl.cc:
  Hand-merge due to whitespace change
sql/sql_lex.cc:
  Hand-merge bug fix.
parents 4c5a3914 2b69b4ae

BitKeeper/triggers/post-commit

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ BK_STATUS=$BK_STATUS$BK_COMMIT 
if [ "$BK_STATUS" = OK ]

then 



HAS_ACTUAL_CHANGES=`bk cset -r+ -d | grep -v "^#"`

if [ "$HAS_ACTUAL_CHANGES" = "" ]

then

  echo ChangeSet had no real changes, not sending emails

  exit

fi



CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`

BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/\1/p'`

WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/ WL#\1/p'`

cmd-line-utils/readline/bind.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ rl_generic_bind (type, keyseq, data, map) 
	     mapped to something, `abc' to be mapped to something else,

	     and the function bound  to `a' to be executed when the user

	     types `abx', leaving `bx' in the input queue. */

	  if (k.function /* && k.type == ISFUNC */)

	  if (k.function && ((k.type == ISFUNC && k.function != rl_do_lowercase_version) || k.type == ISMACR))

	    {

	      map[ANYOTHERKEY] = k;

	      k.function = 0;

mysql-test/r/ctype_sjis.result

+4 −0
Original line number Diff line number Diff line
@@ -91,3 +91,7 @@ sjis_bin 6109 
sjis_bin	61

sjis_bin	6120

drop table t1;

SET NAMES sjis;

SELECT HEX('佐淘 \圭') FROM DUAL;

HEX('佐淘 ＼圭')

8DB2939181408C5C

mysql-test/r/lowercase_table2.result

+18 −0
Original line number Diff line number Diff line
@@ -141,3 +141,21 @@ select * from T1; 
a	b

1	abc

drop table T1;

create database mysqltest_LC2;

use mysqltest_LC2;

create table myUC (i int);

insert into myUC values (1),(2),(3);

select * from myUC;

i

1

2

3

use test;

drop database mysqltest_LC2;

create database mysqltest_LC2;

use mysqltest_LC2;

create table myUC (i int);

select * from myUC;

i

use test;

drop database mysqltest_LC2;

mysql-test/r/lowercase_table_grant.result

0 → 100644
+23 −0
Original line number Diff line number Diff line 
use mysql;

create database MYSQLtest;

grant all on MySQLtest.* to mysqltest_1@localhost;

show grants for mysqltest_1@localhost;

Grants for mysqltest_1@localhost

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

GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_1'@'localhost'

select * from db where user = 'mysqltest_1';

Host	Db	User	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Create_tmp_table_priv	Lock_tables_priv

localhost	mysqltest	mysqltest_1	Y	Y	Y	Y	Y	Y	N	Y	Y	Y	Y	Y

update db set db = 'MYSQLtest' where db = 'mysqltest' and user = 'mysqltest_1' and host = 'localhost';

flush privileges;

show grants for mysqltest_1@localhost;

Grants for mysqltest_1@localhost

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

GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_1'@'localhost'

select * from db where user = 'mysqltest_1';

Host	Db	User	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Create_tmp_table_priv	Lock_tables_priv

localhost	MYSQLtest	mysqltest_1	Y	Y	Y	Y	Y	Y	N	Y	Y	Y	Y	Y

delete from db where db = 'MYSQLtest' and user = 'mysqltest_1' and host = 'localhost';

flush privileges;

drop user mysqltest_1@localhost;

drop database MYSQLtest;