2883 Chuck Bell 2009-11-16
Corrected result file for backup_security as result of merge from main. CAB
modified:
mysql-test/suite/backup/r/backup_security.result
2882 Chuck Bell 2009-11-16 [merge]
Merge of main to merge tree. CAB
removed:
dbug/remove_function_from_trace.pl
dbug/tests-t.pl
dbug/tests.c
include/mysql/service_my_snprintf.h
include/mysql/service_thd_alloc.h
include/mysql/services.h
include/service_versions.h
libservices/
libservices/CMakeLists.txt
libservices/Makefile.am
libservices/my_snprintf_service.c
libservices/thd_alloc_service.c
mysql-test/r/locale.result
mysql-test/t/debug_sync.test
mysql-test/t/locale.test
sql/sql_plugin_services.h
added:
dbug/remove_function_from_trace.pl
dbug/tests-t.pl
dbug/tests.c
include/mysql/service_my_snprintf.h
include/mysql/service_thd_alloc.h
include/mysql/services.h
include/service_versions.h
libservices/
libservices/CMakeLists.txt
libservices/HOWTO
libservices/Makefile.am
libservices/my_snprintf_service.c
libservices/thd_alloc_service.c
mysql-test/include/have_case_insensitive_fs.inc
mysql-test/r/case_insensitive_fs.require
mysql-test/r/grant_lowercase_fs.result
mysql-test/r/locale.result
mysql-test/r/partition_column.result
mysql-test/r/partition_column_prune.result
mysql-test/r/partition_utf8.result
mysql-test/r/sp-bugs.result
mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
mysql-test/suite/rpl/t/rpl_get_master_version_and_clock-slave.opt
mysql-test/t/grant_lowercase_fs.test
mysql-test/t/locale.test
mysql-test/t/partition_column.test
mysql-test/t/partition_column_prune.test
mysql-test/t/partition_utf8.test
mysql-test/t/sp-bugs.test
sql/sql_plugin_services.h
unittest/mysys/my_vsnprintf-t.c
renamed:
mysql-test/r/bug40113.result => mysql-test/r/innodb_lock_wait_timeout_1.result
mysql-test/t/bug40113-master.opt => mysql-test/t/innodb_lock_wait_timeout_1-master.opt
mysql-test/t/bug40113.test => mysql-test/t/innodb_lock_wait_timeout_1.test
mysql-test/t/debug_sync.test.moved => mysql-test/t/debug_sync.test
modified:
BUILD/build_mccge.sh
Makefile.am
client/mysql.cc
client/mysqlbackup.cc
client/mysqlbinlog.cc
client/mysqltest.cc
dbug/dbug.c
extra/yassl/taocrypt/src/random.cpp
include/my_dbug.h
include/my_global.h
include/my_sys.h
include/myisamchk.h
include/mysql.h
include/mysql.h.pp
include/mysql/plugin.h
include/mysql/plugin.h.pp
include/violite.h
libmysql/libmysql.c
libmysql/libmysql.def
libmysqld/libmysqld.def
mysql-test/collections/default.experimental
mysql-test/extra/binlog_tests/drop_temp_table.test
mysql-test/extra/rpl_tests/rpl_loaddata.test
mysql-test/extra/rpl_tests/rpl_stm_000001.test
mysql-test/lib/My/ConfigFactory.pm
mysql-test/lib/My/SafeProcess/safe_process_win.cc
mysql-test/r/alter_table.result
mysql-test/r/analyse.result
mysql-test/r/ctype_collate.result
mysql-test/r/ctype_ldml.result
mysql-test/r/explain.result
mysql-test/r/gis-rtree.result
mysql-test/r/gis.result
mysql-test/r/grant.result
mysql-test/r/grant3.result
mysql-test/r/innodb_mysql.result
mysql-test/r/join.result
mysql-test/r/loadxml.result
mysql-test/r/lowercase_fs_off.result
mysql-test/r/myisam.result
mysql-test/r/myisam_crash_before_flush_keys.result
mysql-test/r/olap.result
mysql-test/r/partition.result
mysql-test/r/partition_datatype.result
mysql-test/r/partition_error.result
mysql-test/r/partition_innodb.result
mysql-test/r/partition_list.result
mysql-test/r/partition_mgm_err.result
mysql-test/r/partition_pruning.result
mysql-test/r/partition_range.result
mysql-test/r/ps_grant.result
mysql-test/r/query_cache.result
mysql-test/r/range.result
mysql-test/r/select.result
mysql-test/r/select_jcl6.result
mysql-test/r/sp-error.result
mysql-test/r/subselect.result
mysql-test/r/subselect3.result
mysql-test/r/subselect3_jcl6.result
mysql-test/r/subselect4.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/r/system_mysql_db.result
mysql-test/r/type_decimal.result
mysql-test/r/type_newdecimal.result
mysql-test/r/update.result
mysql-test/r/xa.result
mysql-test/suite/backup/r/backup_namecase.result
mysql-test/suite/backup/r/backup_security.result
mysql-test/suite/backup/r/backup_security_check.result
mysql-test/suite/backup/r/backup_table_grants.result
mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result
mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn1.result
mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_statistics.result
mysql-test/suite/parts/inc/partition_key_32col.inc
mysql-test/suite/parts/inc/partition_syntax.inc
mysql-test/suite/parts/r/partition_special_innodb.result
mysql-test/suite/parts/r/partition_special_myisam.result
mysql-test/suite/parts/r/partition_syntax_innodb.result
mysql-test/suite/parts/r/partition_syntax_myisam.result
mysql-test/suite/rpl/r/rpl_loaddata.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test
mysql-test/t/alter_table.test
mysql-test/t/analyse.test
mysql-test/t/ctype_collate.test
mysql-test/t/ctype_ldml.test
mysql-test/t/disabled.def
mysql-test/t/explain.test
mysql-test/t/flush_read_lock_kill.test
mysql-test/t/gis-rtree.test
mysql-test/t/gis.test
mysql-test/t/grant3.test
mysql-test/t/innodb_bug34300.test
mysql-test/t/innodb_mysql.test
mysql-test/t/join.test
mysql-test/t/kill.test
mysql-test/t/loadxml.test
mysql-test/t/lowercase_fs_off.test
mysql-test/t/myisam.test
mysql-test/t/myisam_crash_before_flush_keys.test
mysql-test/t/olap.test
mysql-test/t/partition.test
mysql-test/t/partition_datatype.test
mysql-test/t/partition_error.test
mysql-test/t/partition_innodb.test
mysql-test/t/partition_list.test
mysql-test/t/partition_mgm_err.test
mysql-test/t/partition_pruning.test
mysql-test/t/partition_range.test
mysql-test/t/query_cache.test
mysql-test/t/range.test
mysql-test/t/select.test
mysql-test/t/sp-error.test
mysql-test/t/subselect.test
mysql-test/t/subselect3.test
mysql-test/t/type_decimal.test
mysql-test/t/type_newdecimal.test
mysql-test/t/update.test
mysql-test/t/xa.test
mysys/mf_pack.c
mysys/my_getopt.c
mysys/my_malloc.c
mysys/my_static.c
mysys/my_thr_init.c
mysys/safemalloc.c
mysys/typelib.c
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_fix.sql
sql-common/client.c
sql/CMakeLists.txt*
sql/backup/be_default.cc
sql/debug_sync.cc
sql/field.cc
sql/field.h
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_cmpfunc.h
sql/item_create.cc
sql/item_func.cc
sql/item_func.h
sql/item_geofunc.cc
sql/item_subselect.cc
sql/item_sum.cc
sql/item_timefunc.cc
sql/item_timefunc.h
sql/log.cc
sql/log_event.cc
sql/log_event_old.cc
sql/my_decimal.h
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_range.cc
sql/partition_element.h
sql/partition_info.cc
sql/partition_info.h
sql/records.cc
sql/records.h
sql/replication.h
sql/share/errmsg-utf8.txt
sql/share/errmsg.txt
sql/slave.cc
sql/sp_head.cc
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_locale.cc
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_partition.h
sql/sql_plugin.cc
sql/sql_prepare.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_table.cc
sql/sql_update.cc
sql/sql_yacc.yy
sql/structs.h
sql/time.cc
sql/transaction.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/myisam/ha_myisam.cc
storage/myisam/mi_check.c
storage/myisam/mi_dynrec.c
storage/myisam/sort.c
storage/mysql_storage_engine.cmake
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
strings/ctype-uca.c
strings/my_vsnprintf.c
tests/mysql_client_test.c
unittest/mysys/Makefile.am
vio/vio.c
vio/vio_priv.h
vio/viosocket.c
vio/viosslfactories.c
mysql-test/r/innodb_lock_wait_timeout_1.result
mysql-test/t/innodb_lock_wait_timeout_1.test
=== modified file 'mysql-test/suite/backup/r/backup_security.result'
--- a/mysql-test/suite/backup/r/backup_security.result 2009-11-16 22:09:21 +0000
+++ b/mysql-test/suite/backup/r/backup_security.result 2009-11-16 22:38:19 +0000
@@ -385,7 +385,6 @@ backup_id
#
SHOW TABLES FROM backup_test;
Tables_in_backup_test
-GRANT SELECT, TRIGGER ON `backup_test`.`t2` TO 'bup_full_priv'@'localhost'
#
# Test 3 - Show that granting BACKUP, RESTORE only on a database allows
# the user to backup the database but not restore it.
@@ -396,7 +395,6 @@ GRANT SELECT, TRIGGER ON `backup_test`.`
#
RESTORE FROM 'bup_user1.bak' OVERWRITE;
Got one of the listed errors
-GRANT SELECT, TRIGGER ON `backup_test`.`t2` TO 'bup_full_priv'@'localhost'
#
# Test 4 - Show that if a user has BACKUP on one database but not
# another, the user cannot perform a backup of both databases.
@@ -416,7 +414,6 @@ Error # Insufficient privileges. You mus
#
BACKUP DATABASE backup_test, backup_test_alt to 'bup_no_priv.bak';
ERROR HY000: Insufficient privileges. You must have the BACKUP privilege to backup database 'backup_test_alt'.
-GRANT SELECT, TRIGGER ON `backup_test`.`t2` TO 'bup_full_priv'@'localhost'
SHOW ERRORS;
Level Code Message
Error # Insufficient privileges. You must have the BACKUP privilege to backup database 'backup_test_alt'.
@@ -424,7 +421,6 @@ Error # Insufficient privileges. You mus
# Reconnect as root.
#
#
-GRANT SELECT, TRIGGER ON `backup_test`.`t2` TO 'bup_full_priv'@'localhost'
# Cleanup
#
DROP USER 'bup_no_priv'@'localhost';
Attachment: [text/bzr-bundle] bzr/charles.bell@sun.com-20091116223819-mpsay4rrvrni7kmm.bundle
| Thread |
|---|
| • bzr push into mysql-6.0-backup branch (charles.bell:2882 to 2883) | Chuck Bell | 16 Nov |
