1. 30 Nov, 2007 2 commits
  2. 27 Nov, 2007 1 commit
    • unknown's avatar
      Bug#32707: misdimensioned buffer in protocol layer · 7c0db983
      unknown authored
      Miscalculation in protocol-layer: size buffer correctly so
      even really long error messages cannot overflow our buffer.
      
      
      sql/protocol.cc:
        size buffer correctly so really long error messages cannot overflow it.
      7c0db983
  3. 24 Nov, 2007 8 commits
  4. 23 Nov, 2007 13 commits
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug29976/my51-bug28550 · 5668c1b3
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      
      sql/slave.cc:
        Auto merged
      5668c1b3
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 86823d74
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      86823d74
    • unknown's avatar
      Bug#30152 MySQLD crash duing alter table causes DROP DATABASE to FAIL due to temp file · 9a34c80e
      unknown authored
      disable decoding of table name if the table is internal temporary table
      
      
      mysql-test/r/drop.result:
        test result
      mysql-test/t/drop.test:
        test case
      sql/sql_db.cc:
        check is the name is internal tmp table name
      sql/sql_table.cc:
        disable decoding of table name if the table is internal temporary table
      sql/table.h:
        added flag which is true when table name is the name of internal temporary table
      9a34c80e
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 10c1aa79
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B32400-5.0-opt
      
      
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/subselect.result:
        SCCS merged
      mysql-test/t/subselect.test:
        SCCS merged
      10c1aa79
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-opt · 8401d595
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B32400-5.1-opt
      
      
      8401d595
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B32400-5.0-opt · 042a58e0
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B32400-5.1-opt
      
      
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/suite/ndb/r/ps_7ndb.result:
        Auto merged
      sql/item.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/t/subselect.test:
        merge of bug 32400 to 5.1-opt
      042a58e0
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 13f637fb
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      13f637fb
    • unknown's avatar
      Bug#32178 server crash when select from i_s and concurrent partition management · 6b3fed49
      unknown authored
      The crash happens because we change share->partition_info where 'share' is global struct
      (it affects other threads which use the same 'share').
      It causes discrepancy between 'share' and handler data. 
      The fix:
      Move share->partition_info update into WFRM_INSTALL_SHADOW part which is protected by OPEN_lock.
      
      
      sql/sql_partition.cc:
        fast_end_partition: added close_thread_tables() for the case when error occures
        fast_alter_partition_table: added close_thread_tables() for the case when error occures
      sql/sql_table.cc:
        The crash happens because we change share->partition_info where 'share' is global struct.
        It causes discrepancy between 'share' and handler data.
        The fix:
        Move share->partition_info update into WFRM_INSTALL_SHADOW part which is protected by OPEN_lock.
      6b3fed49
    • unknown's avatar
      Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt · d1a41459
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      
      d1a41459
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug32080/my51-bug26215 · 7ba06230
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      
      mysql-test/lib/mtr_report.pl:
        Auto merged
      7ba06230
    • unknown's avatar
      merge 5.0-opt -> 5.1-opt · 339e8f5d
      unknown authored
      339e8f5d
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt · c00bfc3b
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
      
      
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/r/type_bit.result:
        Auto merged
      mysql-test/r/type_blob.result:
        Auto merged
      mysql-test/t/gis.test:
        Auto merged
      mysql-test/t/type_bit.test:
        Auto merged
      mysql-test/t/type_blob.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/subselect.result:
        null merge. resolve latete.
      mysql-test/t/subselect.test:
        merge 5.0-opt -> 5.1-opt
      sql/key.cc:
        merge 5.0-opt -> 5.1-opt
      sql/sql_class.h:
        merge 5.0-opt -> 5.1-opt
      sql/sql_insert.cc:
        merge 5.0-opt -> 5.1-opt
      sql/sql_table.cc:
        merge 5.0-opt -> 5.1-opt
      c00bfc3b
    • unknown's avatar
      Fix for bug #32080: Excessive warnings on Solaris: setrlimit could not · e7501cd9
      unknown authored
      change the size of core files.
      
      Suppress the 'setrlimit could not change the size of the core files'
      warning in mysql-test-run. We do not want core files on some of the
      PushBuild hosts, and PushBuild itself does not set --core-files, so
      that warning is expected.
      
      
      mysql-test/lib/mtr_report.pl:
        Suppress the 'setrlimit could not change the size of the core files'
        warning in mysql-test-run. We do not want core files on some of the
        PushBuild machines, and PushBuild itself does not set --core-files, so
        that warning is expected.
      e7501cd9
  5. 22 Nov, 2007 13 commits
  6. 21 Nov, 2007 3 commits
    • unknown's avatar
      Fixed bug #32556: assert in "using index for group-by" : · a7c04594
      unknown authored
                        is_last_prefix <= 0, file .\opt_range.cc.
      
      SELECT ... GROUP BY bit field failed with an assertion if the
      bit length of that field was not divisible by 8.
      
      
      
      sql/key.cc:
        Fixed bug #32556.
        Copying of "uneven" bits of a bit field was duplicated in the
        key_copy() and in the Field_bit::get_key_image().
        So, instead of copying of the rest of a bit field, 
        Field_bit::get_key_image() copied "uneven" bits to key image again,
        and the lowest field byte was not copied to key at all.
        
        Duplicated code has been removed from the key_copy function.
      mysql-test/t/type_bit.test:
        Added test case for bug #32556.
      mysql-test/r/type_bit.result:
        Added test case for bug #32556.
      a7c04594
    • unknown's avatar
      Bug #31171: test alter_table, fulltext2, ps, sp fail, · 0b489d3f
      unknown authored
       "Table is already up to date" vs. "OK"
      
      On MacOSX 10.5 when you cast something to "bool"
      (the built in C type) it takes values 0 or 1 
      instead of 0-255 as it seems to be on older compilers.
      Fixed by removing the typecast (not needed).
      No test case needed : there are tests that test it.
      
      
      storage/myisam/mi_open.c:
        Bug #31171: don't typecast when not needed
      0b489d3f
    • unknown's avatar
      merge of bug 30788 to 5.1-opt · 16f15dba
      unknown authored
      16f15dba