1. 28 Sep, 2006 8 commits
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines · 59a7f1ab
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
      
      
      myisammrg/myrg_open.c:
        Auto merged
      myisammrg/myrg_queue.c:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      mysql-test/r/merge.result:
        Manual merge.
      59a7f1ab
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines · d96989ca
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
      
      
      myisammrg/myrg_open.c:
        Auto merged
      mysql-test/r/merge.result:
        Manual merge.
      mysql-test/t/merge.test:
        Manual merge.
      d96989ca
    • unknown's avatar
      BUG#21617 - crash when selecting from merge table with inconsistent indexes · 7d915f01
      unknown authored
      Crash may happen when selecting from a merge table that has underlying
      tables with less indexes than in a merge table itself.
      
      If number of keys in merge table is not bigger than requested key number,
      return error.
      
      
      myisammrg/myrg_open.c:
        Store min(number of keys) in m_info instead of number of keys in last
        underlying table.
      myisammrg/myrg_queue.c:
        Return error if inx passed to _myrg_init_queue function is not less
        than number of keys.
      mysql-test/r/merge.result:
        A test case for bug#21617.
      mysql-test/t/merge.test:
        A test case for bug#21617.
      mysys/queues.c:
        Replaced annoying ifndef DBUG_OFF with DBUG_ASSERT, fixed coding style.
        The problem was that having queue overrun in debug build was hidden
        with this ifdef.
      7d915f01
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 9902c35a
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG21675/mysql-5.0-engines
      
      
      9902c35a
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines · 33163d15
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG21675/mysql-5.0-engines
      
      
      sql/ha_archive.cc:
        Auto merged
      33163d15
    • unknown's avatar
      BUG#21675 - engine=archive 2GB file limit, when reached mysqld restarts on any query · 9e6eaaf0
      unknown authored
      If mysqld is linked against system installed zlib (which is likely compiled w/o
      LFS) and archive table exceedes 2G, mysqld will likely be terminated with SIGXFSZ.
      
      Prior to actual write perform a check if there is space in data file. This fixes
      abnormal process termination with SIGXFSZ.
      
      No test case for this bugfix.
      
      
      sql/ha_archive.cc:
        Prior to actual write perform a check if there is space in data file. This fixes
        abnormal process termination with SIGXFSZ.
      sql/ha_archive.h:
        Added approximate archive data file size to archive share.
      9e6eaaf0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 1f9b9591
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug20719-m
      
      
      1f9b9591
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 56cfda33
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-bug20719-m
      
      
      56cfda33
  2. 27 Sep, 2006 7 commits
  3. 23 Sep, 2006 2 commits
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty · b810b16e
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-bug14400-monty
      
      
      BitKeeper/etc/ignore:
        auto-union
      myisam/mi_rkey.c:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      b810b16e
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.0-bug14400 · 4a15278d
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
      
      
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Merge of after merge fix
      mysql-test/r/myisam.result:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Merge of after merge fix
      mysql-test/t/myisam.test:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Merge of after merge fix
      4a15278d
  4. 22 Sep, 2006 3 commits
  5. 21 Sep, 2006 1 commit
  6. 20 Sep, 2006 2 commits
    • unknown's avatar
      BUG#21459 - myisam_ftdump gives bad counts for common words · 1eb82be2
      unknown authored
      This problem affects myisam_ftdump tool only.
      
      For fulltext index positive subkeys means word weight, negative subkeys
      means number of documents in level 2 fulltext index.
      
      Fixed that document counter was not properly updated for keys having
      level 2 fulltext index.
      
      No test case for this bug.
      
      
      myisam/myisam_ftdump.c:
        For fulltext index positive subkeys means word weight, negative subkeys
        means number of documents in level 2 fulltext index.
        
        Fixed that document counter was not properly updated for keys having
        level 2 fulltext index.
      1eb82be2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · f6951675
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      f6951675
  7. 19 Sep, 2006 5 commits
    • unknown's avatar
      BUG#10974 - No error message if merge table based on union of innodb, memory · 23fefc88
      unknown authored
      Fixed confusing error message from the storage engine when
      it fails to open underlying table. The error message is issued
      when a table is _opened_ (not when it is created).
      
      
      myisammrg/myrg_open.c:
        Set my_errno to HA_ERR_WRONG_MRG_TABLE_DEF if attempt to open
        underlying table failed.
      mysql-test/r/merge.result:
        A test case for bug#10974.
      mysql-test/r/repair.result:
        Fixed a test case according to patch for bug#10974.
      mysql-test/t/merge.test:
        A test case for bug#10974.
      sql/share/english/errmsg.txt:
        Better error message if we fail to open underlying table.
      sql/table.cc:
        Report error from handler with print_error instead of frm_error. This
        fixes confusing error message from the handler. Actually this is
        backported from 5.0.
      23fefc88
    • unknown's avatar
      After merge fix. · 11ba3204
      unknown authored
      11ba3204
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty · 08f4565e
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-bug14400-monty
      
      
      BitKeeper/etc/ignore:
        auto-union
      include/my_global.h:
        Auto merged
      myisam/mi_rkey.c:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      myisam/mi_test_all.res:
        Manual merge from 4.1.
      sql/sql_select.cc:
        Manual merge from 4.1.
      08f4565e
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0 · 82a72ee1
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
      
      
      BitKeeper/etc/ignore:
        auto-union
      include/my_global.h:
        Auto merged
      myisam/mi_rkey.c:
        Manual null merge as a better fix is already present.
      mysql-test/r/myisam.result:
        Manual null merge as a better fix is already present.
      mysql-test/t/myisam.test:
        Manual null merge as a better fix is already present.
      sql/sql_select.cc:
        Manual merge of purify improvements.
      82a72ee1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 06ced7c1
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0--team
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      06ced7c1
  8. 18 Sep, 2006 9 commits
  9. 16 Sep, 2006 1 commit
    • unknown's avatar
      Fixed bug #21493: crash for the second execution of a function · 58e178c5
      unknown authored
      containing a select statement that uses an aggregating IN subquery.
      Added a parameter to the function fix_prepare_information 
      to restore correctly the having clause for the second execution.
      Saved andor structure of the having conditions at the proper moment
      before any calls of split_sum_func2 that could modify the having structure
      adding new Item_ref objects. (These additions, are produced not with 
      the statement mem_root, but rather with the execution mem_root.)
      
      
      mysql-test/r/sp.result:
        Added a test case for bug #21493.
      mysql-test/t/sp.test:
        Added a test case for bug #21493.
      sql/sql_delete.cc:
        Fixed bug #21493: crash for the second execution of a function
        containing a select statement that uses an aggregating IN subquery.
        Added a parameter to the function fix_prepare_information 
        to restore correctly the having clause for the second execution.
      sql/sql_insert.cc:
        Fixed bug #21493: crash for the second execution of a function
        containing a select statement that uses an aggregating IN subquery.
        Added a parameter to the function fix_prepare_information 
        to restore correctly the having clause for the second execution.
      sql/sql_lex.cc:
        Fixed bug #21493: crash for the second execution of a function
        containing a select statement that uses an aggregating IN subquery.
        Added a parameter to the function fix_prepare_information 
        to restore correctly the having clause for the second execution.
      sql/sql_lex.h:
        Fixed bug #21493: crash for the second execution of a function
        containing a select statement that uses an aggregating IN subquery.
        Added a parameter to the function fix_prepare_information 
        to restore correctly the having clause for the second execution.
      sql/sql_update.cc:
        Fixed bug #21493: crash for the second execution of a function
        containing a select statement that uses an aggregating IN subquery.
        Added a parameter to the function fix_prepare_information 
        to restore correctly the having clause for the second execution.
      58e178c5
  10. 15 Sep, 2006 2 commits