1. 02 Apr, 2007 4 commits
  2. 31 Mar, 2007 2 commits
    • unknown's avatar
      Add correct replace · 407389ba
      unknown authored
      407389ba
    • unknown's avatar
      Bug#27049 Race condition in test mysqlbinlog.test · ff979b76
      unknown authored
       - Add --local-load option to avoidthat the load data file requested
         by mysqlbinlog end up in local var/tmp dir and not in system global
         tmpdir
      
      
      mysql-test/t/mysqlbinlog.test:
        Add --local-load option to avoidthat the load data file requested
        by mysqlbinlog end up in local var/tmp dir and not in system global
        tmpdir
      ff979b76
  3. 30 Mar, 2007 2 commits
  4. 29 Mar, 2007 27 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 480c30d9
      unknown authored
      into  recycle.(none):/src/bug23491/my50-bug23491
      
      
      mysql-test/t/mysqldump.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/mysqldump.result:
        SCCS merged
      480c30d9
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 8dc103f8
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      8dc103f8
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2 · dd6dbea1
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
      
      
      dd6dbea1
    • unknown's avatar
      Update test result after merge · fff440d9
      unknown authored
      fff440d9
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · d862d3b6
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
      
      
      d862d3b6
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2 · 09f1a842
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/rpl_ignore_table.result:
        Merge
      mysql-test/t/rpl_ignore_table.test:
        Merge, add a connection master to run following test on master
      09f1a842
    • unknown's avatar
      Bug#25482 GRANT statements are not replicated if you use "replicate-ignore-table" · a5c60b3f
      unknown authored
       - GRANT and REVOKE statments didn't have the "updating" flag set and
         thus statements with a table specified would not replicate if
         slave filtering rules where turned on.
         For example "GRANT ... ON test.t1 TO ..." would not replicate.
      
      
      mysql-test/r/rpl_ignore_table.result:
        Add test results
      mysql-test/t/rpl_ignore_table.test:
        Add tests
      sql/sql_yacc.yy:
        Pass option TL_OPTION_UPDATING to 'add_table_to_list' when parsing a
        GRANT or REVOKE and a table specifier is found. This will set the
        property "updating" on the table and thus the slave filtering rules will 
        be applied.
        
        Without setting updating the statement will be not
        replicated - since "it's not updating anything" - an optimization
        to quickly skip SELECT's and similar.
      a5c60b3f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · ff0f7dc5
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      ff0f7dc5
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121 · 16995bb7
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      16995bb7
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 722861e2
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
      
      
      722861e2
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · eb8ca32c
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      eb8ca32c
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 9d1d64db
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
      
      
      9d1d64db
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 · e76abb0d
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
      
      
      myisam/mi_open.c:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/create.result:
        Manual merge
      mysql-test/t/create.test:
        Manual merge
      e76abb0d
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · d3643c89
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
      
      
      d3643c89
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug26837/my50-bug26837 · 78a71639
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      78a71639
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 0535b220
      unknown authored
      into  mysql.com:/home/ram/work/b21976/my50-b21976
      
      
      0535b220
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 0f6bf015
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      0f6bf015
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309 · 27f8d830
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/t/openssl_1.test:
        Auto merged
      27f8d830
    • unknown's avatar
      Make the script detect --default-storage-engine=x and · 8b873c3f
      unknown authored
      mark the test as requiring that storage engine(if we need to do that)
      Make --ndb and --with-ndbcluster and alias for
      --mysqld=--default-storage-engine=ndbcluster
      
      
      8b873c3f
    • unknown's avatar
      gis_generic test cases: · 4e907a7f
      unknown authored
        Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
      
      
      mysql-test/include/gis_generic.inc:
        Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
      mysql-test/r/archive_gis.result:
        Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
      mysql-test/r/bdb_gis.result:
        Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
      mysql-test/r/innodb_gis.result:
        Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
      mysql-test/r/ndb_gis.result:
        Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
      4e907a7f
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1632a3fe
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
      
      
      1632a3fe
    • unknown's avatar
      Merge mysql.com:/home/ram/work/mysql-5.0-maint · 9683b0ae
      unknown authored
      into  mysql.com:/home/ram/work/b21976/my50-b21976
      
      
      sql/item.h:
        Auto merged
      mysql-test/r/func_group.result:
        merging
      mysql-test/t/func_group.test:
        merging
      sql/item_sum.cc:
        merging
      9683b0ae
    • unknown's avatar
      Merge mysql.com:/home/ram/work/mysql-5.0-maint · df990635
      unknown authored
      into  mysql.com:/home/ram/work/b26359/b26359.5.0
      
      
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      df990635
    • unknown's avatar
      Apply innodb-5.0-ss1372 snapshot · 3832b71b
      unknown authored
      Bug #27381: InnoDB exits when attempting to rename table to non-existant database
        Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
        os_file_handle_error().
      
      
      innobase/dict/dict0dict.c:
        Apply innodb-5.0-ss1372 snapshot
        
        Revision r1351:
        branches/5.0: Merge r1350 from trunk:
        
        Lock the data dictionary during rollback.  This removes the rare
        debug assertion failure ut_ad(mutex_own(&(dict_sys->mutex))) in
        dict_table_get_on_id() after the rollback following crash recovery.
      innobase/os/os0file.c:
        Apply innodb-5.0-ss1372 snapshot
        
        Revision r1354:
        branches/5.0: Merge r1352 from trunk:
        (also make indentation the same as in 5.1 to ease further merges)
        
        Fix typo in comment in os/os0file.c
        
        
        
        Revision r1370:
        branches/5.0: Merge r1366 from trunk:
        
        Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
        os_file_handle_error().
      innobase/row/row0undo.c:
        Apply innodb-5.0-ss1372 snapshot
        
        Revision r1351:
        branches/5.0: Merge r1350 from trunk:
        
        Lock the data dictionary during rollback.  This removes the rare
        debug assertion failure ut_ad(mutex_own(&(dict_sys->mutex))) in
        dict_table_get_on_id() after the rollback following crash recovery.
      3832b71b
    • unknown's avatar
      Fix for bugs · 86010101
      unknown authored
      #27176: Assigning a string to an year column has unexpected results
      #26359: Strings becoming truncated and converted to numbers under STRICT mode
      
      Problems: 
      1. storing a string to an integer field we don't check 
         if strntoull10rnd() returns MY_ERRNO_EDOM error.
         Fix: check for MY_ERRNO_EDOM.
      2. storing a string to an year field we use my_strntol() function.
         Fix: use strntoull10rnd() instead.
      
      
      mysql-test/r/strict.result:
        Fix for bugs
        #27176: Assigning a string to an year column has unexpected results
        #26359: Strings becoming truncated and converted to numbers under STRICT mode
          - test result.
      mysql-test/r/type_date.result:
        Fix for bugs
        #27176: Assigning a string to an year column has unexpected results
        #26359: Strings becoming truncated and converted to numbers under STRICT mode
          - test result.
      mysql-test/r/type_year.result:
        Fix for bugs
        #27176: Assigning a string to an year column has unexpected results
        #26359: Strings becoming truncated and converted to numbers under STRICT mode
          - test result.
      mysql-test/t/strict.test:
        Fix for bugs
        #27176: Assigning a string to an year column has unexpected results
        #26359: Strings becoming truncated and converted to numbers under STRICT mode
          - test case.
      mysql-test/t/type_year.test:
        Fix for bugs
        #27176: Assigning a string to an year column has unexpected results
        #26359: Strings becoming truncated and converted to numbers under STRICT mode
      sql/field.cc:
        Fix for bugs
        #27176: Assigning a string to an year column has unexpected results
        #26359: Strings becoming truncated and converted to numbers under STRICT mode
          - Field_num::get_int() method introduced. It converts a string to integer
            then check errors and bounds.
          - similar Field_tiny::store(const char...),  Field_short::store(const char...),
            Field_medium::store(const char...), Field_long::store(const char...)
            rewritten, now they just call Field_num::get_int() then store value returned.
          - Field_num::check_int() simplified.
          - Field_year::store(const char...) now uses strntoull10rnd() and properly checks
            errors returned.
      sql/field.h:
        Fix for bugs
        #27176: Assigning a string to an year column has unexpected results
        #26359: Strings becoming truncated and converted to numbers under STRICT mode
         - check_int() moved to Field_num.
         - get_int() introduced.
      86010101
    • unknown's avatar
      Fix warning on Windows · db9af0d8
      unknown authored
      
      sql/log.cc:
        Change print_buffer_to_nt_eventlog() to take size_t instead of int/uint for buffer sizes
      db9af0d8
    • unknown's avatar
      Update test for bug #24563 (MBROverlaps does not seem to function propertly.);... · b9fd97f5
      unknown authored
      Update test for bug #24563 (MBROverlaps does not seem to function propertly.); ARCHIVE doesn't support AUTO_INCREMENT, so specify PK values explicitly
      
      
      mysql-test/r/archive_gis.result:
        update test result
      mysql-test/r/bdb_gis.result:
        update test result
      mysql-test/r/innodb_gis.result:
        update test result
      mysql-test/r/ndb_gis.result:
        update test result
      b9fd97f5
  5. 28 Mar, 2007 5 commits
    • unknown's avatar
      Remove warning when compiling libmysqld/log.cc · 465cf738
      unknown authored
      
      sql/log.cc:
        define print_buffer_to_file only ifdef EMBEDDED_LIBRARY, to avoid "defined but not used" warning
      465cf738
    • unknown's avatar
      Update test for bug #24563 (MBROverlaps does not seem to function propertly.): · 942bb0df
      unknown authored
      - Add primary key to test table, so NDB with binlog doesn't complain
      - Add extra results for bdb_gis.result
      
      
      mysql-test/include/gis_generic.inc:
        Update test for bug #24563 (MBROverlaps does not seem to function propertly.):
        - Add primary key to test table, so NDB with binlog doesn't complain
      mysql-test/r/archive_gis.result:
        update test results
      mysql-test/r/bdb_gis.result:
        update test results
      mysql-test/r/innodb_gis.result:
        update test results
      mysql-test/r/ndb_gis.result:
        update test results
      942bb0df
    • unknown's avatar
      Bug #26642: create index corrupts table definition in .frm · 0b72b7f0
      unknown authored
      Thanks to Martin Friebe for finding and submitting a fix for this bug!
      
      A table with maximum number of key segments and maximum length key name
      would have a corrupted .frm file, due to an incorrect calculation of the
      complete key length.  Now the key length is computed correctly (I hope) :-)
      
      MyISAM would reject a table with the maximum number of keys and the maximum
      number of key segments in all keys.  It would allow one less than this total
      maximum.  Now MyISAM accepts a table defined with the maximum.  (This is a
      very minor issue.)
      
      
      myisam/mi_open.c:
        change >= to > in a comparison (i.e., error only if key_parts_in_table
        really is greater than MAX_KEY * MAX_KEY_SEG)
      mysql-test/r/create.result:
        Add test results for bug #26642 (create index corrupts table definition in .frm)
      mysql-test/t/create.test:
        Add test case for bug #26642 (create index corrupts table definition in .frm)
      sql/table.cc:
        In create_frm(), fix formula for key_length; it was too small by (keys * 2) bytes
      0b72b7f0
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/50 · 3d52fb0e
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      3d52fb0e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 96581624
      unknown authored
      into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
      
      
      96581624