2890 Kristofer Pettersson 2009-10-20
Bug#27145 EXTRA_ACL troubles
Post merge fix for embedded server.
@ sql/sql_acl.h
* Added definition for has_any_table_level_privileges must be defined in embedded mode.
modified:
sql/sql_acl.h
2889 Kristofer Pettersson 2009-10-19 [merge]
Automerge
removed:
libmysql/manager.c
added:
mysql-test/r/drop-no_root.result
mysql-test/r/information_schema-big.result
mysql-test/r/log_state_bug33693.result
mysql-test/t/drop-no_root.test
mysql-test/t/information_schema-big.test
mysql-test/t/log_state_bug33693-master.opt
mysql-test/t/log_state_bug33693.test
sql/records.h
renamed:
mysql-test/include/have_community_features.inc => mysql-test/include/have_profiling.inc
mysql-test/r/have_community_features.require => mysql-test/r/have_profiling.require
modified:
.bzr-mysql/default.conf
.bzrignore
Makefile.am
client/mysqldump.c
client/mysqlimport.c
client/mysqlslap.c
client/mysqltest.cc
configure.in
include/config-win.h
include/errmsg.h
include/hash.h
include/my_base.h
include/mysql.h
include/mysql.h.pp
include/mysql_com.h
libmysql/CMakeLists.txt
libmysql/Makefile.shared
libmysql/errmsg.c
libmysql/libmysql.c
libmysql/libmysql.def
libmysqld/lib_sql.cc
libmysqld/libmysqld.c
libmysqld/libmysqld.def
mysql-test/collections/default.experimental
mysql-test/include/query_cache_sql_prepare.inc
mysql-test/include/wait_for_slave_param.inc
mysql-test/r/alter_table.result
mysql-test/r/bigint.result
mysql-test/r/create.result
mysql-test/r/ddl_i18n_koi8r.result
mysql-test/r/ddl_i18n_utf8.result
mysql-test/r/delayed.result
mysql-test/r/events_1.result
mysql-test/r/events_2.result
mysql-test/r/events_bugs.result
mysql-test/r/func_math.result
mysql-test/r/func_str.result
mysql-test/r/grant.result
mysql-test/r/index_merge_innodb.result
mysql-test/r/information_schema.result
mysql-test/r/innodb_mysql.result
mysql-test/r/insert.result
mysql-test/r/log_state.result
mysql-test/r/lowercase_table2.result
mysql-test/r/merge.result
mysql-test/r/metadata.result
mysql-test/r/mysqldump.result
mysql-test/r/partition_hash.result
mysql-test/r/partition_pruning.result
mysql-test/r/profiling.result
mysql-test/r/ps.result
mysql-test/r/ps_1general.result
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_4heap.result
mysql-test/r/ps_5merge.result
mysql-test/r/query_cache_ps_no_prot.result
mysql-test/r/query_cache_ps_ps_prot.result
mysql-test/r/show_check.result
mysql-test/r/sp-vars.result
mysql-test/r/sp.result
mysql-test/r/sp_trans.result
mysql-test/r/sql_mode.result
mysql-test/r/strict.result
mysql-test/r/system_mysql_db.result
mysql-test/r/trigger.result
mysql-test/r/type_varchar.result
mysql-test/r/variables.result
mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
mysql-test/suite/funcs_1/r/innodb_trig_03.result
mysql-test/suite/funcs_1/r/innodb_trig_03e.result
mysql-test/suite/funcs_1/r/innodb_views.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_routines.result
mysql-test/suite/funcs_1/r/is_user_privileges.result
mysql-test/suite/funcs_1/r/memory_func_view.result
mysql-test/suite/funcs_1/r/memory_storedproc_07.result
mysql-test/suite/funcs_1/r/memory_trig_03.result
mysql-test/suite/funcs_1/r/memory_trig_03e.result
mysql-test/suite/funcs_1/r/memory_views.result
mysql-test/suite/funcs_1/r/myisam_func_view.result
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
mysql-test/suite/funcs_1/r/myisam_trig_03.result
mysql-test/suite/funcs_1/r/myisam_trig_03e.result
mysql-test/suite/funcs_1/r/myisam_views.result
mysql-test/suite/funcs_1/r/ndb_func_view.result
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result
mysql-test/suite/funcs_1/r/ndb_trig_03.result
mysql-test/suite/funcs_1/r/ndb_trig_03e.result
mysql-test/suite/funcs_1/r/ndb_views.result
mysql-test/suite/funcs_1/r/storedproc.result
mysql-test/suite/ndb/r/ndb_dd_ddl.result
mysql-test/suite/ndb/r/ps_7ndb.result
mysql-test/suite/ndb/t/ndb_dd_ddl.test
mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
mysql-test/suite/rpl/r/rpl_udf.result
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
mysql-test/suite/sys_vars/r/auto_commit_basic.result
mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result
mysql-test/suite/sys_vars/r/big_tables_basic.result
mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
mysql-test/suite/sys_vars/r/flush_basic.result
mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result
mysql-test/suite/sys_vars/r/general_log_basic.result
mysql-test/suite/sys_vars/r/innodb_checksums_basic.result
mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result
mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result
mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result
mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result
mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
mysql-test/suite/sys_vars/r/local_infile_basic.result
mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result
mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result
mysql-test/suite/sys_vars/r/low_priority_updates_basic.result
mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result
mysql-test/suite/sys_vars/r/new_basic.result
mysql-test/suite/sys_vars/r/old_passwords_basic.result
mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result
mysql-test/suite/sys_vars/r/read_only_basic.result
mysql-test/suite/sys_vars/r/relay_log_purge_basic.result
mysql-test/suite/sys_vars/r/secure_auth_basic.result
mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result
mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result
mysql-test/suite/sys_vars/r/slow_query_log_basic.result
mysql-test/suite/sys_vars/r/sql_auto_is_null_basic.result
mysql-test/suite/sys_vars/r/sql_big_selects_basic.result
mysql-test/suite/sys_vars/r/sql_big_tables_basic.result
mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result
mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
mysql-test/suite/sys_vars/r/sql_log_off_basic.result
mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result
mysql-test/suite/sys_vars/r/sql_notes_basic.result
mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result
mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result
mysql-test/suite/sys_vars/r/sql_warnings_basic.result
mysql-test/suite/sys_vars/r/sync_frm_basic.result
mysql-test/suite/sys_vars/r/timed_mutexes_basic.result
mysql-test/suite/sys_vars/r/unique_checks_basic.result
mysql-test/suite/sys_vars/t/auto_commit_basic.test
mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test
mysql-test/suite/sys_vars/t/big_tables_basic.test
mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test
mysql-test/suite/sys_vars/t/flush_basic.test
mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test
mysql-test/suite/sys_vars/t/general_log_basic.test
mysql-test/suite/sys_vars/t/innodb_checksums_basic.test
mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test
mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test
mysql-test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test
mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test
mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test
mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test
mysql-test/suite/sys_vars/t/local_infile_basic.test
mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test
mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test
mysql-test/suite/sys_vars/t/low_priority_updates_basic.test
mysql-test/suite/sys_vars/t/myisam_use_mmap_basic.test
mysql-test/suite/sys_vars/t/new_basic.test
mysql-test/suite/sys_vars/t/old_passwords_basic.test
mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test
mysql-test/suite/sys_vars/t/read_only_basic.test
mysql-test/suite/sys_vars/t/relay_log_purge_basic.test
mysql-test/suite/sys_vars/t/secure_auth_basic.test
mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test
mysql-test/suite/sys_vars/t/slave_compressed_protocol_basic.test
mysql-test/suite/sys_vars/t/slow_query_log_basic.test
mysql-test/suite/sys_vars/t/sql_auto_is_null_basic.test
mysql-test/suite/sys_vars/t/sql_big_selects_basic.test
mysql-test/suite/sys_vars/t/sql_big_tables_basic.test
mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test
mysql-test/suite/sys_vars/t/sql_log_bin_basic.test
mysql-test/suite/sys_vars/t/sql_log_off_basic.test
mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test
mysql-test/suite/sys_vars/t/sql_notes_basic.test
mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test
mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test
mysql-test/suite/sys_vars/t/sql_warnings_basic.test
mysql-test/suite/sys_vars/t/sync_frm_basic.test
mysql-test/suite/sys_vars/t/timed_mutexes_basic.test
mysql-test/suite/sys_vars/t/unique_checks_basic.test
mysql-test/t/alter_table.test
mysql-test/t/create.test
mysql-test/t/ctype_utf8.test
mysql-test/t/delayed.test
mysql-test/t/grant.test
mysql-test/t/index_merge_innodb.test
mysql-test/t/information_schema.test
mysql-test/t/innodb_mysql.test
mysql-test/t/insert.test
mysql-test/t/log_state.test
mysql-test/t/lowercase_table2.test
mysql-test/t/merge.test
mysql-test/t/metadata.test
mysql-test/t/partition_pruning.test
mysql-test/t/profiling.test
mysql-test/t/sp-vars.test
mysql-test/t/sp.test
mysql-test/t/sp_trans.test
mysql-test/t/sql_mode.test
mysql-test/t/trigger.test
mysql-test/t/type_varchar.test
mysql-test/t/variables+c.test
mysql-test/t/variables.test
mysys/Makefile.am
mysys/mf_keycaches.c
mysys/my_largepage.c
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_data.sql
scripts/mysql_system_tables_fix.sql
sql-common/client.c
sql/Makefile.am
sql/event_data_objects.cc
sql/event_scheduler.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/hash_filo.h
sql/hostname.cc
sql/item_create.cc
sql/item_func.cc
sql/item_subselect.cc
sql/item_sum.cc
sql/lock.cc
sql/log.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/net_serv.cc
sql/protocol.cc
sql/records.cc
sql/repl_failsafe.cc
sql/rpl_filter.cc
sql/rpl_injector.h
sql/rpl_tblmap.cc
sql/rpl_tblmap.h
sql/set_var.cc
sql/sp.cc
sql/sp_cache.cc
sql/sp_head.cc
sql/sql_acl.cc
sql/sql_acl.h
sql/sql_base.cc
sql/sql_cache.cc
sql/sql_cache.h
sql/sql_class.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_db.cc
sql/sql_handler.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_prepare.cc
sql/sql_profile.cc
sql/sql_profile.h
sql/sql_select.cc
sql/sql_select.h
sql/sql_servers.cc
sql/sql_show.cc
sql/sql_table.cc
sql/sql_test.cc
sql/sql_udf.cc
sql/sql_update.cc
sql/sql_yacc.yy
sql/structs.h
sql/table.cc
sql/table.h
sql/tztime.cc
storage/archive/ha_archive.cc
storage/blackhole/ha_blackhole.cc
storage/csv/ha_tina.cc
storage/csv/ha_tina.h
storage/example/ha_example.cc
storage/federated/ha_federated.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/include/handler0alter.h
storage/innobase/include/row0merge.h
storage/innobase/include/row0types.h
storage/innobase/row/row0merge.c
tests/mysql_client_test.c
unittest/mysys/Makefile.am
mysql-test/include/have_profiling.inc
mysql-test/r/have_profiling.require
=== modified file 'sql/sql_acl.h'
--- a/sql/sql_acl.h 2009-10-19 13:00:38 +0000
+++ b/sql/sql_acl.h 2009-10-20 13:40:06 +0000
@@ -276,4 +276,5 @@ bool has_any_table_level_privileges(THD
#ifdef NO_EMBEDDED_ACCESS_CHECKS
#define check_grant(A,B,C,D,E,F) 0
#define check_grant_db(A,B) 0
+#define has_any_table_level_privileges(A,B,C) 0
#endif
Attachment: [text/bzr-bundle]
| Thread |
|---|
| • bzr push into mysql-5.5.0-next-mr-runtime branch(kristofer.pettersson:2889 to 2890) Bug#27145 | Kristofer Pettersson | 20 Oct |
