1. 20 Oct, 2004 6 commits
    • unknown's avatar
      Merge with 4.0 · 560d7bcd
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      Docs/Support/texi2html:
        Auto merged
      innobase/trx/trx0rec.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      mysql-test/t/innodb-lock.test:
        Auto merged
      mysys/thr_lock.c:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/sql_acl.cc:
        Keep old code
      560d7bcd
    • unknown's avatar
      Fix test case for innodb-lock · ec8779e9
      unknown authored
      
      mysql-test/r/innodb-lock.result:
        Fix test case (old one didn't test things correctly)
      mysql-test/t/innodb-lock.test:
        Fix test case (old one didn't test things correctly)
      mysys/thr_lock.c:
        More debugging information
      sql/mysqld.cc:
        Enable innodb_table_locks as default, as otherwise there is a possibility for deadlocks
      sql/sql_base.cc:
        More debug information
      ec8779e9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 7bdb93aa
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      innobase/srv/srv0srv.c:
        Auto merged
      7bdb93aa
    • unknown's avatar
      NDB dbtux compile fix for sol9x86 · 6875cf36
      unknown authored
      
      ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
        compile fix for sol9x86
      ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
        compile fix for sol9x86
      ndb/test/ndbapi/testOIBasic.cpp:
        testing continues..
      6875cf36
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 95f0e39a
      unknown authored
      into mysql.com:/home/my/mysql-4.0
      
      
      libmysql/libmysql.c:
        Auto merged
      95f0e39a
    • unknown's avatar
      Code cleanups (done during review of new code) · ed8ec2cf
      unknown authored
      Rename innodb_table_locks_old_behavior -> innodb_table_locks
      Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
      (This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
      
      
      libmysql/libmysql.c:
        Use ulong instead of unsigned long
        Reuse _dig_vec()
      myisam/myisampack.c:
        Simplify code
      mysql-test/r/innodb-lock.result:
        new test case
      mysql-test/t/innodb-lock.test:
        new test case
      sql/ha_innodb.cc:
        Rename innodb_table_locks_old_behavior -> innodb_table_locks
      sql/mysqld.cc:
        Rename innodb_table_locks_old_behavior -> innodb_table_locks
        Set this off by default to get same behaviour as in MySQL 4.0.20
      sql/set_var.cc:
        Rename innodb_table_locks_old_behavior -> innodb_table_locks
      sql/sql_class.h:
        Rename innodb_table_locks_old_behavior -> innodb_table_locks
      ed8ec2cf
  2. 19 Oct, 2004 17 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2da1cbd9
      unknown authored
      into mishka.local:/home/my/mysql-4.1
      
      
      client/mysqlimport.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      2da1cbd9
    • unknown's avatar
      ca1a24e0
    • unknown's avatar
      Review of all code pushed since last review · 4736d0fe
      unknown authored
      Simple optimzations and cleanups
      Removed compiler warnings and fixed portability issues
      Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
      Fixes for purify
      
      
      client/mysqlimport.c:
        Remove not used variable
      client/mysqltest.c:
        Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN)
        Simplified code
        Remove usage of sprintf("%llu") as this is not portable
      include/mysql.h:
        Added mysql_embedded() to be able to easily check if we are using the embedded server
      innobase/srv/srv0start.c:
        Don't use memcmp() when using purify (to avoid false warnings)
      libmysql/libmysql.c:
        Added mysql_embedded() to be able to easily check if we are using the embedded server
      libmysql/libmysql.def:
        Added mysql_embedded() to be able to easily check if we are using the embedded server
      myisam/myisam_ftdump.c:
        Remove compiler warning
      myisam/myisamchk.c:
        Remove compiler warning
      myisam/rt_test.c:
        #ifdef not used code
      mysys/hash.c:
        Remove compiler warning (from last push)
      mysys/my_gethwaddr.c:
        Remove compiler warning
      ndb/src/ndbapi/ndberror.c:
        #ifdef not used code
      regex/regcomp.c:
        Remove not used code
      regex/regcomp.ih:
        Remove not used code (to remove compiler warnings)
      sql-common/client.c:
        Remove compiler warnings
      sql/field.cc:
        Simple optimization
      sql/ha_innodb.cc:
        Rename mysql_embedded -> mysqld_embedded
      sql/item.cc:
        Fix comments
        Move variables first on block
        Remove else after return
        Simple optimizations
        (no logic changes)
      sql/item_cmpfunc.cc:
        Added comment
      sql/mysql_priv.h:
        Rename mysql_embedded -> mysqld_embedded
      sql/mysqld.cc:
        Rename mysql_embedded -> mysqld_embedded
      sql/sql_acl.cc:
        Added comments
        simple optimization
        Fixed 'very unlikely' bug when doing REVOKE ALL PRIVILEGES
      sql/sql_select.cc:
        More comments
        Simple optimization
      sql/sql_show.cc:
        Simple changes to make similar code similar
        More comments
      sql/sql_string.cc:
        Trivial optimization and better code layout
      strings/Makefile.am:
        Change xml.c to use bcmp to avoid warnings from purify
      strings/xml.c:
        Change xml.c to use bcmp to avoid warnings from purify
      tests/client_test.c:
        Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN)
      4736d0fe
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 31d1e2a5
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      31d1e2a5
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 9723accc
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      
      9723accc
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9f2fc33f
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      9f2fc33f
    • unknown's avatar
      trx0rec.c: · 0e0c9af5
      unknown authored
        test
      
      
      innobase/trx/trx0rec.c:
        test
      0e0c9af5
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · f0a6f2b6
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
      
      
      f0a6f2b6
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 3466b8d5
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
      
      
      3466b8d5
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4c0b22b0
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      4c0b22b0
    • unknown's avatar
      libmysql.c: · 30d33c71
      unknown authored
        Add note to mysql_hex_string() comment.
      
      
      libmysql/libmysql.c:
        Add note to mysql_hex_string() comment.
      30d33c71
    • unknown's avatar
      os0file.c: · 19362856
      unknown authored
        InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested
      
      
      innobase/os/os0file.c:
        InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested
      19362856
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · b42ab125
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-4.1
      
      
      b42ab125
    • unknown's avatar
      CHARSET_INFO.txt: · 5d14a6ee
      unknown authored
        minor fixes
      
      
      strings/CHARSET_INFO.txt:
        minor fixes
      5d14a6ee
    • unknown's avatar
      sql_union.cc: · ad8865cb
      unknown authored
        Check DERIVATION_NONE only for UNIONS.
      
      
      sql/sql_union.cc:
        Check DERIVATION_NONE only for UNIONS.
      ad8865cb
    • unknown's avatar
      Dumping BLOBs in HEX notation. The patch was orinigally · 234a8ec0
      unknown authored
      contributed by Takeshi. I also added HEX support for 
      "extended-inserts".
      
      
      234a8ec0
    • unknown's avatar
      libmysql.c: · 2428fb5c
      unknown authored
        New function mysql_hex_string()
      
      
      libmysql/libmysql.c:
        New function mysql_hex_string()
      2428fb5c
  3. 18 Oct, 2004 17 commits