1. 16 Dec, 2004 6 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 93f82e8e
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      
      93f82e8e
    • unknown's avatar
      A change of behaviour of Seconds_Behind_Master from SHOW SLAVE STATUS. It's going into 4.1 · 4869f022
      unknown authored
      because old behaviour was somewhat nonsensical (kind of bug). Changes are that if repl threads are
      down or disconnected the column will be NULL, and if master is idle the column will not grow indefinitely anymore.
      
      
      sql/slave.cc:
        mi->slave_running and rli->slave_running now uints (was needed only for mi but because of start_slave_thread() usage,
        had to change both).
        So mi->slave_running can now take 3 values: not running, running & not connected, running and connected.
        The last value serves for calculation of Seconds_Behind_Master in SHOW SLAVE STATUS.
        Changing this column's behaviour: if SQL or I/O thread is not running, or if I/O thread is not connected
        (for example if it is reconnecting), it's NULL (to mean "unknown"). And if master is idle, the column will
        not grow indefinitely like it used to (that was meaningless); this is fixed by forcing a value of 0
        when the slave SQL thread has hit EOF of relay log (which has only a limited number of caveats explained
        in comments in code).
      sql/slave.h:
        slave_running used to be bool but we need to distinguish, for the I/O slave thread, between 
        "running & connected" and "running & not connected" ("running" means the thread exists).
      sql/sql_repl.cc:
        we don't need anymore to set rli->last_master_timestamp to 0 (we used that to make Seconds_Behind_Master
        be NULL) in RESET SLAVE and CHANGE MASTER, as these commands imply that slave threads are not running
        and so Seconds_Behind_Master is already NULL because of that.
      4869f022
    • unknown's avatar
      Test for BUG#6054. The bug itsel is fixed by the fix for #5837. · ae6f147a
      unknown authored
      
      mysql-test/r/update.result:
        test result
      mysql-test/t/update.test:
        test queries
      ae6f147a
    • unknown's avatar
      Making 4.1 tree compile with -ansi -pedantic · bfa45f2f
      unknown authored
      
      include/raid.h:
        Fixing compile-time warning: pragma interface is not supported in C,
        let's move it to C++ part of the header.
      ndb/include/kernel/signaldata/CreateEvnt.hpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/include/kernel/signaldata/PackedSignal.hpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/include/kernel/signaldata/SumaImpl.hpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/common/debugger/signaldata/NFCompleteRep.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/common/logger/FileLogHandler.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/backup/BackupInit.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/grep/GrepInit.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/ndbfs/VoidFs.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/suma/Suma.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/suma/SumaInit.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/kernel/blocks/trix/Trix.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/ndbapi/NdbEventOperation.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/src/ndbapi/NdbScanFilter.cpp:
        - remove extra erroneous ; from ends of function definitions
      ndb/tools/restore/Restore.cpp:
        - remove extra erroneous ; from ends of function definitions
      sql/item_create.h:
        - remove extra erroneous ;
      sql/sql_cache.cc:
        - remove extra erroneous ;
      tests/client_test.c:
        - fix -pedantic warning
      bfa45f2f
    • unknown's avatar
    • unknown's avatar
      - bumped up version number in configure.in from 4.1.8 to 4.1.9 · 1fa33736
      unknown authored
      - tagged ChangeSet 1.2173 as "mysql-4.1.8"
      
      
      configure.in:
        - bumped up version number from 4.1.8 to 4.1.9
      1fa33736
  2. 15 Dec, 2004 1 commit
  3. 14 Dec, 2004 17 commits
    • unknown's avatar
      A fix of return value of mysql_stmt_bind_result() and cleanup. · 83fce55a
      unknown authored
      
      include/errmsg.h:
        New libmysql error status code CR_NO_STMT_METADATA
      libmysql/errmsg.c:
        Error message for CR_STMT_NO_METADATA.
        Adding an empty line to shorten further diffs when new error
        messages are added (as suggested by Monty).
      libmysql/libmysql.c:
        Return error from mysql_stmt_bind_result() if the statement contains
        no metadata.
        A few comments fixed.
      tests/client_test.c:
        Tests fixed: mysql_stmt_bind_result now returns error if there is no
        metadata.
      83fce55a
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d9b62f82
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1
      
      
      d9b62f82
    • unknown's avatar
      Clean-up. · e938cfce
      unknown authored
      TYPE=MyISAM replaced with ENGINE=MyISAM.
      
      
      e938cfce
    • unknown's avatar
      corrected mysqltest.dsp · 820d68d9
      unknown authored
      corrected mysql_test_run_new.dsp
      added dependency
      corrected path of mysql_test_run_new.dsp
      fixed wrong code
      added my_create_tables.c
      removed command_line
      fixed #elif
      restored NAME_MAX and MAX_FNAME
      added create_system_files()
      added compare() for windows
      added all files of testes in script
      added mysql-test in script
      
      
      BitKeeper/etc/ignore:
        Added mysql-4.1.8-win-src.zip to the ignore list
      VC++Files/client/mysqltest.dsp:
        corrected dsp file
      VC++Files/mysql-test/mysql_test_run_new.dsp:
        corrected mysql_test_run_new.dsp
      VC++Files/mysql.dsw:
        added dependency
        corrected path of mysql_test_run_new.dsp
      client/mysqltest.c:
        fixed wrong code
      mysql-test/Makefile.am:
        added my_create_tables.c
      mysql-test/my_manage.c:
        removed command_line
        fixed #elif
      mysql-test/my_manage.h:
        restored NAME_MAX and MAX_FNAME
      mysql-test/mysql_test_run_new.c:
        added create_system_files()
        added compare for windows
      scripts/make_win_src_distribution.sh:
        added all files of testes
        added mysql-test
      820d68d9
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a88f6fda
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1
      
      
      sql/item.h:
        Auto merged
      a88f6fda
    • unknown's avatar
      bug#6275 "client_test" fail in 4.1.7 make test · cef35aeb
      unknown authored
      bug#6911 resultset metadata always return client character set
      
      
      cef35aeb
    • unknown's avatar
      A quick fix for bug #7257: Crash in default tests: 'subselect' · 54745a18
      unknown authored
      
      sql/item.h:
        A quick fix for bug #7257: Crash in default tests: 'subselect'
        We have to pass &item instead of &store to the Item_ref_null_helper() 
        then set ref.
      54745a18
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8eea1710
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1
      
      
      8eea1710
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e0527832
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      
      e0527832
    • unknown's avatar
      mysql-test-run.sh: · 16de8531
      unknown authored
        removed diskless option for ndb test
      
      
      mysql-test/mysql-test-run.sh:
        removed diskless option for ndb test
      16de8531
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 46afb3fb
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1
      
      
      46afb3fb
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3606df23
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-merge-fix
      
      
      3606df23
    • unknown's avatar
      Bug#7242 · 17d1552b
      unknown authored
      The "insert_update" causes a server crash when using prepared statements
      
      Must clear table->insert_values after completing every prepared statement
      
      
      17d1552b
    • unknown's avatar
      Test for BUG#7242: Testing prepare + several times execute · 379fe351
      unknown authored
      (here in client_test.c because we need to check if several PS execution works and the bug shows up with binary protocol only ) 
      
      
      tests/client_test.c:
        Test for BUG#7242: Testing prepare + several times execute
      379fe351
    • unknown's avatar
      Portability fix (bug #7203: "delayed" test fails on QNX when using prepared statements) · 00d9273a
      unknown authored
      
      
      mysql-test/t/delayed.test:
        Portability fix (bug #7203: "delayed" test fails on QNX when using prepared statements)
        1 is not enough delay for QNX.
      00d9273a
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · e19a3042
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-merge-fix
      
      
      e19a3042
    • unknown's avatar
      * Added comments and one assert · 8322eb0a
      unknown authored
       * Backport of safety measures from 5.0: make numeorous replaces:
          s/item->fix_fields()/if (!item->fixed) item->fix_fields()
      
      
      sql/item.cc:
         * More comments
         * Backport of safety measures from 5.0: make numeorous replaces:
            s/item->fix_fields()/if (!item->fixed) item->fix_fields()
      sql/item.h:
        Assert added
      sql/item_cmpfunc.cc:
        Backport of safety measures from 5.0: make numeorous replaces:
          s/item->fix_fields()/if (!item->fixed) item->fix_fields()
      sql/item_func.cc:
        Backport of safety measures from 5.0: make numeorous replaces:
          s/item->fix_fields()/if (!item->fixed) item->fix_fields()
      sql/item_strfunc.h:
        Backport of safety measures from 5.0: make numeorous replaces:
          s/item->fix_fields()/if (!item->fixed) item->fix_fields()
      sql/item_subselect.cc:
        Backport of safety measures from 5.0: make numeorous replaces:
          s/item->fix_fields()/if (!item->fixed) item->fix_fields()
      sql/item_sum.cc:
        Backport of safety measures from 5.0: make numeorous replaces:
          s/item->fix_fields()/if (!item->fixed) item->fix_fields()
      sql/set_var.cc:
        Backport of safety measures from 5.0: make numeorous replaces:
          s/item->fix_fields()/if (!item->fixed) item->fix_fields()
      sql/sql_base.cc:
        Backport of safety measures from 5.0: make numeorous replaces:
          s/item->fix_fields()/if (!item->fixed) item->fix_fields()
      sql/sql_handler.cc:
        Backport of safety measures from 5.0: make numeorous replaces:
          s/item->fix_fields()/if (!item->fixed) item->fix_fields()
      sql/sql_help.cc:
        Backport of safety measures from 5.0: make numeorous replaces:
          s/item->fix_fields()/if (!item->fixed) item->fix_fields()
      sql/sql_select.cc:
        Backport of safety measures from 5.0: make numeorous replaces:
          s/item->fix_fields()/if (!item->fixed) item->fix_fields()
      8322eb0a
  4. 13 Dec, 2004 16 commits
    • unknown's avatar
      Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8bfe7550
      unknown authored
      into mysql.com:/home/jwinstead2/mysql-4.1
      
      
      8bfe7550
    • unknown's avatar
      Merge of fix for BUG#6976 continued: pulling in some Item_ref changes from 5.0 · 0e486852
      unknown authored
       * Added Item_ref::set_properties 
       * Item_ref::Item_ref now expects to get in *item either
           NULL - then fix_fields() will be called later  or 
           ptr to Item it will refer to - then an equivalent of fix_fields() call is performed
      
      
      sql/item.cc:
        Merge of fix for BUG#6976 continued: pulling in some Item_ref changes from 5.0
         * Added Item_ref::set_properties 
         * Adjusted Item_ref::Item_ref calls to match new calling convention
      sql/item.h:
        Merge of fix for BUG#6976 continued: pulling in some Item_ref changes from 5.0
         * Added Item_ref::set_properties 
         * Item_ref::Item_ref now expects to get in *item either
             NULL - then fix_fields() will be called later or
             ptr to Item it will refer to - then an equivalent of fix_fields() call is performed
      sql/item_cmpfunc.cc:
        Merge of fix for BUG#6976 continued: pulling in some Item_ref changes from 5.0
         * Adjusted Item_ref::Item_ref calls to match new calling convention
      sql/item_func.cc:
        Merge of fix for BUG#6976 continued: pulling in some Item_ref changes from 5.0
         * Added Item_ref::set_properties 
         * Adjusted Item_ref::Item_ref calls to match new calling convention
      sql/item_row.cc:
        Merge of fix for BUG#6976 continued: pulling in some Item_ref changes from 5.0
         * Added Item_ref::set_properties 
         * Adjusted Item_ref::Item_ref calls to match new calling convention
      sql/item_strfunc.cc:
        Merge of fix for BUG#6976 continued: pulling in some Item_ref changes from 5.0
         * Added Item_ref::set_properties 
         * Adjusted Item_ref::Item_ref calls to match new calling convention
      0e486852
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 730e2722
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      
      730e2722
    • unknown's avatar
      - a fix for the fix - now "make test" will run the test suite with and · 01e2c3f0
      unknown authored
        without the PS protocol
      
      
      01e2c3f0
    • unknown's avatar
      Makefile.am: · 844c6e34
      unknown authored
        s/spaces/TAB/
      
      
      Makefile.am:
        s/spaces/TAB/
      844c6e34
    • unknown's avatar
      Makefile.am: · 6dad5515
      unknown authored
        Add running of test suite with --ps-protocol to 'test' target
      
      
      Makefile.am:
        Add running of test suite with --ps-protocol to 'test' target
      6dad5515
    • unknown's avatar
      Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1 · 317d3dc2
      unknown authored
      into mysql.com:/home/jwinstead2/mysql-4.1
      
      
      317d3dc2
    • unknown's avatar
      Merge mysql.com:/dbdata/psergey/mysql-4.0-bug6976 · 8566aab0
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-merge
      
      
      innobase/dict/dict0load.c:
        SCCS merged
      8566aab0
    • unknown's avatar
      Merged fixes for BUG#6976 and BUG#7079 · 06cbb73f
      unknown authored
      06cbb73f
    • unknown's avatar
      Merged (will need a post-merge fix) · 75a43405
      unknown authored
      
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      75a43405
    • unknown's avatar
      Merging fix for BUG#6976 from 4.0 to 4.1 · 6d7fe852
      unknown authored
      The problem in 4.1 was the same as in 4.0 - fix_fields() not called for created Item_ref. 
      The fix is similar too - initialize Item_refs in ctor (but don't interfere with cases when 
      Item_ref is used by subselects). 
      
      
      sql/item.cc:
        Fix for BUG#6976 ported from 4.0
      sql/item_cmpfunc.cc:
        Fix for BUG#6976 ported from 4.0
      sql/item_func.cc:
        Fix for BUG#6976 ported from 4.0
      sql/item_row.cc:
        Fix for BUG#6976 ported from 4.0
      sql/item_strfunc.cc:
        Fix for BUG#6976 ported from 4.0
      6d7fe852
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · e64e4eb2
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      
      sql/mysqld.cc:
        Auto merged
      e64e4eb2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c9a0e4ad
      unknown authored
      into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl2274.2
      
      
      c9a0e4ad
    • unknown's avatar
      36c7c702
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c04900be
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      
      c04900be
    • unknown's avatar
      BackupInit.cpp: · f61f828c
      unknown authored
        quick fix for wrong allocation of size
      
      
      ndb/src/kernel/blocks/backup/BackupInit.cpp:
        quick fix for wrong allocation of size
      f61f828c