1. 23 Dec, 2004 6 commits
  2. 22 Dec, 2004 25 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 3bdff7fb
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      3bdff7fb
    • unknown's avatar
      BitKeeper/triggers/pre-delta · baac3b76
      unknown authored
          don't checkin for Administrator or mysqldev
      sql/log.cc@1.157
          restored a bugfix that was lost in a merge
      
      
      sql/log.cc:
        restored a bugfix that was lost in a merge
      BitKeeper/triggers/pre-delta:
        don't commit for Administrator or mysqldev
      baac3b76
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7901cd30
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      7901cd30
    • unknown's avatar
      fixed so that last repeats are printed first with correct time if another message comes · 7b0857a7
      unknown authored
      decided for fixed size buffers in LogHandler repeated messages
      
      
      mysql-test/ndb/basic.result:
        updated ndb test
      ndb/include/logger/LogHandler.hpp:
        decided for fixed size buffers
      ndb/include/logger/Logger.hpp:
        decided for fixed size buffers
      ndb/src/common/logger/LogHandler.cpp:
        decided for fixed size buffers
      ndb/src/common/logger/Logger.cpp:
        decided for fixed size buffers
      7b0857a7
    • unknown's avatar
      added handling of repeated messages · eebd8d7e
      unknown authored
      
      ndb/src/common/transporter/Transporter.hpp:
        fixed small error
      eebd8d7e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 65256dea
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-smfix
      
      
      65256dea
    • unknown's avatar
      Fix for bug #7458 "Microseconds are gobbled from the string result of · 0ed3eb41
      unknown authored
      STR_TO_DATE() function if there is another format specifier after %f 
      in format string". Also small cleanup of STR_TO_DATE() implementation.
      (After review version.)
      
      
      mysql-test/r/date_formats.result:
        Added test for small bug in STR_TO_DATE() implementation which caused
        microseconds to be gobbled from string result of this function, if
        there was another specifier after %f in format string.
      mysql-test/t/date_formats.test:
        Added test for small bug in STR_TO_DATE() implementation which caused
        microseconds to be gobbled from string result of this function, if
        there was another specifier after %f in format string.
      sql/item_timefunc.cc:
        Small cleanup of str_to_date() implementation.
          Renamed check_result_type() to less ambigous get_date_time_result_type()
          and made it static. Also added handling of %X,%x,%V,%v to this function.
          Fixed small bug in it which caused microseconds to be gobbled if there
          was some other specifiers after %f.
          Cleaned up comments a bit.
      0ed3eb41
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c3cb363d
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      c3cb363d
    • unknown's avatar
      changed name of g_eventLogger so it can be used in TransporterRegistry and is... · 8dcfad68
      unknown authored
      changed name of g_eventLogger so it can be used in TransporterRegistry and is the same as in the kernel
      
      
      ndb/include/ndbapi/ndb_cluster_connection.hpp:
        changed return type of no_ndb_nodes
      ndb/include/transporter/TransporterRegistry.hpp:
        added connect_server method to TransporterRegistry
      ndb/include/util/ndb_opts.h:
        set shared memory usage as _no_ default in 4.1
      ndb/src/common/transporter/Makefile.am:
        added -I flags for EventLogger.hpp
      ndb/src/common/transporter/SCI_Transporter.cpp:
        setting transporter type
      ndb/src/common/transporter/SHM_Transporter.cpp:
        setting transporter type
      ndb/src/common/transporter/TCP_Transporter.cpp:
        setting transporter type
      ndb/src/common/transporter/Transporter.cpp:
        added event logger
        added type handling in transporter
        added verification of transporter type compatability
      ndb/src/common/transporter/Transporter.hpp:
        setting transporter type
      ndb/src/common/transporter/TransporterRegistry.cpp:
        moved server-client transporter negotiation to own method connect_server()
        added verification of transporter compatability
      ndb/src/kernel/main.cpp:
        changed which events are logged
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        added g_eventLogger
      sql/mysqld.cc:
        set shared memory usage as _no_ default in 4.1
      8dcfad68
    • unknown's avatar
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 30d59892
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      
      30d59892
    • unknown's avatar
      ndb: use Ndb_cluster_connection in test* · f20ac5ca
      unknown authored
      
      ndb/test/ndbapi/testBlobs.cpp:
        use Ndb_cluster_connection
      ndb/test/ndbapi/testOIBasic.cpp:
        use Ndb_cluster_connection
      f20ac5ca
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7f1d1900
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      7f1d1900
    • unknown's avatar
      ndb - Fix bug in backward compatility code (for our test programs) · 17ec146c
      unknown authored
      
      ndb/src/ndbapi/Ndbinit.cpp:
        Fix bug in backward compatility code (for our test programs)
      17ec146c
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · dfaa184d
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      
      ndb/src/ndbapi/NdbConnection.cpp:
        Auto merged
      dfaa184d
    • unknown's avatar
      ndb: bug#7340 fix · 2eb5ae4c
      unknown authored
      
      mysql-test/r/ndb_blob.result:
        bug#7340 fix
      mysql-test/t/ndb_blob.test:
        bug#7340 fix
      ndb/src/ndbapi/NdbConnection.cpp:
        bug#7340 fix
      ndb/src/ndbapi/NdbOperationDefine.cpp:
        bug#7340 fix
      2eb5ae4c
    • unknown's avatar
      Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8 · cce8d045
      unknown authored
      See mysqldump.test comments for more details
      
      
      cce8d045
    • unknown's avatar
      ha_innodb.cc: · ef1971ec
      unknown authored
        Add a comment that no InnoDB table lock is now acquired in LOCK TABLES if AUTOCOMMIT=1. This helps to avoid deadlocks when porting old MyISAM applications to InnoDB.
      
      
      sql/ha_innodb.cc:
        Add a comment that no InnoDB table lock is now acquired in LOCK TABLES if AUTOCOMMIT=1. This helps to avoid deadlocks when porting old MyISAM applications to InnoDB.
      ef1971ec
    • unknown's avatar
      Merge hundin.mysql.fi:/home/heikki/mysql-4.0 · 6fa46766
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      
      sql/ha_innodb.cc:
        Auto merged
      6fa46766
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4e6fb94d
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      4e6fb94d
    • unknown's avatar
      wl1292 - ndb autotest - adapt to changes in Logger · bb15aa84
      unknown authored
      
      ndb/test/run-test/main.cpp:
        adapt to changes in Logger
      bb15aa84
    • unknown's avatar
      ha_innodb.cc: · e6dfed9f
      unknown authored
        If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily
      
      
      sql/ha_innodb.cc:
        If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily
      e6dfed9f
    • unknown's avatar
      added some debug printouts · b7a3d9e8
      unknown authored
      b7a3d9e8
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a55892ac
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      a55892ac
    • unknown's avatar
      added configuration hostnames to SHM config struct · 375d7e01
      unknown authored
          use configured hostnames for SHM transporter setup
      
      
      ndb/include/transporter/TransporterDefinitions.hpp:
        added configuration hostnames to SHM config struct
      ndb/src/common/mgmcommon/IPCConfig.cpp:
        added configuration hostnames to SHM config struct
      ndb/src/common/transporter/TransporterRegistry.cpp:
        added configuration hostnames to SHM config struct
        use configured hostnames for SHM transporter setup
      375d7e01
  3. 21 Dec, 2004 9 commits
    • unknown's avatar
      Merge hundin.mysql.fi:/home/heikki/mysql-4.0 · 1548c6b7
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      
      configure.in:
        SCCS merged
      innobase/os/os0file.c:
        SCCS merged
      1548c6b7
    • unknown's avatar
      main.cpp: · ba9ca889
      unknown authored
        ifdef on version prior to 5.0
      
      
      ndb/src/mgmsrv/main.cpp:
        ifdef on version prior to 5.0
      ba9ca889
    • unknown's avatar
      os0file.c: · fed35d92
      unknown authored
        Put back accidentally removed undef and remove a debug def
      
      
      innobase/os/os0file.c:
        Put back accidentally removed undef and remove a debug def
      fed35d92
    • unknown's avatar
      os0file.c: · b0d26c26
      unknown authored
        Fix InnoDB bug: on HP-UX, with a 32-bit binary, InnoDB was only able to read or write <= 2 GB files; the reason was that InnoDB treated the return value of lseek() as a 32-bit integer; lseek was used on HP-UX-11 as a replacement for pread() and pwrite() because HAVE_BROKEN_PREAD was defined on that platform
      
      
      innobase/os/os0file.c:
        Fix InnoDB bug: on HP-UX, with a 32-bit binary, InnoDB was only able to read or write <= 2 GB files; the reason was that InnoDB treated the return value of lseek() as a 32-bit integer; lseek was used on HP-UX-11 as a replacement for pread() and pwrite() because HAVE_BROKEN_PREAD was defined on that platform
      b0d26c26
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b42f0957
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      b42f0957
    • unknown's avatar
      NdbApi.hpp: · 68d85f70
      unknown authored
        NdbApi.hpp to include ndb_inti.h and ndb_cluster_connecion.hpp
      
      
      ndb/include/ndbapi/NdbApi.hpp:
        NdbApi.hpp to include ndb_inti.h and ndb_cluster_connecion.hpp
      68d85f70
    • unknown's avatar
    • unknown's avatar
      Bug#6481 - storage_engine system variable allows nonsensical value · c6b6977b
      unknown authored
        Check that the requested storage engine is enabled.
      
      
      c6b6977b
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5c185dfd
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      5c185dfd