1. 16 Aug, 2006 3 commits
  2. 15 Aug, 2006 10 commits
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7ec32371
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
      
      
      7ec32371
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · 088f59a9
      unknown authored
      into  xiphis.org:/opt2/tmp/autopush/mysql-5.0-fixbuild
      
      
      088f59a9
    • unknown's avatar
      Merge mysql.com:/usr/home/ram/work/tmp_merge · 988dbc1f
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-5.0
      
      
      mysql-test/t/ctype_utf8.test:
        Auto merged
      BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
        Auto merged
      BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        SCCS merged
      988dbc1f
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · ed481c39
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      ed481c39
    • unknown's avatar
      Fix for bug #21059 Server crashes on join query with large dataset with NDB... · 6464d62c
      unknown authored
      Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range
      
      
      
      6464d62c
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 · 115eb7df
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
      
      
      mysql-test/r/ndb_lock.result:
        Auto merged
      mysql-test/t/ndb_lock.test:
        Auto merged
      ndb/include/ndbapi/NdbTransaction.hpp:
        Merge
      sql/ha_ndbcluster.cc:
        Merge
      sql/ha_ndbcluster.h:
        Merge
      115eb7df
    • unknown's avatar
      ndb_lock.test, ndb_lock.result: · 87b7363c
      unknown authored
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      
      
      mysql-test/r/ndb_lock.result:
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      mysql-test/t/ndb_lock.test:
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      ndb/include/ndbapi/NdbConnection.hpp:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      sql/ha_ndbcluster.cc:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      sql/ha_ndbcluster.h:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      87b7363c
    • unknown's avatar
      fix windows build · 600f1155
      unknown authored
      600f1155
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1.b19741 · 0cd51b1a
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b19741merge
      
      
      strings/ctype-win1250ch.c:
        Coding style fix
      0cd51b1a
    • unknown's avatar
      Merge xiphis.org:/home/antony/work2/mysql-5.0-engines · 131f9a71
      unknown authored
      into  xiphis.org:/home/antony/work2/mysql-5.0-merge
      
      
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/r/insert_select.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/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      131f9a71
  3. 14 Aug, 2006 5 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 61d5563b
      unknown authored
      into  zim.(none):/home/brian/mysql/dep-5.0
      
      
      61d5563b
    • unknown's avatar
      Fix a test case (proper clean up). · 492e7b08
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Update results.
      mysql-test/t/mysqldump.test:
        Fix a bug in the test case that left user mysqltest_1@localhost 
        around (this broke furhter tests).
      492e7b08
    • unknown's avatar
      Merge may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-4.1 · 867f7368
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0
      
      
      myisam/sort.c:
        Auto merged
      mysql-test/r/repair.result:
        Auto merged
      mysql-test/t/repair.test:
        Auto merged
      867f7368
    • unknown's avatar
      BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1 · f6d7985a
      unknown authored
      Fixed by moving update_key_parts() down to be after write_index().
      
      
      myisam/sort.c:
        write_index() collects index statistic which is further used in
        update_key_parts(). Thus update_key_parts() must be called after
        write_index().
      mysql-test/r/repair.result:
        Test case for bug#18874.
      mysql-test/t/repair.test:
        Test case for bug#18874.
      f6d7985a
    • unknown's avatar
      Fix for bug#20648 We introduce a new field method for knowing "real size", and... · ba8be739
      unknown authored
      Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing. 
      
      
      sql/field.cc:
        data_length for field needs to be calculated directly.
      sql/field.h:
        The new method data_length() returns the "real" length of the field.
      sql/ha_archive.cc:
        Before a write_row() archive nulls space beyond the size of the row in varchars to make sure that compression only sees NULL.
      ba8be739
  4. 11 Aug, 2006 2 commits
  5. 10 Aug, 2006 5 commits
    • unknown's avatar
      Merge updates. · 12eb42ac
      unknown authored
      
      mysql-test/r/grant2.result:
        Merge update:  Change between versions, it appears.
      mysql-test/r/heap_btree.result:
        Merge update:  Add deterministic ordering of data, as the order is different 
        between versions.
      mysql-test/r/mysql_client.result:
        Merge update: Help options changed between versions.
      mysql-test/t/heap_btree.test:
        Merge update:  Add deterministic ordering of data, as the order is different 
        between versions.
      BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
        Delete: mysql-test/t/bug20328.test
      BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
        Delete: mysql-test/r/bug20328.result
      12eb42ac
    • unknown's avatar
      Fix for bug #20709: Collation not used in group by on 4.1. · bfdbb780
      unknown authored
      myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
      TEXT and VARTTEXT key segments.
      
      
      myisam/mi_unique.c:
        Fix for bug #20709: Collation not used in group by on 4.1.    
        
        myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
        TEXT and VARTTEXT key segments.
          
        Example: assume, we have a 'char(200) collate utf8_unicode_ci' field,
        there are two records with _utf8"0x65" and _utf8"0xC3A9" characters;
        these values are equal according
        to the utf8_unicode_ci collation, but two 600 byte length corresponding keys:  
        "0x65<0x20 repeats 599 times>" and "0xC3A9<0x20 repeats 598 times>" are not    
        equal if we count trailing spaces and it may cause inconsequent behavior.
        
        So, let's pass 1 as the skip_end_space parameter value to the mi_compare_text()
        function for proper TEXT and VARTTEXT key segments comparison.
      mysql-test/r/ctype_utf8.result:
        Fix for bug #20709: Collation not used in group by on 4.1.    
          - test results.
      mysql-test/t/ctype_utf8.test:
        Fix for bug #20709: Collation not used in group by on 4.1.    
          - test case.
      bfdbb780
    • unknown's avatar
      Removed Iggy's accidentally-added files. · 78c9885f
      unknown authored
      78c9885f
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 · d278381e
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
      
      
      client/mysql.cc:
        Auto merged
      heap/hp_delete.c:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      scripts/fill_func_tables.sh:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      mysql-test/r/grant2.result:
        Manual merge
      mysql-test/r/heap_btree.result:
        Manual merge
      mysql-test/r/mysql_client.result:
        Manual merge
      mysql-test/t/grant2.test:
        Manual merge
      mysql-test/t/heap_btree.test:
        Manual merge
      mysql-test/t/mysql_client.test:
        Manual merge
      d278381e
    • unknown's avatar
      afa49a59
  6. 09 Aug, 2006 5 commits
    • unknown's avatar
      Removed iggy's accidentally checked-in test files. · 70269a09
      unknown authored
      
      BitKeeper/deleted/.del-bug20328.test:
        Delete: mysql-test/t/bug20328.test
      BitKeeper/deleted/.del-bug20328.result:
        Delete: mysql-test/r/bug20328.result
      70269a09
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8f88400d
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-4.1
      
      
      8f88400d
    • unknown's avatar
      Merge may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-4.1 · 51bb3b2a
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-5.0
      
      
      myisam/mi_update.c:
        Auto merged
      51bb3b2a
    • unknown's avatar
      BUG#20060 - mysqld option "--flush " doesn't work for update statement · a2a5f2b5
      unknown authored
      Problem described in this bug report affects MyISAM tables only.
      
      Running mysqld --flush instructs mysqld to sync all changes to disk
      after each SQL statement. It worked well for INSERT and DELETE
      statements, but it did sync for UPDATE only in case if there was
      index change (change of colum that has an index). If no updated column
      has an index, data wasn't synced to disk.
      
      This fix makes UPDATE statement to sync data to disk even if there is
      no index change (that is only data change) and mysqld is run with
      --flush option.
      
      
      myisam/mi_update.c:
        Every myisam function that updates myisam table must end with
        call to _mi_writeinfo(). If operation (second param of
        _mi_writeinfo()) is not 0 it sets share->changed to 1, that is
        flags that data has changed. If operation is 0, this function
        equals to no-op in this case.
        
        mi_update() must always pass !0 value as operation, since even if
        there is no index change there could be data change.
      a2a5f2b5
    • unknown's avatar
      sql_view.cc: · 4abe4b17
      unknown authored
        After merge fix
      
      
      sql/sql_view.cc:
        After merge fix
      4abe4b17
  7. 08 Aug, 2006 3 commits
  8. 07 Aug, 2006 4 commits
  9. 06 Aug, 2006 3 commits