bzr push into mysql-trunk-bugfixing branch (Dmitry.Lenev:3395 to 3396) Bug#27480

[Dmitry Lenev]

 3396 Dmitry Lenev	2010-12-02
      Prerequisite patch for Bug#27480 (Extend CREATE TEMPORARY
      TABLES privilege to allow temp table operations).
      
      Review fixes in progress. Fixed issues discovered by
      flush_read_lock.test.

    modified:
      sql/sql_parse.cc
      sql/sql_update.cc
 3395 Dmitry Lenev	2010-12-02 [merge]
      Merged recent changes from mysql-trunk-bugfixing
      into work-in-progress tree.

    added:
      mysql-test/suite/federated/federated_bug_35333.result
      mysql-test/suite/federated/federated_bug_35333.test
      mysql-test/suite/perfschema/r/dml_threads.result
      mysql-test/suite/perfschema/r/thread_cache.result
      mysql-test/suite/perfschema/t/dml_threads.test
      mysql-test/suite/perfschema/t/thread_cache.test
      mysql-test/suite/rpl/r/rpl_slave_start.result
      mysql-test/suite/rpl/t/rpl_slave_start.test
    modified:
      BUILD/build_mccge.sh
      CMakeLists.txt
      client/mysqltest.cc
      config.h.cmake
      include/atomic/x86-gcc.h
      include/my_stacktrace.h
      mysql-test/r/lock_multi.result
      mysql-test/r/mdl_sync.result
      mysql-test/r/merge.result
      mysql-test/r/mysql.result
      mysql-test/r/show_check.result
      mysql-test/r/variables.result
      mysql-test/r/view.result
      mysql-test/suite/perfschema/include/privilege.inc
      mysql-test/suite/perfschema/r/dml_cond_instances.result
      mysql-test/suite/perfschema/r/dml_ews_by_instance.result
      mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
      mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
      mysql-test/suite/perfschema/r/dml_file_instances.result
      mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result
      mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result
      mysql-test/suite/perfschema/r/dml_mutex_instances.result
      mysql-test/suite/perfschema/r/dml_rwlock_instances.result
      mysql-test/suite/perfschema/r/misc.result
      mysql-test/suite/perfschema/r/myisam_file_io.result
      mysql-test/suite/perfschema/r/privilege.result
      mysql-test/suite/perfschema/t/dml_cond_instances.test
      mysql-test/suite/perfschema/t/dml_ews_by_instance.test
      mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test
      mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test
      mysql-test/suite/perfschema/t/dml_file_instances.test
      mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test
      mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test
      mysql-test/suite/perfschema/t/dml_mutex_instances.test
      mysql-test/suite/perfschema/t/dml_rwlock_instances.test
      mysql-test/suite/perfschema/t/misc.test
      mysql-test/suite/perfschema/t/myisam_file_io.test
      mysql-test/suite/rpl/r/rpl_slave_status.result
      mysql-test/suite/rpl/t/rpl_checksum.test
      mysql-test/suite/rpl/t/rpl_slave_status.test
      mysql-test/t/mysql.test
      mysql-test/t/mysqld--defaults-file.test
      mysql-test/t/variables.test
      mysys/stacktrace.c
      sql/CMakeLists.txt
      sql/binlog.cc
      sql/event_data_objects.cc
      sql/event_data_objects.h
      sql/event_db_repository.cc
      sql/ha_partition.cc
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_timefunc.h
      sql/log_event.cc
      sql/log_event.h
      sql/mysqld.cc
      sql/opt_range.cc
      sql/partition_info.cc
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_slave.cc
      sql/set_var.h
      sql/sp.cc
      sql/sp.h
      sql/sp_head.cc
      sql/sp_head.h
      sql/sql_acl.cc
      sql/sql_cache.cc
      sql/sql_cache.h
      sql/sql_class.h
      sql/sql_insert.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_trigger.cc
      sql/sql_trigger.h
      sql/sql_view.cc
      sql/sys_vars.cc
      storage/perfschema/ha_perfschema.cc
      storage/perfschema/ha_perfschema.h
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr_class.cc
      storage/perfschema/pfs_instr_class.h
      storage/perfschema/table_setup_actors.cc
      storage/perfschema/table_setup_consumers.cc
      storage/perfschema/table_setup_instruments.cc
      storage/perfschema/table_setup_timers.cc
      storage/perfschema/table_threads.cc
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2010-12-01 10:07:22 +0000
+++ b/sql/sql_parse.cc	2010-12-02 09:21:50 +0000
@@ -494,8 +494,8 @@ void init_update_queries(void)
   sql_command_flags[SQLCOM_OPTIMIZE]|=        CF_HA_CLOSE;
   sql_command_flags[SQLCOM_ANALYZE]|=         CF_HA_CLOSE;
   sql_command_flags[SQLCOM_CHECK]|=           CF_HA_CLOSE;
-  sql_command_flags[SQLCOM_CREATE_INDEX]=     CF_HA_CLOSE;
-  sql_command_flags[SQLCOM_DROP_INDEX]=       CF_HA_CLOSE;
+  sql_command_flags[SQLCOM_CREATE_INDEX]|=    CF_HA_CLOSE;
+  sql_command_flags[SQLCOM_DROP_INDEX]|=      CF_HA_CLOSE;
   sql_command_flags[SQLCOM_PRELOAD_KEYS]|=    CF_HA_CLOSE;
   sql_command_flags[SQLCOM_ASSIGN_TO_KEYCACHE]|=  CF_HA_CLOSE;
 }

=== modified file 'sql/sql_update.cc'
--- a/sql/sql_update.cc	2010-11-18 16:34:56 +0000
+++ b/sql/sql_update.cc	2010-12-02 09:21:50 +0000
@@ -1130,6 +1130,10 @@ int mysql_multi_update_prepare(THD *thd)
                        0, 0) ||
           check_grant(thd, want_privilege, tl, FALSE, 1, FALSE))
         DBUG_RETURN(TRUE);
+
+      if (is_temporary_table(tl))
+        tl->table->grant= tl->grant;
+
     }
   }
 

No bundle (reason: useless for push emails).