List:Commits« Previous MessageNext Message »
From:Luis Soares Date:September 8 2011 9:54am
Subject:bzr push into mysql-trunk branch (luis.soares:3446 to 3447) Bug#11766826
View as plain text  
 3447 Luis Soares	2011-09-08 [merge]
      BUG#11766826
      
      Automerged bzr bundle (approved cset).

    modified:
      mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
 3446 Marko Mäkelä	2011-09-08
      Bug#12956276 POTENTIALLY BOGUS BRANCH PREDICTION HINTS
      
      Remove possibly bogus branch prediction hints.
      
      dict_index_is_univ(): A new test, for reducing UNIV_UNLIKELY clutter.
      Returns TRUE for the insert buffer tree, FALSE for others.
      
      dict_index_is_clust(), dict_index_is_unique(), dict_index_is_sec_or_ibuf():
      Remove the branch prediction hints. Whether these conditions hold
      most of the time depends on the workload (proportion of secondary indexes
      and unique indexes.)
      
      Remove hints claiming that records will not be delete-marked or
      compressed or fields will not be NULL or externally stored most of the
      time. This depends on the workload too.
      
      Remove hints claiming that compressing a whole page will succeed.
      
      buf_page_print(): Add UNIV_COLD attribute, meaning that any execution
      path leading to this function execution should be unlikely. The
      function is only invoked when some corruption is noticed.
      
      rb:757 approved by Sunny Bains

    modified:
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0flu.c
      storage/innobase/data/data0data.c
      storage/innobase/dict/dict0dict.c
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/include/btr0btr.ic
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/data0data.ic
      storage/innobase/include/data0type.ic
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/page0page.ic
      storage/innobase/include/page0zip.ic
      storage/innobase/include/rem0rec.ic
      storage/innobase/include/row0upd.ic
      storage/innobase/mtr/mtr0log.c
      storage/innobase/page/page0cur.c
      storage/innobase/page/page0page.c
      storage/innobase/page/page0zip.c
      storage/innobase/rem/rem0cmp.c
      storage/innobase/row/row0merge.c
      storage/innobase/row/row0mysql.c
      storage/innobase/row/row0row.c
      storage/innobase/row/row0sel.c
      storage/innobase/row/row0upd.c
=== modified file 'mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2011-09-06 16:34:31 +0000
@@ -7,7 +7,7 @@ insert into t1(b) values (1);
 insert into t1(b) values (2);
 load data infile '../../std_data/rpl_loaddata.dat' into table t1;
 commit;
-include/wait_for_slave_sql_error.inc [errno=29, 13]
+include/wait_for_slave_sql_error.inc [errno=29, 13, 1290]
 drop table t1;
 include/sync_slave_io_with_master.inc
 include/stop_slave_io.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test'
--- a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2011-09-06 16:34:31 +0000
@@ -22,7 +22,6 @@
 --source include/have_debug.inc
 --source include/master-slave.inc
 --source include/not_embedded.inc
---source include/not_var_link.inc
 
 ##########################################################################
 #                            Loading data
@@ -52,7 +51,11 @@ connection slave;
 #  - Last_Errno     29 (File not found)
 # Unix like OS: 
 #  - Last_Errno      13 (Can't stat file)
---let $slave_sql_errno= 29, 13
+#  - Last_Errno     1290 (When datadir was set to a symlink when the load 
+#                         data file is removed the server won't be able to 
+#                         resolve the realpath, ending up stating that we 
+#                         have a mismatch)
+--let $slave_sql_errno= 29, 13, 1290
 --source include/wait_for_slave_sql_error.inc
 
 ##########################################################################

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (luis.soares:3446 to 3447) Bug#11766826Luis Soares8 Sep