1. 10 Aug, 2006 5 commits
    • unknown's avatar
      Some small cleanups that will help get mysql_client_test passing on Windows · e98ee19c
      unknown authored
      
      tests/mysql_client_test.c:
        set sql_mode to '' in a few places
        explicitly select myisam table type for fulltext
        use memcpy instead of strcpy since our src buffer is not zero terminated.
      e98ee19c
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · f7aee0eb
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
      
      
      client/mysql.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      f7aee0eb
    • unknown's avatar
      Merge updates. · 79e8b4dc
      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
      79e8b4dc
    • unknown's avatar
      Removed Iggy's accidentally-added files. · 5cc9a39d
      unknown authored
      5cc9a39d
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 · 60201f0d
      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
      60201f0d
  2. 09 Aug, 2006 4 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 0acdfab7
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
      
      
      sql/sql_view.cc:
        Auto merged
      0acdfab7
    • unknown's avatar
      Merge may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-4.1 · 899f24e0
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-5.0
      
      
      myisam/mi_update.c:
        Auto merged
      899f24e0
    • unknown's avatar
      BUG#20060 - mysqld option "--flush " doesn't work for update statement · de7f8c67
      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.
      de7f8c67
    • unknown's avatar
      sql_view.cc: · 06f67179
      unknown authored
        After merge fix
      
      
      sql/sql_view.cc:
        After merge fix
      06f67179
  3. 08 Aug, 2006 5 commits
  4. 07 Aug, 2006 3 commits
  5. 06 Aug, 2006 3 commits
  6. 05 Aug, 2006 2 commits
  7. 04 Aug, 2006 3 commits
  8. 03 Aug, 2006 15 commits