MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Kristofer Pettersson Date:March 12 2009 2:54pm
Subject:bzr push into mysql-6.0-bugteam branch (kristofer.pettersson:3110)
View as plain text  
 3110 Kristofer Pettersson	2009-03-12 [merge]
      Automerge

    removed:
      mysql-test/include/UnicodeData.txt
      sql-bench/TODO
    added:
      mysql-test/collections/
      mysql-test/collections/README
      mysql-test/collections/README.experimental
      mysql-test/collections/default.daily
      mysql-test/collections/default.experimental
      mysql-test/collections/default.push
      mysql-test/collections/default.weekly
      mysql-test/r/mdl_sync.result
      mysql-test/r/signal.result
      mysql-test/r/signal_code.result
      mysql-test/r/signal_demo1.result
      mysql-test/r/signal_demo2.result
      mysql-test/r/signal_demo3.result
      mysql-test/r/signal_sqlmode.result
      mysql-test/r/signal_utf32.result
      mysql-test/suite/falcon/r/falcon_blob_space-big.result
      mysql-test/suite/falcon/r/falcon_bug_23692.result
      mysql-test/suite/falcon/r/falcon_bug_33719.result
      mysql-test/suite/falcon/r/falcon_bug_34182.result
      mysql-test/suite/falcon/r/falcon_bug_34478.result
      mysql-test/suite/falcon/r/falcon_bug_42478.result
      mysql-test/suite/falcon/t/falcon_blob_space-big.cnf
      mysql-test/suite/falcon/t/falcon_blob_space-big.test
      mysql-test/suite/falcon/t/falcon_bug_23692.test
      mysql-test/suite/falcon/t/falcon_bug_33719.test
      mysql-test/suite/falcon/t/falcon_bug_34182.test
      mysql-test/suite/falcon/t/falcon_bug_34478.test
      mysql-test/suite/falcon/t/falcon_bug_42478.test
      mysql-test/t/mdl_sync.test
      mysql-test/t/signal.test
      mysql-test/t/signal_code.test
      mysql-test/t/signal_demo1.test
      mysql-test/t/signal_demo2.test
      mysql-test/t/signal_demo3.test
      mysql-test/t/signal_sqlmode.test
      mysql-test/t/signal_utf32.test
      sql/sql_signal.cc
      sql/sql_signal.h
      storage/falcon/SRLTableSpaces.cpp
      storage/falcon/SRLTableSpaces.h
      storage/ibmdb2i/
      storage/ibmdb2i/CMakeLists.txt
      storage/ibmdb2i/Makefile.am
      storage/ibmdb2i/db2i_blobCollection.cc
      storage/ibmdb2i/db2i_blobCollection.h
      storage/ibmdb2i/db2i_charsetSupport.cc
      storage/ibmdb2i/db2i_charsetSupport.h
      storage/ibmdb2i/db2i_collationSupport.cc
      storage/ibmdb2i/db2i_collationSupport.h
      storage/ibmdb2i/db2i_constraints.cc
      storage/ibmdb2i/db2i_conversion.cc
      storage/ibmdb2i/db2i_errors.cc
      storage/ibmdb2i/db2i_errors.h
      storage/ibmdb2i/db2i_file.cc
      storage/ibmdb2i/db2i_file.h
      storage/ibmdb2i/db2i_global.h
      storage/ibmdb2i/db2i_iconv.h
      storage/ibmdb2i/db2i_ileBridge.cc
      storage/ibmdb2i/db2i_ileBridge.h
      storage/ibmdb2i/db2i_ioBuffers.cc
      storage/ibmdb2i/db2i_ioBuffers.h
      storage/ibmdb2i/db2i_misc.h
      storage/ibmdb2i/db2i_myconv.cc
      storage/ibmdb2i/db2i_myconv.h
      storage/ibmdb2i/db2i_rir.cc
      storage/ibmdb2i/db2i_safeString.h
      storage/ibmdb2i/db2i_sqlStatementStream.cc
      storage/ibmdb2i/db2i_sqlStatementStream.h
      storage/ibmdb2i/db2i_validatedPointer.h
      storage/ibmdb2i/ha_ibmdb2i.cc
      storage/ibmdb2i/ha_ibmdb2i.h
      storage/ibmdb2i/plug.in
    modified:
      .bzr-mysql/default.conf
      .bzrignore
      cmd-line-utils/libedit/makelist.sh
      cmd-line-utils/libedit/readline.c
      cmd-line-utils/libedit/readline/readline.h
      cmd-line-utils/libedit/vi.c
      config/ac-macros/plugins.m4
      configure.in
      include/my_md5.h
      include/my_sys.h
      include/mysql.h
      include/mysql.h.pp
      libmysql/libmysql.c
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
      libmysqld/lib_sql.cc
      mysql-test/Makefile.am
      mysql-test/extra/rpl_tests/rpl_row_func003.test
      mysql-test/include/check-warnings.test
      mysql-test/include/wait_until_count_sessions.inc
      mysql-test/lib/My/ConfigFactory.pm
      mysql-test/lib/My/Platform.pm
      mysql-test/lib/My/SafeProcess.pm
      mysql-test/lib/My/SafeProcess/safe_process.cc
      mysql-test/lib/mtr_report.pm
      mysql-test/lib/mtr_unique.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/comment_column.result
      mysql-test/r/comment_table.result
      mysql-test/r/connect.result
      mysql-test/r/consistent_snapshot.result
      mysql-test/r/debug_sync.result
      mysql-test/r/dirty_close.result
      mysql-test/r/events_bugs.result
      mysql-test/r/explain.result
      mysql-test/r/flush_block_commit.result
      mysql-test/r/flush_block_commit_notembedded.result
      mysql-test/r/flush_read_lock_kill.result
      mysql-test/r/join_cache.result
      mysql-test/r/lock_multi.result
      mysql-test/r/locktrans_innodb.result
      mysql-test/r/locktrans_myisam.result
      mysql-test/r/log_tables.result
      mysql-test/r/merge.result
      mysql-test/r/mysqlbinlog.result
      mysql-test/r/mysqltest.result
      mysql-test/r/ps.result
      mysql-test/r/read_only.result
      mysql-test/r/show_check.result
      mysql-test/r/skip_name_resolve.result
      mysql-test/r/sp-security.result
      mysql-test/r/subselect_sj2.result
      mysql-test/r/subselect_sj2_jcl6.result
      mysql-test/r/system_mysql_db.result
      mysql-test/r/variables.result
      mysql-test/r/view.result
      mysql-test/r/view_grant.result
      mysql-test/suite/backup/r/backup_backupdir.result
      mysql-test/suite/backup/r/backup_db_grants.result
      mysql-test/suite/backup/t/backup_datatypes.test
      mysql-test/suite/backup/t/backup_logs.test
      mysql-test/suite/falcon/r/falcon_options.result
      mysql-test/suite/falcon/r/falcon_options2.result
      mysql-test/suite/falcon/t/disabled.def
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/suite/funcs_1/t/disabled.def
      mysql-test/suite/ndb/t/ndb_read_multi_range.test
      mysql-test/suite/rpl/r/rpl_locktrans_falcon.result
      mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
      mysql-test/suite/rpl/r/rpl_locktrans_myisam.result
      mysql-test/suite/rpl_ndb_big/t/disabled.def
      mysql-test/suite/rpl_ndb_big/t/rpl_ndb_circular_simplex.test
      mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
      mysql-test/suite/sys_vars/r/auto_increment_increment_func.result
      mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result
      mysql-test/suite/sys_vars/r/auto_increment_offset_func.result
      mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
      mysql-test/suite/sys_vars/r/connect_timeout_basic.result
      mysql-test/suite/sys_vars/r/default_week_format_basic.result
      mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result
      mysql-test/suite/sys_vars/r/div_precision_increment_basic.result
      mysql-test/suite/sys_vars/r/expire_logs_days_basic.result
      mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result
      mysql-test/suite/sys_vars/r/interactive_timeout_basic.result
      mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
      mysql-test/suite/sys_vars/r/max_binlog_size_basic.result
      mysql-test/suite/sys_vars/r/max_connections_basic.result
      mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
      mysql-test/suite/sys_vars/r/max_error_count_basic.result
      mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
      mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result
      mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result
      mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result
      mysql-test/suite/sys_vars/r/max_sort_length_basic.result
      mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result
      mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result
      mysql-test/suite/sys_vars/r/net_buffer_length_basic.result
      mysql-test/suite/sys_vars/r/net_read_timeout_basic.result
      mysql-test/suite/sys_vars/r/net_write_timeout_basic.result
      mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result
      mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result
      mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result
      mysql-test/suite/sys_vars/r/read_buffer_size_basic.result
      mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result
      mysql-test/suite/sys_vars/r/server_id_basic_64.result
      mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result
      mysql-test/suite/sys_vars/r/slow_launch_time_basic.result
      mysql-test/suite/sys_vars/r/table_definition_cache_basic.result
      mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result
      mysql-test/suite/sys_vars/r/table_open_cache_basic.result
      mysql-test/t/alter_table-big.test
      mysql-test/t/comment_column.test
      mysql-test/t/comment_table.test
      mysql-test/t/connect.test
      mysql-test/t/consistent_snapshot.test
      mysql-test/t/dirty_close.test
      mysql-test/t/disabled.def
      mysql-test/t/events_bugs.test
      mysql-test/t/explain.test
      mysql-test/t/flush_block_commit.test
      mysql-test/t/flush_block_commit_notembedded.test
      mysql-test/t/flush_read_lock_kill.test
      mysql-test/t/init_connect.test
      mysql-test/t/join_cache.test
      mysql-test/t/lock_multi.test
      mysql-test/t/log_tables.test
      mysql-test/t/merge.test
      mysql-test/t/mysqlbinlog.test
      mysql-test/t/mysqltest.test
      mysql-test/t/read_only.test
      mysql-test/t/show_check.test
      mysql-test/t/skip_name_resolve.test
      mysql-test/t/sp-security.test
      mysql-test/t/sp_notembedded.test
      mysql-test/t/ssl-big.test
      mysql-test/t/ssl.test
      mysql-test/t/ssl_compress.test
      mysql-test/t/status.test
      mysql-test/t/subselect_sj2.test
      mysql-test/t/type_bit_innodb.test
      mysql-test/t/upgrade.test
      mysql-test/t/user_limits.test
      mysql-test/t/variables.test
      mysql-test/t/view.test
      mysql-test/t/view_grant.test
      mysql-test/t/wait_timeout.test
      mysql-test/t/xa.test
      mysys/errors.c
      mysys/md5.c
      mysys/my_fstream.c
      mysys/my_pread.c
      mysys/my_write.c
      plugin/Makefile.am
      scripts/mysql_system_tables.sql
      scripts/mysql_system_tables_fix.sql
      sql-common/client.c
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/backup/backup_aux.h
      sql/backup/backup_info.cc
      sql/derror.cc
      sql/event_db_repository.cc
      sql/event_scheduler.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/item_strfunc.cc
      sql/item_sum.cc
      sql/lex.h
      sql/lock.cc
      sql/log.cc
      sql/log_event.cc
      sql/mdl.cc
      sql/mdl.h
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/protocol.cc
      sql/protocol.h
      sql/rpl_rli.cc
      sql/set_var.cc
      sql/share/errmsg.txt
      sql/si_objects.cc
      sql/slave.cc
      sql/sp.cc
      sql/sp_head.cc
      sql/sp_pcontext.h
      sql/sp_rcontext.cc
      sql/sp_rcontext.h
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_delete.cc
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_handler.cc
      sql/sql_insert.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_plist.h
      sql/sql_plugin.cc
      sql/sql_prepare.cc
      sql/sql_prepare.h
      sql/sql_servers.cc
      sql/sql_show.cc
      sql/sql_table.cc
      sql/sql_trigger.cc
      sql/sql_udf.cc
      sql/sql_yacc.yy
      sql/table.cc
      sql/table.h
      sql/thr_malloc.cc
      sql/unireg.cc
      storage/Makefile.am
      storage/falcon/CMakeLists.txt
      storage/falcon/Cache.cpp
      storage/falcon/Cache.h
      storage/falcon/Collation.h
      storage/falcon/CollationCaseless.cpp
      storage/falcon/CollationCaseless.h
      storage/falcon/CollationUnknown.cpp
      storage/falcon/CollationUnknown.h
      storage/falcon/Connection.cpp
      storage/falcon/Database.cpp
      storage/falcon/Dbb.cpp
      storage/falcon/Dbb.h
      storage/falcon/DeferredIndex.cpp
      storage/falcon/DeferredIndex.h
      storage/falcon/Event.cpp
      storage/falcon/IO.cpp
      storage/falcon/Index.cpp
      storage/falcon/Index.h
      storage/falcon/IndexPage.cpp
      storage/falcon/IndexPage.h
      storage/falcon/IndexRootPage.cpp
      storage/falcon/IndexRootPage.h
      storage/falcon/Log.h
      storage/falcon/Makefile.am
      storage/falcon/MemMgr.cpp
      storage/falcon/Mutex.cpp
      storage/falcon/Mutex.h
      storage/falcon/MySQLCollation.cpp
      storage/falcon/MySQLCollation.h
      storage/falcon/NBitmap.cpp
      storage/falcon/NInSelectBitmap.cpp
      storage/falcon/PageInventoryPage.cpp
      storage/falcon/PageWriter.cpp
      storage/falcon/PriorityScheduler.cpp
      storage/falcon/RecordScavenge.cpp
      storage/falcon/RecordScavenge.h
      storage/falcon/RecordVersion.cpp
      storage/falcon/SRLCreateIndex.cpp
      storage/falcon/SRLCreateIndex.h
      storage/falcon/SRLCreateTableSpace.cpp
      storage/falcon/SRLDeleteIndex.cpp
      storage/falcon/SRLDeleteIndex.h
      storage/falcon/SRLVersion.h
      storage/falcon/Sequence.cpp
      storage/falcon/Sequence.h
      storage/falcon/SequenceManager.cpp
      storage/falcon/SequenceManager.h
      storage/falcon/SerialLog.cpp
      storage/falcon/SerialLogControl.cpp
      storage/falcon/SerialLogControl.h
      storage/falcon/SerialLogFile.cpp
      storage/falcon/SerialLogRecord.h
      storage/falcon/StorageDatabase.cpp
      storage/falcon/StorageDatabase.h
      storage/falcon/StorageTable.cpp
      storage/falcon/StorageVersion.h
      storage/falcon/SyncObject.cpp
      storage/falcon/Table.cpp
      storage/falcon/Table.h
      storage/falcon/TableSpaceManager.cpp
      storage/falcon/TableSpaceManager.h
      storage/falcon/Thread.cpp
      storage/falcon/Transaction.cpp
      storage/falcon/ValueSet.cpp
      storage/falcon/ha_falcon.cpp
      storage/maria/ma_non_trans_log.c
      storage/myisammrg/ha_myisammrg.cc
      support-files/Makefile.am
      support-files/mysql.spec.sh
      tests/mysql_client_test.c
=== modified file 'mysql-test/r/lock.result'
--- a/mysql-test/r/lock.result	2009-03-05 15:44:02 +0000
+++ b/mysql-test/r/lock.result	2009-03-12 13:40:44 +0000
@@ -173,33 +173,6 @@ ERROR HY000: View's SELECT refers to a t
 Cleanup.
 
 drop table t2, t3;
-#
-# Bug#39843 DELETE requires write access to table in subquery in where clause
-#
-DROP TABLE IF EXISTS t1,t2;
-CREATE TABLE t1 (
-table1_rowid SMALLINT NOT NULL
-);
-CREATE TABLE t2 (
-table2_rowid SMALLINT NOT NULL
-);
-INSERT INTO t1 VALUES (1);
-INSERT INTO t2 VALUES (1);
-LOCK TABLES t1 WRITE, t2 READ;
-# Sub-select should not try to aquire a write lock.
-DELETE FROM t1 
-WHERE EXISTS 
-( 
-SELECT 'x' 
-FROM t2
-WHERE t1.table1_rowid = t2.table2_rowid
-) ;
-# While implementing the patch we didn't break old behavior;
-# The following sub-select should still requires a write lock:
-SELECT * FROM t1 WHERE 1 IN (SELECT * FROM t2 FOR UPDATE);
-ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
-UNLOCK TABLES;
-DROP TABLE t1,t2;
 End of 5.1 tests.
 #
 # Ensure that FLUSH TABLES doesn't substitute a base locked table

=== modified file 'mysql-test/t/lock.test'
--- a/mysql-test/t/lock.test	2009-03-05 15:44:02 +0000
+++ b/mysql-test/t/lock.test	2009-03-12 13:40:44 +0000
@@ -221,36 +221,6 @@ create view v_bug5719 as select * from t
 --echo
 drop table t2, t3;
 
---echo #
---echo # Bug#39843 DELETE requires write access to table in subquery in where clause
---echo #
---disable_warnings
-DROP TABLE IF EXISTS t1,t2;
---enable_warnings
-CREATE TABLE t1 (
-table1_rowid SMALLINT NOT NULL
-);
-CREATE TABLE t2 (
-table2_rowid SMALLINT NOT NULL
-);
-INSERT INTO t1 VALUES (1);
-INSERT INTO t2 VALUES (1);
-LOCK TABLES t1 WRITE, t2 READ;
---echo # Sub-select should not try to aquire a write lock.
-DELETE FROM t1 
-WHERE EXISTS 
-( 
-SELECT 'x' 
-FROM t2
-WHERE t1.table1_rowid = t2.table2_rowid
-) ;
---echo # While implementing the patch we didn't break old behavior;
---echo # The following sub-select should still requires a write lock:
---error ER_TABLE_NOT_LOCKED_FOR_WRITE
-SELECT * FROM t1 WHERE 1 IN (SELECT * FROM t2 FOR UPDATE);
-UNLOCK TABLES;
-DROP TABLE t1,t2;
-
 --echo End of 5.1 tests.
 
 --echo #

=== modified file 'sql/sql_lex.cc'
--- a/sql/sql_lex.cc	2009-03-05 15:44:02 +0000
+++ b/sql/sql_lex.cc	2009-03-12 13:40:44 +0000
@@ -1626,7 +1626,6 @@ void st_select_lex::init_query()
   exclude_from_table_unique_test= no_wrap_view_item= FALSE;
   nest_level= 0;
   link_next= 0;
-  lock_option= TL_READ_DEFAULT;
 }
 
 void st_select_lex::init_select()

=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h	2009-03-09 12:17:41 +0000
+++ b/sql/sql_lex.h	2009-03-12 14:48:32 +0000
@@ -700,14 +700,6 @@ public:
 
   List<udf_func>     udf_list;                  /* udf function calls stack */
 
-  /**
-    Per sub-query locking strategy.
-    Note: This variable might interfer with the corresponding statement-level
-    variable Lex::lock_option because on how different parser rules depend
-    on eachother.
-  */
-  thr_lock_type lock_option;
-
   /* 
     This is a copy of the original JOIN USING list that comes from
     the parser. The parser :

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2009-03-09 12:17:41 +0000
+++ b/sql/sql_parse.cc	2009-03-12 14:48:32 +0000
@@ -5524,14 +5524,6 @@ void mysql_reset_thd_for_next_command(TH
 }
 
 
-/**
-  Resets the lex->current_select object.
-  @note It is assumed that lex->current_select != NULL
-
-  This function is a wrapper around select_lex->init_select() with an added
-  check for the special situation when using INTO OUTFILE and LOAD DATA.
-*/
-
 void
 mysql_init_select(LEX *lex)
 {
@@ -5546,18 +5538,6 @@ mysql_init_select(LEX *lex)
 }
 
 
-/**
-  Used to allocate a new SELECT_LEX object on the current thd mem_root and
-  link it into the relevant lists.
-
-  This function is always followed by mysql_init_select.
-
-  @see mysql_init_select
-
-  @retval TRUE An error occurred
-  @retval FALSE The new SELECT_LEX was successfully allocated.
-*/
-
 bool
 mysql_new_select(LEX *lex, bool move_down)
 {

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2009-03-09 12:17:41 +0000
+++ b/sql/sql_yacc.yy	2009-03-12 14:48:32 +0000
@@ -7155,7 +7155,6 @@ select_lock_type:
           {
             LEX *lex=Lex;
             lex->current_select->set_lock_for_tables(TL_WRITE);
-            lex->current_select->lock_option= TL_WRITE;
             lex->safe_to_cache_query=0;
           }
         | LOCK_SYM IN_SYM SHARE_SYM MODE_SYM
@@ -7163,7 +7162,6 @@ select_lock_type:
             LEX *lex=Lex;
             lex->current_select->
               set_lock_for_tables(TL_READ_WITH_SHARED_LOCKS);
-            lex->current_select->lock_option= TL_READ_WITH_SHARED_LOCKS;
             lex->safe_to_cache_query=0;
           }
         ;
@@ -13721,17 +13719,6 @@ subselect_start:
 subselect_end:
           {
             LEX *lex=Lex;
-            /*
-              Set the required lock level for the tables associated with the
-              current sub-select. This will overwrite previous lock options set
-              using st_select_lex::add_table_to_list in any of the following
-              rules: single_multi, table_wild_one, load_data, table_alias_ref,
-              table_factor.
-              The default lock level is TL_READ_DEFAULT but it can be modified
-              with query options specific for a certain (sub-)SELECT.
-            */
-            lex->current_select->
-              set_lock_for_tables(lex->current_select->lock_option);
 
             lex->pop_context();
             SELECT_LEX *child= lex->current_select;
@@ -13764,7 +13751,6 @@ query_expression_option:
             if (check_simple_select())
               MYSQL_YYABORT;
             Lex->lock_option= TL_READ_HIGH_PRIORITY;
-            Lex->current_select->lock_option= TL_READ_HIGH_PRIORITY;
           }
         | DISTINCT         { Select->options|= SELECT_DISTINCT; }
         | SQL_SMALL_RESULT { Select->options|= SELECT_SMALL_RESULT; }


Attachment: [text/bzr-bundle] bzr/kristofer.pettersson@sun.com-20090312144832-eabilhqo2falvgt7.bundle
Thread
bzr push into mysql-6.0-bugteam branch (kristofer.pettersson:3110)Kristofer Pettersson12 Mar