1. 25 Jul, 2005 4 commits
    • unknown's avatar
      Fix shortcircuit of 127.0.0.1 -> localhost lookup on little-endian · ec8617c6
      unknown authored
      machines. (Bug #11822)
      
      
      sql/hostname.cc:
        Fix comparison against INADDR_LOOPBACK to deal with endianness.
      ec8617c6
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1-merge · c15cab96
      unknown authored
      into mysql.com:/space/my/mysql-5.0-build
      
      
      scripts/Makefile.am:
        Auto merged
      c15cab96
    • unknown's avatar
      - merge from 4.0: updated scripts/Makefile.am to properly create but not install · fe862aa9
      unknown authored
        make_binary_distribution, make_sharedlib_distribution and make_win_src_distribution
      - removed make_win_binary_distribution.sh
      
      
      BitKeeper/deleted/.del-make_win_binary_distribution.sh~e0fbb0a75af0dcd3:
        Auto merged
      scripts/Makefile.am:
        - after merge fix: removed the "all" target - these files are now built via
          noinst_SCRIPTS instead.
      fe862aa9
    • unknown's avatar
      - Make sure the scripts make_binary_distribution, make_sharedlib_distribution and · 1f36f6f4
      unknown authored
        make_win_src_distribution are created, but not installed
      - removed make_win_binary_distribution.sh as it's obsolete and outdated
      
      
      BitKeeper/deleted/.del-make_win_binary_distribution.sh~e0fbb0a75af0dcd3:
        Delete: scripts/make_win_binary_distribution.sh
      scripts/Makefile.am:
        - Make sure the scripts make_binary_distribution, make_sharedlib_distribution and
          make_win_src_distribution are created, but not installed. This is the proper fix
          for what I began in the previous ChangeSet
        - removed make_win_binary_distribution.sh from the distribution, as it's obsolete
          and outdated
      1f36f6f4
  2. 24 Jul, 2005 1 commit
  3. 23 Jul, 2005 2 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 478e6f29
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
      
      
      BitKeeper/etc/config:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      mysql-test/r/query_cache.result:
        SCCS merged
      mysql-test/t/query_cache.test:
        SCCS merged
      478e6f29
    • unknown's avatar
      store SERVER_MORE_RESULTS_EXISTS in key of query cache (BUG#6897) · cebe1b5d
      unknown authored
      
      mysql-test/r/query_cache.result:
        query in QC from normal execution and SP
      mysql-test/t/query_cache.test:
        environment restoring fix
        layout fix
        query in QC from normal execution and SP
      sql/mysql_priv.h:
        store SERVER_MORE_RESULTS_EXISTS
      sql/sql_cache.cc:
        store SERVER_MORE_RESULTS_EXISTS in key of query cache
      BitKeeper/etc/config:
        switching logging off
      cebe1b5d
  4. 22 Jul, 2005 33 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-11227 · 9a0d9c35
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/table.cc:
        Auto merged
      9a0d9c35
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-11213 · 1f4afa38
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/share/errmsg.txt:
        SCCS merged
      1f4afa38
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-build · 7bb359cd
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysys/thr_lock.c:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      7bb359cd
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 6fd718df
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/t/create.test:
        Resolve conflict
      sql/mysql_priv.h:
        Resolve conflict
      sql/table.cc:
        Resolve conflict
      sql/unireg.cc:
        Resolve conflict
      6fd718df
    • unknown's avatar
      Remove use of non-portable gettimeofday() in thr_lock.c (Bug #12100) · 46b0edc4
      unknown authored
      
      mysys/thr_lock.c:
        Use set_timespec() macro instead of calling gettimeofday()
      46b0edc4
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-10407 · a4217760
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      a4217760
    • unknown's avatar
      removed DBUG code from ha_federated.cc causing windows compile problems. · 03fb8276
      unknown authored
      This is for the release bk tree, same change as 1.1890, which JimW approved.
      
      
      sql/ha_federated.cc:
        removed DBUG code
      03fb8276
    • unknown's avatar
      Fix calculation for length of LPAD() and RPAD() reported to · 657a5346
      unknown authored
      client via mysql_fetch_fields(). (Bug #11311)
      
      
      mysql-test/r/func_str.result:
        Add new results
      mysql-test/t/func_str.test:
        Add new regression test
      sql/item_strfunc.cc:
        Fix length reported for LPAD() and RPAD() -- they always truncate to the
        length that is given.
      657a5346
    • unknown's avatar
      Add the definition of "floatget". · 5f900fb5
      unknown authored
      Necessary to compile 5.0.10 on Windows, no bug report filed.
      
      
      include/config-win.h:
        Add the definition of "floatget" (as taken from "include/my_config.h", matching the common "floatstore").
        Necessary to compile 5.0.10 on Windows, no bug report filed.
      5f900fb5
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · fb006284
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
      
      
      fb006284
    • unknown's avatar
      errmsg.txt: · d3e68446
      unknown authored
        Change an ` quote to ' (' is used everywhere else)
        This does not affect any test results.
      
      
      sql/share/errmsg.txt:
        Change an ` quote to ' (' is used everywhere else)
        This does not affect any test results.
      d3e68446
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1.b11987 · 1c4da828
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      strings/ctype-gbk.c:
        Auto merged
      1c4da828
    • unknown's avatar
      ctype-gbk.c: · bf45b6ba
      unknown authored
        Bug #11987
        mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
        Allow to store and retrieve even unassigned GBK codes.
        Like we did in Big5 earlier.
      have_gbk.inc, have_gbk.require, ctype_gbk.result, ctype_gbk.test:
        new file
      
      
      strings/ctype-gbk.c:
        Bug #11987
        mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
        Allow to store and retrieve even unassigned GBK codes.
        Like we did in Big5 earlier.
      bf45b6ba
    • unknown's avatar
      ndb - hugo, fix closeTransaction in testPartitioning · 29f42518
      unknown authored
      
      ndb/test/include/UtilTransactions.hpp:
        Fix closeTransaction in testPartitioning
      ndb/test/src/HugoOperations.cpp:
        Fix closeTransaction in testPartitioning
      ndb/test/src/UtilTransactions.cpp:
        Fix closeTransaction in testPartitioning
      29f42518
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 53118f40
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
      
      
      53118f40
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 62cd4c14
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-5.0
      
      
      62cd4c14
    • unknown's avatar
      bug#11133 - ndb write/lock upgrade · 86999f2a
      unknown authored
        fix test case
        improve testing
      
      
      ndb/test/include/HugoOperations.hpp:
        Partial write (only pk)
      ndb/test/ndbapi/testNdbApi.cpp:
        improve testcase
          use writePartial to verify that ops get correctly converted
          (also test negative)
      ndb/test/src/HugoOperations.cpp:
        write partial + improve prinout in wait_async
      86999f2a
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · c4daaa17
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/wl2347
      
      
      c4daaa17
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 73899048
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      73899048
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 848daad7
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/wl2347
      
      
      848daad7
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · a68a2da0
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b11754
      
      
      a68a2da0
    • unknown's avatar
      WL#2347 - Load independent heartbeats · f4b56000
      unknown authored
      Reset missed heartbeat count on receipt of signal from node.
      
      This fixes a bug where that under high network load, the heartbeat packets could be
      delayed, causing the appearance of node failure (due to lost heartbeats).
      
      
      ndb/include/kernel/NodeInfo.hpp:
        Add m_heartbeat_cnt to track missed heartbeats
      ndb/include/transporter/TransporterCallback.hpp:
        add prototype for transporter_recv_from()
        
        Called on receipt from a node.
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Add calls to transporter_receive_from when data is received (before unpack)
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        remove NodeRec::alarmCount. missed heartbeat count now kept in NodeInfo
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Use NodeInfo::m_heartbeat_cnt for missed heartbeat count
      ndb/src/kernel/vm/TransporterCallback.cpp:
        add transporter_recv_from(), which is called on receipt of signals.
        It resets missed heartbeat count for that node.
      ndb/src/ndbapi/ClusterMgr.cpp:
        Use NodeInfo::m_heartbeat_cnt for missed heartbeat count
      ndb/src/ndbapi/ClusterMgr.hpp:
        Use NodeInfo::m_heartbeat_cnt instead of ClusterMgr::Node::hbSent for missed
        heartbeat count.
        
        We now use the same storage for API and Kernel heartbeats.
        
        Add ClusterMgr::hb_received(nodeId) to reset hbSent (as if we received a heartbeat,
        but callable from elsewhere - e.g. when signal received)
      ndb/src/ndbapi/TransporterFacade.cpp:
        Implement transporter_recv_from for ndbapi - which resets hbSent
      ndb/src/ndbapi/TransporterFacade.hpp:
        Add hb_received(nodeId)
      f4b56000
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · 93ab1b50
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        Auto merged
      ndb/tools/restore/restore_main.cpp:
        Auto merged
      93ab1b50
    • unknown's avatar
      bug#11675 - ndb backup · 3ea233d5
      unknown authored
        Fix invalid backup log when using #nodes != 2^x
        Fix ndb_restore --printXXX options
          (among other init counters)
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        remove frag_mask since in 5.0 extra frag bit in in bit 0
      ndb/src/kernel/blocks/backup/Backup.hpp:
        remove frag_mask since in 5.0 extra frag bit in in bit 0
      ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        send "real" frag id to backup
      ndb/tools/restore/Restore.cpp:
        Changed prinout (since it's wrong if you only print stuff)
      ndb/tools/restore/consumer_printer.hpp:
        Init log/data count in printer
      ndb/tools/restore/restore_main.cpp:
        Fix if-statements
          for correct handling of ndb_restore flags
      3ea233d5
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.0 · 112f86a5
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.0/main
      
      
      112f86a5
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 41b8f45c
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
      
      
      41b8f45c
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1.b11754 · f0e62d62
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      strings/ctype-utf8.c:
        Auto merged
      f0e62d62
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · adf5fdcd
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      adf5fdcd
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · d1e96a25
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b11754
      
      
      d1e96a25
    • unknown's avatar
      Merge deer.(none):/home/hf/work/mysql-4.1.clean · f1029fd7
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.clean
      
      
      VC++Files/libmysqld/libmysqld.dsp:
        Auto merged
      f1029fd7
    • unknown's avatar
      merging · afd6b4e8
      unknown authored
      afd6b4e8
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0 · 002a020f
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.0.clean
      
      
      002a020f
    • unknown's avatar
      fix for bug#8692 · 0c17b6ed
      unknown authored
      
      mysql-test/r/sp.result:
        added expected result for bug #8692
      mysql-test/t/sp.test:
        added testcase for bug #8692
      sql/protocol_cursor.cc:
        fixed detecting of null fields: A field contains a null value only 
        if length is NULL_LENGTH
      0c17b6ed