Commit 06ac5d2f authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysys/my_getopt.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Merge change "--" to "#"
parents 24a08818 88dd3c59

mysql-test/mysql-test-run.pl

+4 −0
Original line number Diff line number Diff line
@@ -1900,6 +1900,10 @@ sub environment_setup () { 
  # ----------------------------------------------------

  $ENV{'MYSQL_MY_PRINT_DEFAULTS'}=  $exe_my_print_defaults;



  # ----------------------------------------------------

  # Setup env so childs can execute mysqladmin

  # ----------------------------------------------------

  $ENV{'MYSQLADMIN'}=  $exe_mysqladmin;



  # ----------------------------------------------------

  # Setup env so childs can execute perror

mysql-test/r/fix_priv_tables.result

0 → 100644
+36 −0
Original line number Diff line number Diff line 
drop table if exists t1,t1aa,t2aa;

DROP DATABASE IF EXISTS testdb;

CREATE DATABASE testdb;

CREATE TABLE testdb.t1 (

c1 INT,

c3 INT NOT NULL AUTO_INCREMENT PRIMARY KEY);

CREATE VIEW testdb.v1 AS

SELECT * FROM testdb.t1;

GRANT CREATE VIEW, SHOW VIEW ON testdb.v1 TO 'show_view_tbl'@'localhost';

SHOW GRANTS FOR 'show_view_tbl'@'localhost';

Grants for show_view_tbl@localhost

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

GRANT CREATE VIEW, SHOW VIEW ON `testdb`.`v1` TO 'show_view_tbl'@'localhost'



GRANT SELECT(c1) on testdb.v1 to 'select_only_c1'@localhost;

SHOW GRANTS FOR 'select_only_c1'@'localhost';

Grants for select_only_c1@localhost

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

GRANT SELECT (c1) ON `testdb`.`v1` TO 'select_only_c1'@'localhost'



"after fix privs"

SHOW GRANTS FOR 'show_view_tbl'@'localhost';

Grants for show_view_tbl@localhost

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

GRANT CREATE VIEW, SHOW VIEW ON `testdb`.`v1` TO 'show_view_tbl'@'localhost'



SHOW GRANTS FOR 'select_only_c1'@'localhost';

Grants for select_only_c1@localhost

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

GRANT SELECT (c1) ON `testdb`.`v1` TO 'select_only_c1'@'localhost'



DROP USER 'show_view_tbl'@'localhost';

DROP USER 'select_only_c1'@'localhost';

DROP VIEW testdb.v1;

DROP TABLE testdb.t1;

DROP DATABASE testdb;

mysql-test/r/fix_priv_tabs.result

0 → 100644
+0 −0

Empty file added.

mysql-test/r/mysqladmin.result

0 → 100644
+4 −0
Original line number Diff line number Diff line 
mysqld is alive

mysqladmin: unknown variable 'database=db1'

Warning: mysqladmin: unknown variable 'loose-database=db2'

mysqld is alive

mysql-test/t/fix_priv_tables.test

0 → 100644
+66 −0
Original line number Diff line number Diff line 
# Embedded server doesn't support external clients

--source include/not_embedded.inc



#

# This is the test for mysql_fix_privilege_tables

# It checks that a system tables from mysql 4.1.23

# can be upgraded to current system table format

#

# Note: If this test fails, don't be confused about the errors reported

# by mysql-test-run This shows warnings generated by

# mysql_fix_system_tables which should be ignored.

# Instead, concentrate on the errors in r/system_mysql_db.reject



--disable_warnings

drop table if exists t1,t1aa,t2aa;

--enable_warnings



#

# Bug #20589 Missing some table level privileges after upgrade

#

# Add some grants that should survive the "upgrade"



--disable_warnings

DROP DATABASE IF EXISTS testdb;

--enable_warnings

CREATE DATABASE testdb;

CREATE TABLE testdb.t1 (

  c1 INT,

  c3 INT NOT NULL AUTO_INCREMENT PRIMARY KEY);



CREATE VIEW testdb.v1 AS

        SELECT * FROM testdb.t1;



GRANT CREATE VIEW, SHOW VIEW ON testdb.v1 TO 'show_view_tbl'@'localhost';

SHOW GRANTS FOR 'show_view_tbl'@'localhost';

echo;



# Some extra GRANTS for more complete test

GRANT SELECT(c1) on testdb.v1 to 'select_only_c1'@localhost;

SHOW GRANTS FOR 'select_only_c1'@'localhost';

echo;



-- disable_result_log

-- disable_query_log



# Run the mysql_fix_privilege_tables.sql using "mysql --force"

--exec $MYSQL --force mysql < $MYSQL_FIX_PRIVILEGE_TABLES > $MYSQLTEST_VARDIR/log/fix_priv_tables.log 2>&1



-- enable_query_log

-- enable_result_log



echo "after fix privs";



SHOW GRANTS FOR 'show_view_tbl'@'localhost';

echo;

SHOW GRANTS FOR 'select_only_c1'@'localhost';

echo;



DROP USER 'show_view_tbl'@'localhost';

DROP USER 'select_only_c1'@'localhost';



DROP VIEW testdb.v1;

DROP TABLE testdb.t1;

DROP DATABASE testdb;



# End of 4.1 tests