1. 25 Jan, 2010 3 commits
  2. 22 Jan, 2010 2 commits
  3. 21 Jan, 2010 2 commits
  4. 20 Jan, 2010 4 commits
  5. 19 Jan, 2010 4 commits
  6. 18 Jan, 2010 6 commits
  7. 15 Jan, 2010 7 commits
    • Sergey Glukhov's avatar
      compilation failure fix · b6685d35
      Sergey Glukhov authored
      b6685d35
    • Sergey Glukhov's avatar
      backported: · 5a4a98af
      Sergey Glukhov authored
      -WL#2822 INFORMATION_SCHEMA.ROUTINES: Add missing columns
      -WL#2003 INFORMATION_SCHEMA: PARAMETERS view
      -addon for 'I_S optimization' WL
      
      5a4a98af
    • Alexey Kopytov's avatar
      Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. · 0a5b406f
      Alexey Kopytov authored
      Conflicts:
      
      Text conflict in .bzr-mysql/default.conf
      Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
      Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
      Text conflict in mysql-test/t/mysqlbinlog.test
      Text conflict in sql/sql_acl.cc
      Text conflict in sql/sql_servers.cc
      Text conflict in sql/sql_update.cc
      Text conflict in support-files/mysql.spec.sh
      0a5b406f
    • Georgi Kodinov's avatar
      merge · 0305aea8
      Georgi Kodinov authored
      0305aea8
    • Georgi Kodinov's avatar
      merge of version change. · a07ca237
      Georgi Kodinov authored
      Added not_embedded to the new dbug_sync test file.
      a07ca237
    • unknown's avatar
      Fix for perfschema.binlog_stmt failure: · 5d279205
      unknown 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.
      5d279205
    • MySQL Build Team's avatar
  8. 14 Jan, 2010 12 commits
    • MySQL Build Team's avatar
      10824d2e
    • Alfranio Correia's avatar
      3f1899e8
    • Alfranio Correia's avatar
    • Alfranio Correia's avatar
      merge mysql-next-mr --> mysql-5.1-rpl-merge · b4c0c155
      Alfranio Correia authored
      Conflicts:
        Text conflict in sql/sql_insert.cc 
      b4c0c155
    • Luis Soares's avatar
      Fix for BUG#49481 and BUG#49482. · 32aa6128
      Luis Soares authored
      BUG#49481: RBR: MyISAM and bit fields may cause slave to stop on delete: 
      cant find record
            
      BUG#49482: RBR: Replication may break on deletes when MyISAM tables + 
      char field are used
      
      When using MyISAM tables, despite the fact that the null bit is
      set for some fields, their old value is still in the row. This
      can cause the comparison of records to fail when the slave is
      doing an index or range scan.
      
      We fix this by avoiding memcmp for MyISAM tables when comparing
      records. Additionally, when comparing field by field, we first
      check if both fields are not null and if so, then we compare
      them. If just one field is null we return failure immediately. If
      both fields are null, we move on to the next field.
      32aa6128
    • Alfranio Correia's avatar
      1b09e105
    • Alfranio Correia's avatar
      Augmented the rpl_ndb_binlog_format_errors to verify if a slave running in the · eef6ea03
      Alfranio Correia authored
      STMT mode aborts the SQL Thread if it receives changes in ROW mode and such
      changes are not processed.
      eef6ea03
    • Olav Sandstaa's avatar
      Fix for Bug#50221 Server refuses to start from non-default installdir on Solaris 32-bit · ec680f0a
      Olav Sandstaa authored
      When starting mysqld it did not recognize most of the options given on
      the command line when it was compiled for 32-bit Solaris using Sun
      Studio compiler. The cause for this was that most of the entries in
      the my_long_options array contained "garbage" data. The garbage data
      was caused by a compiler bug. When initilizing the def_value member
      for the "default-storage-engine" entry it was initialized like this:
      
        (longlong)"MyISAM"
      
      i.e. casting a 32 bit pointer to a 64 bit integer value. Due to the
      compiler bug only 4 bytes was allocated (instead of 8 bytes). This
      caused everything following this entry to be stored at a location that
      was 4 byte wrong.
      
      The fix/work-around for this problem is initialize the def_value
      for default-storage-engine in my_long_options to 0 and instead
      initialize the default_storage_engine variable to "MyISAM" in
      init_common_variables().
      
      sql/mysqld.cc:
        Due to a bug in Sun Studio compiler when generating 32 bit code the 
        initialization of the def_value member of the default-storage-engine entry 
        in my_long_options only got 4 bytes allocated instead of 8 bytes. 
        The compiler bug was triggered by casting a 32 bit pointer to a 64 bit 
        integer value in the initialization code for my_long_options. To avoid 
        triggering the compiler bug the intialization of the def_value in
        my_long_options is set to 0 and instead the default_storage_engine
        is initialized to "MyISAM" in init_common_variables().
      ec680f0a
    • Alexander Barkov's avatar
      WL#4583 Case conversion in Asian character sets · 8dfc3fbb
      Alexander Barkov authored
        modified:
        include/m_ctype.h
        - Changing type for tolower/toupper members, to store values >= 0xFFFF.
        - Adding function prototypes
      
        mysql-test/r/ctype_big5.result
        mysql-test/r/ctype_cp932_binlog_stm.result
        mysql-test/r/ctype_eucjpms.result*
        mysql-test/r/ctype_euckr.result
        mysql-test/r/ctype_gb2312.result
        mysql-test/r/ctype_gbk.result
        mysql-test/r/ctype_sjis.result
        mysql-test/r/ctype_ujis.result
        mysql-test/t/ctype_big5.test
        mysql-test/t/ctype_cp932_binlog_stm.test
        mysql-test/t/ctype_eucjpms.test
        mysql-test/t/ctype_euckr.test
        mysql-test/t/ctype_gb2312.test
        mysql-test/t/ctype_gbk.test
        mysql-test/t/ctype_sjis.test
        mysql-test/t/ctype_ujis.test
        -  Adding tests
      
        strings/ctype-big5.c
        strings/ctype-cp932.c
        strings/ctype-euc_kr.c
        strings/ctype-eucjpms.c
        strings/ctype-gb2312.c
        strings/ctype-gbk.c
        strings/ctype-sjis.c
        - Adding upper/lower case conversion data
      
        strings/ctype-mb.c
        - Adding handling of upper/lower conversion for multi-byte characters.
      
        strings/ctype-ujis.c
        - Implementing shared upper/lower conversion
          functions  for ujis and eucjpms
        - Adding upper/lower case conversion data for ujis
      8dfc3fbb
    • Luis Soares's avatar
      BUG#50018: binlog corruption when table has many columns · 5ae7b3c9
      Luis Soares authored
      Small fix in the test case. Changed the UNLOCK tables 
      to happen after each insert.
      5ae7b3c9
    • Luis Soares's avatar
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · 9b059722
      Alexander Nozdrin authored
      9b059722