1. 15 Jan, 2010 1 commit
    • 's avatar
      Fix for perfschema.binlog_stmt failure: · fe99d915
      authored
              
      Problem: The test case failed because: (i) warning text in 
               result file differed from the warning output by the 
               server, and (ii) binlog contents in result file did
               not show the statements logged wrapped in BEGIN/COMMIT
               as it is the case after WL 2687.
            
      Solution: We update the result file, but first we change the
                unsafe warning text to also refer to performance_schema
                table(s). This required changing the result files for
                existing test cases that provide output for warnings 
                related to ER_BINLOG_UNSAFE_SYSTEM_TABLE. "Grepping" in
                result files, shows that only binlog_unsafe contained
                reference to such a warning.
            
                We also update the result file with the missing 
                BEGIN/COMMIT statements.
      fe99d915
  2. 14 Jan, 2010 6 commits
  3. 13 Jan, 2010 9 commits
  4. 12 Jan, 2010 8 commits
  5. 11 Jan, 2010 3 commits
    • Alexander Nozdrin's avatar
      Backporting revision from mysql-6.0-codebase-bugfixing. · ba3b5a7e
      Alexander Nozdrin authored
      Original revision:
      ------------------------------------------------------------
      revno: 3817
      revision-id: guilhem@mysql.com-20100108092756-k0zzf4kvx9b7bh38
      parent: guilhem@mysql.com-20100107101133-hrrgcdqg508runuf
      committer: Guilhem Bichot <guilhem@mysql.com>
      branch nick: mysql-6.0-codebase-bugfixing
      timestamp: Fri 2010-01-08 10:27:56 +0100
      message:
        fix for BUG#50120 "Valgrind errors in any test, inside mysqltest"
        Problem was that as v->name[v->name_len] may be uninitialized (which is ok per se),
        it shouldn't be used in an if(). We remove this zero_the_char/restore_it logic by
        rather zero-terminating the v->name string when we create it in var_init().
      ------------------------------------------------------------
      ba3b5a7e
    • Alexander Nozdrin's avatar
      Backporting revision from mysql-6.0-codebase-bugfixing. · c06a3050
      Alexander Nozdrin authored
      Original revision:
      
      ------------------------------------------------------------
      revno: 3789.1.9
      revision-id: serg@mysql.com-20091229134448-phe834ukzmi0k2e3
      parent: serg@mysql.com-20091227081418-bgfg952gzumn1k3h
      committer: Sergei Golubchik <serg@mysql.com>
      branch nick: 6.0-codebase
      timestamp: Tue 2009-12-29 14:44:48 +0100
      message:
        better fix for Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds
        
        use setenv instead of putenv
      ------------------------------------------------------------
      c06a3050
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · 7973ab7c
      Alexander Nozdrin authored
      7973ab7c
  6. 08 Jan, 2010 1 commit
    • Luis Soares's avatar
      Fixes rpl_stm_loaddata_concurrent failure in PB2. · 37d0ecdf
      Luis Soares authored
      The test case did not start with fresh binlogs, so in some
      cases, dependending on the order MTR runs the tests, it would
      try to show binlog contents from invalid positions (binary log
      would contain unexpected events from previous test).
      
      We fix this by deploying a RESET MASTER at the beginning of the
      test case.
      37d0ecdf
  7. 07 Jan, 2010 4 commits
    • Alfranio Correia's avatar
    • Alfranio Correia's avatar
      merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge · 6f7929b1
      Alfranio Correia authored
      Conflicts:
      
      Text conflict in .bzr-mysql/default.conf
      Text conflict in mysql-test/extra/rpl_tests/rpl_loaddata.test
      Text conflict in mysql-test/r/mysqlbinlog2.result
      Text conflict in mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
      Text conflict in mysql-test/suite/binlog/r/binlog_unsafe.result
      Text conflict in mysql-test/suite/rpl/r/rpl_insert_id.result
      Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
      Text conflict in mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
      Text conflict in mysql-test/suite/rpl/r/rpl_udf.result
      Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test
      Text conflict in sql/field.h
      Text conflict in sql/log.cc
      Text conflict in sql/log_event.cc
      Text conflict in sql/log_event_old.cc
      Text conflict in sql/mysql_priv.h
      Text conflict in sql/share/errmsg.txt
      Text conflict in sql/sp.cc
      Text conflict in sql/sql_acl.cc
      Text conflict in sql/sql_base.cc
      Text conflict in sql/sql_class.h
      Text conflict in sql/sql_db.cc
      Text conflict in sql/sql_delete.cc
      Text conflict in sql/sql_insert.cc
      Text conflict in sql/sql_lex.cc
      Text conflict in sql/sql_lex.h
      Text conflict in sql/sql_load.cc
      Text conflict in sql/sql_table.cc
      Text conflict in sql/sql_update.cc
      Text conflict in sql/sql_view.cc
      Conflict adding files to storage/innobase.  Created directory.
      Conflict because storage/innobase is not versioned, but has versioned children.  Versioned directory.
      Conflict adding file storage/innobase.  Moved existing file to storage/innobase.moved.
      Conflict adding files to storage/innobase/handler.  Created directory.
      Conflict because storage/innobase/handler is not versioned, but has versioned children.  Versioned directory.
      Contents conflict in storage/innobase/handler/ha_innodb.cc
      6f7929b1
    • Marc Alff's avatar
      WL#2360 Performance schema · a4c3bc61
      Marc Alff authored
      Part IV: sql instrumentation
      a4c3bc61
    • Luis Soares's avatar
      Fix for rpl_bug31076 valgrind failure which popped up after · 28286c74
      Luis Soares authored
      WL#5151 was pushed.
      
      Problem 1: Some old binlog events do not contain metadata. This
      makes checking whether the field can be converted or not rather
      impossible because one cannot compare, for instance, field sizes
      from original table and target table.
      
      Solution 1: When an event does not contain metadata, we will just
      check if field types are equal and assume that original field
      definition matched with the one in the target table.
      
      Problem 2: There is a second fix, which involves lack of
      information regarding maybe_null. This was causing a conditional
      jump warning when creating a conversion table. 
      
      Solution 2: We will just assume that all fields that need to be
      in the conversion table may be null.
      28286c74
  8. 06 Jan, 2010 8 commits