List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:November 9 2011 3:24pm
Subject:bzr push into mysql-trunk branch (tor.didriksen:3559 to 3579) WL#5825
View as plain text  
 3579 Tor Didriksen	2011-11-09
      WL#5825 Using C++ Standard Library with MySQL code, minor cleanups

    modified:
      configure.cmake
      unittest/gunit/CMakeLists.txt
 3578 Manish Kumar	2011-11-08
      BUG 11764459 - 57291: BINLOG.BINLOG_TRUNCATE_INNODB IS DISABLED
      
      Problem: As a result of Bug#42643 test binlog.binlog_truncate_innodb was disabled.
               This is a replication test, which stopped to make sense in the new 
               semantics of truncate (42643 changed the semantics).
      
      Fix: The bug is fixed by removing the test and the corresponding result file.

    removed:
      mysql-test/suite/binlog/r/binlog_truncate_innodb.result
      mysql-test/suite/binlog/t/binlog_truncate_innodb.test
    modified:
      mysql-test/suite/binlog/t/disabled.def
 3577 Tor Didriksen	2011-11-08
      Bug#11748783 37359: FILESORT CAN BE MORE EFFICIENT
      
      Post-push fix: function find_all_keys() changed signature,
      so valgrind suppression must change.

    modified:
      mysql-test/valgrind.supp
 3576 Tor Didriksen	2011-11-08
      WL#5825 Using C++ Standard Library with MySQL code
      
      Post-push fix: scripts/mysql_config* must distinguish between cflags and cxxflags.

    modified:
      configure.cmake
      scripts/mysql_config.pl.in
      scripts/mysql_config.sh
 3575 Marko Mäkelä	2011-11-08 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/btr/btr0pcur.c
      storage/innobase/include/btr0pcur.h
      storage/innobase/include/btr0pcur.ic
 3574 Jon Olav Hauglid	2011-11-08
      Fix gcc 4.6.1 compilation error:
      error: variable ‘info’ set but not used

    modified:
      sql/mdl.cc
 3573 Tor Didriksen	2011-11-08
      Bug#11748783 37359: FILESORT CAN BE MORE EFFICIENT
      
      Post-push fix: sort_buffer_size depends on platform (32 vs 64 bit)

    modified:
      mysql-test/suite/opt_trace/include/general.inc
      mysql-test/suite/opt_trace/include/general2.inc
      mysql-test/suite/opt_trace/include/subquery.inc
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
 3572 Marko Mäkelä	2011-11-08 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/ibuf/ibuf0ibuf.c
 3571 Mayank Prasad	2011-11-08
      bug#12561297 : Disabling mysql_embedded test case
      
      Innodb behavior to expect /usr/local/mysql directory, 
      causes this test case to fail. Therefore disabling it.

    modified:
      mysql-test/t/disabled.def
 3570 Marc Alff	2011-11-07
      Fixed several issues affecting the embedded build.
      
      1) in psi.h, do not compile with the performance schema instrumentation,
      for the embedded build.
      
      2) in mysql_socket.h, cleanup compiler warnings when building
      without the socket instrumentation
      
      3) in mysqld.cc, remove un needed code for embedded builds
      
      4) in sql_class.h, remove un needed instrumentation state,
      when compiling for embedded

    modified:
      include/mysql/psi/mysql_socket.h
      include/mysql/psi/psi.h
      sql/mysqld.cc
      sql/sql_class.h
      sql/sql_parse.cc
 3569 Tor Didriksen	2011-11-07
      Bug#11748783 37359: FILESORT CAN BE MORE EFFICIENT
      
      filesort() initializes space for
      MIN(Estimate rows in table, max rows that can fit in sort buffer) rows
      before doing the sort. For queries that have a "where" clause, the
      number of rows estimated by estimate_rows_upper_bound can be much
      higher than rows that match the where clause.
      
      The initialization is done via make_char_array() in filesort.cc and is
      very expensive when the estimate is off.
      
      Solution: lazy-init of the pointers in the sort buffer.
     @ mysql-test/r/filesort_debug.result
        Add sort_buffer_size to opt_trace.
     @ mysql-test/suite/opt_trace/r/filesort_pq.result
        Add sort_buffer_size to opt_trace.
     @ mysql-test/suite/opt_trace/r/general2_no_prot.result
        Add sort_buffer_size to opt_trace.
     @ mysql-test/suite/opt_trace/r/general2_ps_prot.result
        Add sort_buffer_size to opt_trace.
     @ mysql-test/suite/opt_trace/r/general_no_prot_none.result
        Add sort_buffer_size to opt_trace.
     @ mysql-test/suite/opt_trace/r/general_ps_prot_none.result
        Add sort_buffer_size to opt_trace.
     @ mysql-test/suite/opt_trace/r/subquery_no_prot.result
        Add sort_buffer_size to opt_trace.
     @ mysql-test/suite/opt_trace/r/subquery_ps_prot.result
        Add sort_buffer_size to opt_trace.
     @ mysql-test/t/filesort_debug.test
        Add sort_buffer_size to opt_trace.
     @ sql/filesort.cc
        Use Filesort_buffer* rather than uchar **
     @ sql/filesort_utils.cc
        New class Filesort_buffer, which wraps the uchar** buffer.
     @ sql/filesort_utils.h
        New class Filesort_buffer, which wraps the uchar** buffer.
     @ sql/table.h
        New class Filesort_buffer, which wraps the uchar** buffer.
        Rename FILESORT_INFO => Filesort_info.
     @ unittest/gunit/CMakeLists.txt
        New unit test.
     @ unittest/gunit/filesort_buffer-t.cc
        New unit test.

    added:
      unittest/gunit/filesort_buffer-t.cc
    modified:
      mysql-test/r/filesort_debug.result
      mysql-test/suite/opt_trace/r/filesort_pq.result
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      mysql-test/t/filesort_debug.test
      sql/filesort.cc
      sql/filesort_utils.cc
      sql/filesort_utils.h
      sql/table.h
      unittest/gunit/CMakeLists.txt
 3568 Tor Didriksen	2011-11-07
      WL#5825 Using C++ Standard Library with MySQL code
      
      Post-push fix: different library layout for stlport on intel/sparc.

    modified:
      configure.cmake
 3567 Marko Mäkelä	2011-11-07
      Remove a debug assertion that fails in innodb.innodb_mysql in a join.

    modified:
      storage/innobase/handler/ha_innodb.cc
 3566 Marko Mäkelä	2011-11-07 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/handler/ha_innodb.cc
 3565 Marko Mäkelä	2011-11-07 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/ibuf/ibuf0ibuf.c
 3564 Jorgen Loland	2011-11-04
      BUG#12997905 Followup patch
      
      Hopefully PB stops barking about two VALGRIND errors after push
      of this bug.
     @ mysql-test/valgrind.supp
        Removed two valgrind supression patterns.

    modified:
      mysql-test/valgrind.supp
 3563 Jorgen Loland	2011-11-04
      Bug#12997905: VALGRIND: SYSCALL PARAM PWRITE64(BUF) 
                    POINTS TO UNINITIALISED BYTE(S)
      
      When a record is inserted into a MyISAM temporary table using 
      static write, the entire content of the record[0] buffer is 
      written to the table which resides on disk. If one or more of
      the columns is a varchar, the trailing space may be 
      uninitialized and even contain secrets. Valgrind barked because
      of this.
      
      The fix is to reset the record buffer for MyISAM temporary 
      tables in addition to restricting the copying of fields from
      one table to another to the bytes actually used by the varchar.
      
      Bonus: Restricting Copy_field to copy only used varchar bytes 
      instead of the full column length also has a performance 
      benefit.
     @ mysql-test/include/join_cache.inc
        Add test case for BUG#12997905
     @ mysql-test/r/join_cache_bka.result
        Add test case for BUG#12997905
     @ mysql-test/r/join_cache_bka_nixbnl.result
        Add test case for BUG#12997905
     @ mysql-test/r/join_cache_bkaunique.result
        Add test case for BUG#12997905
     @ mysql-test/r/join_cache_bnl.result
        Add test case for BUG#12997905
     @ mysql-test/r/join_cache_nojb.result
        Add test case for BUG#12997905
     @ sql/field.h
        Document Copy_field length variables
     @ sql/field_conv.cc
        Copy_field now only copies actual characters for varchar columns. 
        Before, the trailing space was also copied.
     @ sql/sql_select.cc
        Reset record buffer for MyISAM temporary tables to avoid writing
        the random content in the alloced memory to file

    modified:
      mysql-test/include/join_cache.inc
      mysql-test/r/join_cache_bka.result
      mysql-test/r/join_cache_bka_nixbnl.result
      mysql-test/r/join_cache_bkaunique.result
      mysql-test/r/join_cache_bnl.result
      mysql-test/r/join_cache_nojb.result
      sql/field.h
      sql/field_conv.cc
      sql/sql_select.cc
 3562 Jon Olav Hauglid	2011-11-04
      Fix trunk tree_name.

    modified:
      .bzr-mysql/default.conf
 3561 Tor Didriksen	2011-11-04 [merge]
      local merge

 3560 Tor Didriksen	2011-11-04 [merge]
      local merge

    modified:
      mysql-test/suite/funcs_1/t/storedproc.test
      mysql-test/suite/perfschema/t/socket_instances_func.test
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
      mysql-test/suite/rpl/t/rpl_temporary.test
      mysql-test/t/csv.test
      mysql-test/t/information_schema_parameters.test
      mysql-test/t/information_schema_routines.test
      mysql-test/t/lock.test
      mysql-test/t/mysqlbinlog2.test
      mysql-test/t/ps.test
      mysql-test/t/ps_ddl.test
      mysql-test/t/sp-error.test
      mysql-test/t/sp.test
      mysql-test/t/trigger.test
      mysql-test/t/view_grant.test
 3559 Tor Didriksen	2011-11-04 [merge]
      Merge: WL#5825 Using C++ Standard Library with MySQL code

    removed:
      BUILD/compile-alpha-debug
      BUILD/compile-darwin-mwcc
      BUILD/compile-irix-mips64-mipspro
      BUILD/compile-pentium-icc
      BUILD/compile-pentium-icc-valgrind-max
      BUILD/compile-pentium-icc-yassl
      BUILD/compile-pentium-pgcc
      mysys/my_new.cc
    added:
      mysys/my_isnan.c
      unittest/gunit/stdcxx-t.cc
    renamed:
      mysys/psi_noop.cc => mysys/psi_noop.c
      sql/udf_example.c => sql/udf_example.cc
    modified:
      .bzr-mysql/default.conf
      BUILD/SETUP.sh
      BUILD/build_mccge.sh
      BUILD/compile-dist
      BUILD/compile-solaris-amd64
      BUILD/compile-solaris-amd64-forte
      BUILD/compile-solaris-amd64-forte-debug
      BUILD/compile-solaris-sparc
      BUILD/compile-solaris-sparc-debug
      BUILD/compile-solaris-sparc-forte
      BUILD/compile-solaris-sparc-purify
      client/CMakeLists.txt
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqlbinlog.cc
      client/mysqldump.c
      client/mysqltest.cc
      client/sql_string.cc
      cmake/build_configurations/mysql_release.cmake
      cmake/configure.pl
      cmake/info_macros.cmake.in
      cmake/os/Windows.cmake
      cmake/readline.cmake
      config.h.cmake
      configure.cmake
      dbug/dbug.c
      include/m_string.h
      include/my_global.h
      include/my_pthread.h
      include/mysql.h
      include/mysql/psi/mysql_thread.h
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h
      include/mysql_com.h
      include/waiting_threads.h
      libmysql/libmysql.c
      libmysqld/lib_sql.cc
      mysql-test/r/udf.result
      mysql-test/t/mysql_plugin.test
      mysql-test/t/udf.test
      mysys/CMakeLists.txt
      mysys/array.c
      mysys/default.c
      mysys/lf_alloc-pin.c
      mysys/lf_dynarray.c
      mysys/mf_format.c
      mysys/mf_iocache.c
      mysys/my_alloc.c
      mysys/my_bitmap.c
      mysys/my_compare.c
      mysys/my_compress.c
      mysys/my_file.c
      mysys/stacktrace.c
      mysys/waiting_threads.c
      sql-common/client.c
      sql-common/client_plugin.c
      sql-common/my_time.c
      sql/CMakeLists.txt
      sql/binlog.cc
      sql/debug_sync.cc
      sql/field.cc
      sql/field.h
      sql/filesort.cc
      sql/ha_partition.cc
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item_buff.cc
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_func.h
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_sum.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/key.cc
      sql/log.cc
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.cc
      sql/mdl.cc
      sql/mdl.h
      sql/mysqld.cc
      sql/net_serv.cc
      sql/opt_range.cc
      sql/opt_range.h
      sql/opt_trace.cc
      sql/opt_trace.h
      sql/protocol.cc
      sql/rpl_mi.cc
      sql/rpl_record.cc
      sql/rpl_rli.cc
      sql/rpl_slave.cc
      sql/rpl_utility.cc
      sql/rpl_utility.h
      sql/set_var.cc
      sql/set_var.h
      sql/sp_head.cc
      sql/spatial.h
      sql/sql_acl.cc
      sql/sql_analyse.cc
      sql/sql_cache.cc
      sql/sql_class.cc
      sql/sql_client.cc
      sql/sql_connect.cc
      sql/sql_const.h
      sql/sql_error.cc
      sql/sql_join_cache.cc
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_plugin.h
      sql/sql_prepare.cc
      sql/sql_profile.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_string.cc
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_yacc.yy
      sql/thr_malloc.cc
      sql/tztime.cc
      sql/udf_example.def
      sql/unireg.cc
      storage/csv/ha_tina.cc
      storage/federated/ha_federated.cc
      storage/heap/hp_create.c
      storage/heap/hp_static.c
      storage/heap/hp_test2.c
      storage/myisam/ha_myisam.cc
      storage/myisam/mi_cache.c
      storage/myisam/mi_check.c
      storage/myisam/mi_create.c
      storage/myisam/mi_dynrec.c
      storage/myisam/mi_extra.c
      storage/myisam/mi_open.c
      storage/myisam/mi_packrec.c
      storage/myisam/mi_static.c
      storage/myisam/myisamlog.c
      storage/myisam/myisampack.c
      storage/myisam/rt_mbr.c
      storage/myisam/sort.c
      storage/myisammrg/ha_myisammrg.cc
      strings/ctype-big5.c
      strings/ctype-bin.c
      strings/ctype-gbk.c
      strings/ctype-mb.c
      strings/ctype-simple.c
      strings/ctype-tis620.c
      strings/ctype-uca.c
      strings/ctype-ucs2.c
      strings/ctype-utf8.c
      strings/ctype.c
      strings/decimal.c
      strings/dtoa.c
      strings/my_vsnprintf.c
      support-files/mysql.spec.sh
      tests/mysql_client_test.c
      unittest/gunit/CMakeLists.txt
      unittest/gunit/gunit_test_main.cc
      unittest/gunit/item-t.cc
      unittest/mysys/lf-t.c
      unittest/mysys/my_atomic-t.c
      unittest/mysys/thr_template.c
      unittest/mysys/waiting_threads-t.c
      vio/viosocket.c
      win/create_def_file.js
      mysys/psi_noop.c
      sql/udf_example.cc

Diff too large for email (18046 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (tor.didriksen:3559 to 3579) WL#5825Tor Didriksen11 Nov