1. 07 Oct, 2005 6 commits
    • unknown's avatar
      Merge mysql.com:/M41/clone-4.1-current into mysql.com:/M41/push-4.1 · 3ef147aa
      unknown authored
      
      scripts/make_binary_distribution.sh:
        Auto merged
      3ef147aa
    • unknown's avatar
      Copy zlib.a and valgrind.supp if exists. · d40a0f42
      unknown authored
      Copy disabled.def
      (Backport of Kent's change from the main tree to the 4.1.15 build clone.
      Original changeset:  2005/10/07 13:08:07+02:00 kent@mysql.com )
      
      
      scripts/make_binary_distribution.sh:
        Copy zlib.a and valgrind.supp if exists.
        Copy disabled.def
        (Backport of Kent's change from the main tree to the 4.1.15 build clone.)
      d40a0f42
    • unknown's avatar
      make_binary_distribution.sh: · c533a6bf
      unknown authored
        Copy zlib.a and valgrind.supp if exists
        Copy disabled.def
      
      
      scripts/make_binary_distribution.sh:
        Copy zlib.a and valgrind.supp if exists
      c533a6bf
    • unknown's avatar
      Increase the version number. · 8b1936fa
      unknown authored
      8b1936fa
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0ecbc17c
      unknown authored
      into  mysql.com:/home/my/mysql-4.1
      
      
      0ecbc17c
    • unknown's avatar
      Review of new code since last pull · 3dcf2056
      unknown authored
      - Use %lx instead of %p as %p is not portable
      - Don't replace ROW item with Item_null
      
      
      myisam/mi_rkey.c:
        Use %lx instead of %p as %p is not portable
      myisam/mi_search.c:
        Use %lx instead of %p as %p is not portable
      mysql-test/r/select.result:
        More test for ROW comparison
      mysql-test/t/select.test:
        More test for ROW comparison
      sql/item.cc:
        We can't replace a ROW item with Item_null because:
        - Arg_comparator is still using the orignal row items and it's not good to have args[0] different from what is actually compared
        - If we are using the <=> comparator, NULL can still be compared as true
        - We would break things if we would ever use resolve_const_item() for operators like >, < etc.
      3dcf2056
  2. 06 Oct, 2005 9 commits
  3. 05 Oct, 2005 4 commits
  4. 04 Oct, 2005 1 commit
  5. 03 Oct, 2005 4 commits
  6. 02 Oct, 2005 1 commit
    • unknown's avatar
      os0sync.c: · 8d31718c
      unknown authored
        Add diagnostic code to track an assertion failure of 0 == pthread_mutex_destroy(); this was reported on the MySQL mailing list Sept 23, 2005
      
      
      innobase/os/os0sync.c:
        Add diagnostic code to track an assertion failure of 0 == pthread_mutex_destroy(); this was reported on the MySQL mailing list Sept 23, 2005
      8d31718c
  7. 30 Sep, 2005 10 commits
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · bdb9555d
      unknown authored
      into  hundin.mysql.fi:/home/marko/mysql-4.1
      
      
      bdb9555d
    • unknown's avatar
      InnoDB: After review fix · afed50ae
      unknown authored
      
      sql/ha_innodb.cc:
        Avoid bitwise arithmetics, as it might be difficult to read.  The
        added readability costs one register and two instructions on x86.
      afed50ae
    • unknown's avatar
      Many files: · b446550e
      unknown authored
        New VC7 project files
      des_key_file.cc:
        Visual C++ wants '"' for local include
      mysql.cc:
        Cast my_cgets() argument for VC6 and VC7
      dummy.cpp:
        Added to convince VS .Net generate a lib for mysqlserver
      
      
      VC++Files/mysqlserver/dummy.cpp:
        Added to convince VS .Net generate a lib for mysqlserver
      VC++Files/bdb/bdb.vcproj:
        New VC7 project files
      VC++Files/client/mysql.vcproj:
        New VC7 project files
      VC++Files/client/mysqladmin.vcproj:
        New VC7 project files
      VC++Files/client/mysqlclient.vcproj:
        New VC7 project files
      VC++Files/client/mysqldump.vcproj:
        New VC7 project files
      VC++Files/client/mysqlimport.vcproj:
        New VC7 project files
      VC++Files/client/mysqlshow.vcproj:
        New VC7 project files
      VC++Files/client/mysqltest.vcproj:
        New VC7 project files
      VC++Files/comp_err/comp_err.vcproj:
        New VC7 project files
      VC++Files/dbug/dbug.vcproj:
        New VC7 project files
      VC++Files/heap/heap.vcproj:
        New VC7 project files
      VC++Files/innobase/innobase.vcproj:
        New VC7 project files
      VC++Files/libmysql/libmysql.vcproj:
        New VC7 project files
      VC++Files/libmysqld/examples/test_libmysqld.vcproj:
        New VC7 project files
      VC++Files/libmysqld/libmysqld.vcproj:
        New VC7 project files
      VC++Files/libmysqltest/myTest.vcproj:
        New VC7 project files
      VC++Files/my_print_defaults/my_print_defaults.vcproj:
        New VC7 project files
      VC++Files/myisam/myisam.vcproj:
        New VC7 project files
      VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
        New VC7 project files
      VC++Files/myisamchk/myisamchk.vcproj:
        New VC7 project files
      VC++Files/myisamlog/myisamlog.vcproj:
        New VC7 project files
      VC++Files/myisammrg/myisammrg.vcproj:
        New VC7 project files
      VC++Files/myisampack/myisampack.vcproj:
        New VC7 project files
      VC++Files/mysql-test/mysql_test_run_new.vcproj:
        New VC7 project files
      VC++Files/mysql.sln:
        New VC7 project files
      VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
        New VC7 project files
      VC++Files/mysqlcheck/mysqlcheck.vcproj:
        New VC7 project files
      VC++Files/mysqldemb/mysqldemb.vcproj:
        New VC7 project files
      VC++Files/mysqlserver/mysqlserver.vcproj:
        New VC7 project files
      VC++Files/mysys/mysys.vcproj:
        New VC7 project files
      VC++Files/perror/perror.vcproj:
        New VC7 project files
      VC++Files/regex/regex.vcproj:
        New VC7 project files
      VC++Files/replace/replace.vcproj:
        New VC7 project files
      VC++Files/sql/mysqld.vcproj:
        New VC7 project files
      VC++Files/strings/strings.vcproj:
        New VC7 project files
      VC++Files/test1/test1.vcproj:
        New VC7 project files
      VC++Files/tests/mysql_client_test.vcproj:
        New VC7 project files
      VC++Files/thr_test/thr_test.vcproj:
        New VC7 project files
      VC++Files/vio/vio.vcproj:
        New VC7 project files
      VC++Files/zlib/zlib.vcproj:
        New VC7 project files
      client/mysql.cc:
        Cast my_cgets() argument for VC6 and VC7
      sql/des_key_file.cc:
        Visual C++ wants '"' for local include
      scripts/make_win_src_distribution.sh:
        New VC7 project files
      b446550e
    • unknown's avatar
      InnoDB: On UPDATE, trim UCS2 columns correctly. (Bug #12178) · a14a34be
      unknown authored
      
      sql/ha_innodb.cc:
        innobase_convert_and_store_changed_col(), calc_row_difference():
         Replace parameter "is_unsigned" with "prtype".
        innobase_convert_and_store_changed_col():
         When trimming spaces, note that UCS2 spaces are 0x0020, not 0x20.
      a14a34be
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · e99221d7
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      e99221d7
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 72411c19
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      72411c19
    • unknown's avatar
      ndb_config · 7337ba76
      unknown authored
        Check returnvalue on load/fetch configuration
      
      
      ndb/tools/ndb_config.cpp:
        Check returnvalue on load/fetch configuration
      7337ba76
    • unknown's avatar
      ndb - · 8c570f3f
      unknown authored
       add support for reading config.ini from ndb_config
       (as alternative to contacting ndb_mgmd)
      
      
      mysql-test/r/ndb_config.result:
        Add support for reading config.ini from ndb_config
      mysql-test/t/ndb_config.test:
        Add support for reading config.ini from ndb_config
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Handle prinouts better
      ndb/src/mgmsrv/InitConfigFileParser.hpp:
        Handle prinouts better
      ndb/tools/ndb_config.cpp:
        Add support for reading config.ini from ndb_config
      8c570f3f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · caa441d0
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      caa441d0
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · b96e4b68
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      
      b96e4b68
  8. 29 Sep, 2005 5 commits