Commit b68723a1 authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 

into  example.com:/work/mysql-5.1-runtime-wl3337
parents 66fb56f1 45a5ca85

mysql-test/r/partition_grant.result

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ create schema mysqltest_1; 
use mysqltest_1;

create table t1 (a int) partition by list (a) (partition p1 values in (1), partition p2 values in (2), partition p3 values in (3));

insert into t1 values (1),(2);

grant usage on *.* to mysqltest_1@localhost;

revoke all privileges on *.* from mysqltest_1@localhost;

grant select,alter on mysqltest_1.* to mysqltest_1@localhost;

show grants for current_user;

Grants for mysqltest_1@localhost

mysql-test/t/partition_grant.test

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ use mysqltest_1; 
create table t1 (a int) partition by list (a) (partition p1 values in (1), partition p2 values in (2), partition p3 values in (3));

insert into t1 values (1),(2);



# We don't have DROP USER IF EXISTS. Use this workaround to

# cleanup possible grants for mysqltest_1 left by previous tests

# and ensure consistent results of SHOW GRANTS command below.

--disable_warnings

grant usage on *.* to mysqltest_1@localhost;

revoke all privileges on *.* from mysqltest_1@localhost;

--enable_warnings



grant select,alter on mysqltest_1.* to mysqltest_1@localhost;



connect (conn1,localhost,mysqltest_1,,mysqltest_1);

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \ 
  extra/resolve_stack_dump$BS extra/mysql_waitpid$BS \

  storage/myisam/myisamchk$BS storage/myisam/myisampack$BS \

  storage/myisam/myisamlog$BS storage/myisam/myisam_ftdump$BS \

  sql/mysqld$BS sql/mysqld-debug$BS sql/mysqld-max$BS \

  sql/mysqld$BS sql/mysqld-debug$BS \

  sql/mysql_tzinfo_to_sql$BS \

  server-tools/instance-manager/mysqlmanager$BS \

  client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \