Cleaned up last bug fixes

Fix bug in SHOW GRANTS when there is a column privilege but no table privilege


include/mysql.h:
  Make server_inited external
libmysqld/libmysqld.c:
  Remove reference to (wrong) external variable
mysql-test/r/grant.result:
  Fixed up grant test to not user 'user1' or 'user2'
  Check for bug in SHOW GRANTS when there is a column privilege but no table privilege
mysql-test/r/mix_innodb_myisam_binlog.result:
  Change to use tables t1 and t2
mysql-test/t/grant.test:
  Fixed up grant test to not user 'user1' or 'user2'
  Check for bug in SHOW GRANTS when there is a column privilege but no table privilege
mysql-test/t/mix_innodb_myisam_binlog.test:
  Change to use tables t1 and t2
sql/sql_acl.cc:
  Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
sql/sql_parse.cc:
  Use HAVE_REPLICATION instead of EMBEDDED_LIBRARY

2 files changed, 108 insertions, 108 deletions

diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index 6ed5445233c..1a968fa4f2f 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -91,39 +91,39 @@ show grants for mysqltest_1@localhost;
 Grants for mysqltest_1@localhost
 GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
 GRANT SELECT, INSERT, INSERT (a), REFERENCES (a) ON `test`.`t1` TO 'mysqltest_1'@'localhost'
-REVOKE insert,insert (a) on t1 from mysqltest_1@localhost;
-GRANT references on t1 to mysqltest_1@localhost;
+REVOKE select,update,insert,insert (a) on t1 from mysqltest_1@localhost;
 show grants for mysqltest_1@localhost;
 Grants for mysqltest_1@localhost
 GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
-GRANT SELECT, REFERENCES, REFERENCES (a) ON `test`.`t1` TO 'mysqltest_1'@'localhost'
+GRANT REFERENCES (a) ON `test`.`t1` TO 'mysqltest_1'@'localhost'
+GRANT select,references on t1 to mysqltest_1@localhost;
 select table_priv,column_priv from mysql.tables_priv where user="mysqltest_1";
 table_priv	column_priv
 Select,References	References
-grant all on test.* to user1@localhost with grant option;
-revoke all on test.* from user1@localhost;
-show grants for user1@localhost;
-Grants for user1@localhost
-GRANT USAGE ON *.* TO 'user1'@'localhost'
-GRANT USAGE ON `test`.* TO 'user1'@'localhost' WITH GRANT OPTION
-revoke grant option on test.* from user1@localhost;
-show grants for user1@localhost;
-Grants for user1@localhost
-GRANT USAGE ON *.* TO 'user1'@'localhost'
-grant all on test.t1 to user2@localhost with grant option;
-revoke all on test.t1 from user2@localhost;
-show grants for user2@localhost;
-Grants for user2@localhost
-GRANT USAGE ON *.* TO 'user2'@'localhost'
-GRANT USAGE ON `test`.`t1` TO 'user2'@'localhost' WITH GRANT OPTION
-revoke grant option on test.t1 from user2@localhost;
-show grants for user2@localhost;
-Grants for user2@localhost
-GRANT USAGE ON *.* TO 'user2'@'localhost'
-delete from mysql.user where user='mysqltest_1';
-delete from mysql.db where user='mysqltest_1';
-delete from mysql.tables_priv where user='mysqltest_1';
-delete from mysql.columns_priv where user='mysqltest_1';
+grant all on test.* to mysqltest_3@localhost with grant option;
+revoke all on test.* from mysqltest_3@localhost;
+show grants for mysqltest_3@localhost;
+Grants for mysqltest_3@localhost
+GRANT USAGE ON *.* TO 'mysqltest_3'@'localhost'
+GRANT USAGE ON `test`.* TO 'mysqltest_3'@'localhost' WITH GRANT OPTION
+revoke grant option on test.* from mysqltest_3@localhost;
+show grants for mysqltest_3@localhost;
+Grants for mysqltest_3@localhost
+GRANT USAGE ON *.* TO 'mysqltest_3'@'localhost'
+grant all on test.t1 to mysqltest_2@localhost with grant option;
+revoke all on test.t1 from mysqltest_2@localhost;
+show grants for mysqltest_2@localhost;
+Grants for mysqltest_2@localhost
+GRANT USAGE ON *.* TO 'mysqltest_2'@'localhost'
+GRANT USAGE ON `test`.`t1` TO 'mysqltest_2'@'localhost' WITH GRANT OPTION
+revoke grant option on test.t1 from mysqltest_2@localhost;
+show grants for mysqltest_2@localhost;
+Grants for mysqltest_2@localhost
+GRANT USAGE ON *.* TO 'mysqltest_2'@'localhost'
+delete from mysql.user where user='mysqltest_1' or user="mysqltest_2" or user="mysqltest_3";
+delete from mysql.db where user='mysqltest_1' or user="mysqltest_2" or user="mysqltest_3";
+delete from mysql.tables_priv where user='mysqltest_1' or user="mysqltest_2" or user="mysqltest_3";
+delete from mysql.columns_priv where user='mysqltest_1' or user="mysqltest_2" or user="mysqltest_3";
 flush privileges;
 drop table t1;
 GRANT FILE on mysqltest.*  to mysqltest_1@localhost;
diff --git a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result
index 8a3415a81d0..cd96584b6a4 100644
--- a/mysql-test/r/mix_innodb_myisam_binlog.result
+++ b/mysql-test/r/mix_innodb_myisam_binlog.result
@@ -1,180 +1,180 @@
-drop table if exists ti, tm;
-create table ti (a int) type=innodb;
-create table tm (a int) type=myisam;
+drop table if exists t1, t2;
+create table t1 (a int) type=innodb;
+create table t2 (a int) type=myisam;
 reset master;
 begin;
-insert into ti values(1);
-insert into tm select * from ti;
+insert into t1 values(1);
+insert into t2 select * from t1;
 commit;
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.001	79	Query	1	79	use test; BEGIN
-master-bin.001	119	Query	1	79	use test; insert into ti values(1)
-master-bin.001	178	Query	1	79	use test; insert into tm select * from ti
+master-bin.001	119	Query	1	79	use test; insert into t1 values(1)
+master-bin.001	178	Query	1	79	use test; insert into t2 select * from t1
 master-bin.001	244	Query	1	244	use test; COMMIT
-delete from ti;
-delete from tm;
+delete from t1;
+delete from t2;
 reset master;
 begin;
-insert into ti values(2);
-insert into tm select * from ti;
+insert into t1 values(2);
+insert into t2 select * from t1;
 rollback;
 Warning:  Some non-transactional changed tables couldn't be rolled back
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.001	79	Query	1	79	use test; BEGIN
-master-bin.001	119	Query	1	79	use test; insert into ti values(2)
-master-bin.001	178	Query	1	79	use test; insert into tm select * from ti
+master-bin.001	119	Query	1	79	use test; insert into t1 values(2)
+master-bin.001	178	Query	1	79	use test; insert into t2 select * from t1
 master-bin.001	244	Query	1	244	use test; ROLLBACK
-delete from ti;
-delete from tm;
+delete from t1;
+delete from t2;
 reset master;
 begin;
-insert into ti values(3);
+insert into t1 values(3);
 savepoint my_savepoint;
-insert into ti values(4);
-insert into tm select * from ti;
+insert into t1 values(4);
+insert into t2 select * from t1;
 rollback to savepoint my_savepoint;
 Warning:  Some non-transactional changed tables couldn't be rolled back
 commit;
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.001	79	Query	1	79	use test; BEGIN
-master-bin.001	119	Query	1	79	use test; insert into ti values(3)
+master-bin.001	119	Query	1	79	use test; insert into t1 values(3)
 master-bin.001	178	Query	1	79	use test; savepoint my_savepoint
-master-bin.001	235	Query	1	79	use test; insert into ti values(4)
-master-bin.001	294	Query	1	79	use test; insert into tm select * from ti
+master-bin.001	235	Query	1	79	use test; insert into t1 values(4)
+master-bin.001	294	Query	1	79	use test; insert into t2 select * from t1
 master-bin.001	360	Query	1	79	use test; rollback to savepoint my_savepoint
 master-bin.001	429	Query	1	429	use test; COMMIT
-delete from ti;
-delete from tm;
+delete from t1;
+delete from t2;
 reset master;
 begin;
-insert into ti values(5);
+insert into t1 values(5);
 savepoint my_savepoint;
-insert into ti values(6);
-insert into tm select * from ti;
+insert into t1 values(6);
+insert into t2 select * from t1;
 rollback to savepoint my_savepoint;
 Warning:  Some non-transactional changed tables couldn't be rolled back
-insert into ti values(7);
+insert into t1 values(7);
 commit;
-select a from ti order by a;
+select a from t1 order by a;
 a
 5
 7
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.001	79	Query	1	79	use test; BEGIN
-master-bin.001	119	Query	1	79	use test; insert into ti values(5)
+master-bin.001	119	Query	1	79	use test; insert into t1 values(5)
 master-bin.001	178	Query	1	79	use test; savepoint my_savepoint
-master-bin.001	235	Query	1	79	use test; insert into ti values(6)
-master-bin.001	294	Query	1	79	use test; insert into tm select * from ti
+master-bin.001	235	Query	1	79	use test; insert into t1 values(6)
+master-bin.001	294	Query	1	79	use test; insert into t2 select * from t1
 master-bin.001	360	Query	1	79	use test; rollback to savepoint my_savepoint
-master-bin.001	429	Query	1	79	use test; insert into ti values(7)
+master-bin.001	429	Query	1	79	use test; insert into t1 values(7)
 master-bin.001	488	Query	1	488	use test; COMMIT
-delete from ti;
-delete from tm;
+delete from t1;
+delete from t2;
 reset master;
 select get_lock("a",10);
 get_lock("a",10)
 1
 begin;
-insert into ti values(8);
-insert into tm select * from ti;
+insert into t1 values(8);
+insert into t2 select * from t1;
 select get_lock("a",10);
 get_lock("a",10)
 1
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.001	79	Query	1	79	use test; BEGIN
-master-bin.001	119	Query	1	79	use test; insert into ti values(8)
-master-bin.001	178	Query	1	79	use test; insert into tm select * from ti
+master-bin.001	119	Query	1	79	use test; insert into t1 values(8)
+master-bin.001	178	Query	1	79	use test; insert into t2 select * from t1
 master-bin.001	244	Query	1	244	use test; ROLLBACK
-delete from ti;
-delete from tm;
+delete from t1;
+delete from t2;
 reset master;
-insert into ti values(9);
-insert into tm select * from ti;
+insert into t1 values(9);
+insert into t2 select * from t1;
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.001	79	Query	1	79	use test; insert into ti values(9)
-master-bin.001	138	Query	1	138	use test; insert into tm select * from ti
-delete from ti;
-delete from tm;
+master-bin.001	79	Query	1	79	use test; insert into t1 values(9)
+master-bin.001	138	Query	1	138	use test; insert into t2 select * from t1
+delete from t1;
+delete from t2;
 reset master;
-insert into ti values(10);
+insert into t1 values(10);
 begin;
-insert into tm select * from ti;
+insert into t2 select * from t1;
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.001	79	Query	1	79	use test; insert into ti values(10)
-master-bin.001	139	Query	1	139	use test; insert into tm select * from ti
-insert into ti values(11);
+master-bin.001	79	Query	1	79	use test; insert into t1 values(10)
+master-bin.001	139	Query	1	139	use test; insert into t2 select * from t1
+insert into t1 values(11);
 commit;
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.001	79	Query	1	79	use test; insert into ti values(10)
-master-bin.001	139	Query	1	139	use test; insert into tm select * from ti
+master-bin.001	79	Query	1	79	use test; insert into t1 values(10)
+master-bin.001	139	Query	1	139	use test; insert into t2 select * from t1
 master-bin.001	205	Query	1	205	use test; BEGIN
-master-bin.001	245	Query	1	205	use test; insert into ti values(11)
+master-bin.001	245	Query	1	205	use test; insert into t1 values(11)
 master-bin.001	305	Query	1	305	use test; COMMIT
-alter table tm type=INNODB;
-delete from ti;
-delete from tm;
+alter table t2 type=INNODB;
+delete from t1;
+delete from t2;
 reset master;
 begin;
-insert into ti values(12);
-insert into tm select * from ti;
+insert into t1 values(12);
+insert into t2 select * from t1;
 commit;
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.001	79	Query	1	79	use test; BEGIN
-master-bin.001	119	Query	1	79	use test; insert into ti values(12)
-master-bin.001	179	Query	1	79	use test; insert into tm select * from ti
+master-bin.001	119	Query	1	79	use test; insert into t1 values(12)
+master-bin.001	179	Query	1	79	use test; insert into t2 select * from t1
 master-bin.001	245	Query	1	245	use test; COMMIT
-delete from ti;
-delete from tm;
+delete from t1;
+delete from t2;
 reset master;
 begin;
-insert into ti values(13);
-insert into tm select * from ti;
+insert into t1 values(13);
+insert into t2 select * from t1;
 rollback;
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-delete from ti;
-delete from tm;
+delete from t1;
+delete from t2;
 reset master;
 begin;
-insert into ti values(14);
+insert into t1 values(14);
 savepoint my_savepoint;
-insert into ti values(15);
-insert into tm select * from ti;
+insert into t1 values(15);
+insert into t2 select * from t1;
 rollback to savepoint my_savepoint;
 commit;
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.001	79	Query	1	79	use test; BEGIN
-master-bin.001	119	Query	1	79	use test; insert into ti values(14)
+master-bin.001	119	Query	1	79	use test; insert into t1 values(14)
 master-bin.001	179	Query	1	179	use test; COMMIT
-delete from ti;
-delete from tm;
+delete from t1;
+delete from t2;
 reset master;
 begin;
-insert into ti values(16);
+insert into t1 values(16);
 savepoint my_savepoint;
-insert into ti values(17);
-insert into tm select * from ti;
+insert into t1 values(17);
+insert into t2 select * from t1;
 rollback to savepoint my_savepoint;
-insert into ti values(18);
+insert into t1 values(18);
 commit;
-select a from ti order by a;
+select a from t1 order by a;
 a
 16
 18
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.001	79	Query	1	79	use test; BEGIN
-master-bin.001	119	Query	1	79	use test; insert into ti values(16)
-master-bin.001	179	Query	1	79	use test; insert into ti values(18)
+master-bin.001	119	Query	1	79	use test; insert into t1 values(16)
+master-bin.001	179	Query	1	79	use test; insert into t1 values(18)
 master-bin.001	239	Query	1	239	use test; COMMIT
-drop table ti,tm;
+drop table t1,t2;