1. 15 Aug, 2006 2 commits
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 · ee1b06d5
      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 (using local)
      sql/ha_ndbcluster.cc:
        Merge (using local)
      sql/ha_ndbcluster.h:
        Merge (using local)
      ee1b06d5
    • unknown's avatar
      ndb_lock.test, ndb_lock.result: · cd49f996
      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);
      
      
      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.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);
      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);
      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
      cd49f996
  2. 14 Aug, 2006 3 commits
    • 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
  3. 11 Aug, 2006 2 commits
  4. 10 Aug, 2006 3 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
      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
  5. 09 Aug, 2006 3 commits
    • 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
  6. 08 Aug, 2006 3 commits
  7. 07 Aug, 2006 1 commit
    • unknown's avatar
      sql_view.cc: · 55bd1096
      unknown authored
        Memory leak fix
      
      
      sql/sql_view.cc:
        Memory leak fix
      55bd1096
  8. 06 Aug, 2006 3 commits
  9. 03 Aug, 2006 18 commits
    • unknown's avatar
      cc10958f
    • unknown's avatar
      Fix a bug in the .dsp file. Ignore a symlink. · fc19d19d
      unknown authored
      
      BitKeeper/etc/ignore:
        Added ndb/src/common/util/testBitmask.cpp to the ignore list
      VC++Files/sql/mysqld.dsp:
        Fix a bug in the .dsp file.
      fc19d19d
    • unknown's avatar
    • unknown's avatar
      Update result after merge, since the function Item::tmp_table_field_from_field_type() · 98157e78
      unknown authored
      now takes mbmaxlen into account when calculating max_length of new field. 
      
      
      98157e78
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 · dba52b53
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
      
      
      dba52b53
    • unknown's avatar
      Bug#21419 test case lowercase_fs_off fails on Windows · 842ec233
      unknown authored
       - Backport patch from 5.0
      
      
      sql/mysqld.cc:
        Add else case to set "lower_case_file_system" also when lower_case_table_names are 1
      842ec233
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 4b579171
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      configure.in:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      4b579171
    • unknown's avatar
      Remove double error printout in mysqldump · 234bb881
      unknown authored
      
      client/mysqldump.c:
        Remove double error printout, mysql_query_with_error_report will do that. And set the exit code for us.
      mysql-test/r/mysqldump.result:
        Update test result after merge
      234bb881
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/my41-bug21218 · 9744e7f8
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/t/mysqlbinlog.test:
        Null merge
      9744e7f8
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/my41-bug21218 · 135ffa63
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      135ffa63
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21215 · 607b8e5e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      client/mysql.cc:
        Auto merged
      configure.in:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      client/mysqldump.c:
        Manual merge
      mysql-test/r/mysqldump.result:
        Manual merge
      mysql-test/t/mysqldump.test:
        Manual merge
      607b8e5e
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 · 485510a2
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
      
      
      485510a2
    • unknown's avatar
      BUG#7391 - Cross-database multi-table UPDATE uses active database · 74465080
      unknown authored
                 privileges
      
      This problem is 4.1 specific. It doesn't affect 4.0 and was fixed
      in 5.x before.
      
      Having any mysql user who is allowed to issue multi table update
      statement and any column/table grants, allows this user to update
      any table on a server (mysql grant tables are not exception).
      
      check_grant() accepts number of tables (in table list) to be checked
      in 5-th param. While checking grants for multi table update, number
      of tables must be 1. It must never be 0 (actually we have
      DBUG_ASSERT(number > 0) in 5.x in grant_check() function).
      
      
      mysql-test/r/grant.result:
        Addition to test case for bug#7391:
        - Added grant statement to trigger this problem in 4.1.
        - Fixed error messages.
      mysql-test/t/grant.test:
        Addition to test case for bug#7391:
        - Added grant statement to trigger this problem in 4.1.
        - Fixed error messages.
      sql/sql_update.cc:
        check_grant() accepts number of tables (in table list) to be checked
        in 5-th param. For this particular check number of tables must be 1.
        It must never be 0 (actually we have DBUG_ASSERT(number > 0) in 5.x
        in grant_check() function).
      74465080
    • unknown's avatar
      Removing disabling of lowercase_fs_off · 45275fbc
      unknown authored
      45275fbc
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · ed44a2ee
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      client/mysql.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/func_group.result:
        Merge manually
      mysql-test/t/func_group.test:
        Merge manually
      ed44a2ee
    • unknown's avatar
      Merge rama.(none):/home/jimw/my/mysql-5.0-19147 · 695c534d
      unknown authored
      into  rama.(none):/home/jimw/my/mysql-5.0-16502
      
      
      695c534d
    • unknown's avatar
      Merge rama.(none):/home/jimw/my/mysql-5.0-16881 · 827e6a85
      unknown authored
      into  rama.(none):/home/jimw/my/mysql-5.0-16502
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/mysql.result:
        Auto merged
      mysql-test/r/type_ranges.result:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      827e6a85
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 7f69aee4
      unknown authored
      into  rama.(none):/home/jimw/my/mysql-5.0-16502
      
      
      7f69aee4
  10. 02 Aug, 2006 2 commits