1. 14 Dec, 2004 7 commits
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e6cb22f1
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1
      
      e6cb22f1
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7befaf32
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-merge-fix
      
      7befaf32
    • unknown's avatar
      Bug#7242 · d0caf71a
      unknown authored
      The "insert_update" causes a server crash when using prepared statements
      
      Must clear table->insert_values after completing every prepared statement
      
      d0caf71a
    • unknown's avatar
      Test for BUG#7242: Testing prepare + several times execute · 06fc7b5c
      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
      06fc7b5c
    • unknown's avatar
      Portability fix (bug #7203: "delayed" test fails on QNX when using prepared statements) · 1910ee8c
      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.
      1910ee8c
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 677f2a1a
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-merge-fix
      
      677f2a1a
    • unknown's avatar
      * Added comments and one assert · 0e5537ec
      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()
      0e5537ec
  2. 13 Dec, 2004 28 commits
    • unknown's avatar
      Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3191d2fa
      unknown authored
      into mysql.com:/home/jwinstead2/mysql-4.1
      
      3191d2fa
    • unknown's avatar
      Merge of fix for BUG#6976 continued: pulling in some Item_ref changes from 5.0 · b650644b
      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
      b650644b
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8ad9752e
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      8ad9752e
    • unknown's avatar
      - a fix for the fix - now "make test" will run the test suite with and · e022ec1e
      unknown authored
        without the PS protocol
      
      e022ec1e
    • unknown's avatar
      Makefile.am: · eb4adc58
      unknown authored
        s/spaces/TAB/
      
      
      Makefile.am:
        s/spaces/TAB/
      eb4adc58
    • unknown's avatar
      Makefile.am: · 7b84c0c9
      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
      7b84c0c9
    • unknown's avatar
      Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1 · c6f69fa5
      unknown authored
      into mysql.com:/home/jwinstead2/mysql-4.1
      
      c6f69fa5
    • unknown's avatar
      Merge mysql.com:/dbdata/psergey/mysql-4.0-bug6976 · 7797fa65
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-merge
      
      
      innobase/dict/dict0load.c:
        SCCS merged
      7797fa65
    • unknown's avatar
      Merged fixes for BUG#6976 and BUG#7079 · dff44a02
      unknown authored
      dff44a02
    • unknown's avatar
      Merged (will need a post-merge fix) · 2bd5c53c
      unknown authored
      
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      2bd5c53c
    • unknown's avatar
      Merging fix for BUG#6976 from 4.0 to 4.1 · 74a8fdd9
      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
      74a8fdd9
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · d882df9b
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      
      sql/mysqld.cc:
        Auto merged
      d882df9b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · ce8b0879
      unknown authored
      into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl2274.2
      
      ce8b0879
    • unknown's avatar
      d21e2bc7
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 47e8b0ff
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      47e8b0ff
    • unknown's avatar
      BackupInit.cpp: · 68df5f8a
      unknown authored
        quick fix for wrong allocation of size
      
      
      ndb/src/kernel/blocks/backup/BackupInit.cpp:
        quick fix for wrong allocation of size
      68df5f8a
    • unknown's avatar
      Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b77203c6
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
      
      b77203c6
    • unknown's avatar
      comment of class edded · 66d62b1f
      unknown authored
      66d62b1f
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 372afe94
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      372afe94
    • unknown's avatar
      changed back to just restricting max meta objects in dict to make sure we can... · 0422bd53
      unknown authored
      changed back to just restricting max meta objects in dict to make sure we can "always" configure ourselves out of unforseen limits
      
      
      ndb/src/kernel/vm/Configuration.cpp:
        changed back to just restricting mac meta objects in dict to make sure we can "always" confiure ourselves out of unforseen limits
      0422bd53
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 81de1743
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-ref-4.1
      
      81de1743
    • unknown's avatar
      fa05f5eb
    • unknown's avatar
      fixed event thread for better error handling · ae0a3a74
      unknown authored
      ae0a3a74
    • unknown's avatar
      WL#2274 - INSERT..SELECT..UPDATE · 333389be
      unknown authored
        UPDATE clause conflicts with SELECT for use of item_list field.
        Alter UPDATE clause to use new lex field update_list
        Tests included
      
      
      mysql-test/r/insert_update.result:
        WL#2274
          New tests for INSERT..SELECT..UPDATE
      mysql-test/t/insert_update.test:
        WL#2274
          New tests for INSERT..SELECT..UPDATE
      sql/mysql_priv.h:
        Remove function - insert_select_precheck()
      sql/sql_class.h:
        WL#2274
          New constructor for class select_insert
      sql/sql_insert.cc:
        WL#2274
          Move code into mysql_prepare_insert
          Add checks as param values may be NULL
      sql/sql_lex.cc:
        WL#2274
          initialize lex->update_list
      sql/sql_lex.h:
        WL#2274
          New field in LEX: update_list
      sql/sql_parse.cc:
        WL#2274
          INSERT..UPDATE clause now populates lex->update_list
          Remove redundant function: insert_select_precheck()
      sql/sql_prepare.cc:
        WL#2274
          invoke insert_precheck() instead of insert_select_precheck()
      sql/sql_yacc.yy:
        WL#2274
          Enable INSERT..SELECT..UPDATE syntax
          New rule - insert_update_list, to populate lex->update_list
      333389be
    • unknown's avatar
      Some fixes for Netware. · 9df11516
      unknown authored
      9df11516
    • unknown's avatar
      bug #7230 · b2dc49a8
      unknown authored
      + fixed testcase
      
      
      mysql-test/ndb/basic.result:
        fixed testcase
      ndb/include/debugger/EventLogger.hpp:
        bug #7230
      b2dc49a8
    • unknown's avatar
      dict0load.c: · e1dade19
      unknown authored
        dict_load_table(): detect the new table format of MySQL 5.0.3
      
      
      innobase/dict/dict0load.c:
        dict_load_table(): detect the new table format of MySQL 5.0.3
      e1dade19
    • unknown's avatar
      initialize variables (addition for BUG#7079) · 344e9855
      unknown authored
      
      sql/item.cc:
        initialize variables
      344e9855
  3. 12 Dec, 2004 5 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6adb53ea
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      6adb53ea
    • unknown's avatar
      CommandInterpreter.cpp: · 580867c2
      unknown authored
        changed help text
      
      
      ndb/src/mgmclient/CommandInterpreter.cpp:
        changed help text
      580867c2
    • unknown's avatar
      fix bug#7193 · f8b6b3c6
      unknown authored
          added start backup parameter to enable setting wait state
          and set different timeouts depending on waitstate
          moved listen of backup event out of backup and into separete thread
          thread created at connect() and destroyed at disconnect()
          added start backup command options "nowait" "wait completed" "wait started"
          fixed log level settings
      
      
      ndb/include/mgmapi/mgmapi.h:
        added start backup parameter to enable setting wait state
      ndb/src/common/debugger/EventLogger.cpp:
        changed to unsigned printout
      ndb/src/mgmapi/mgmapi.cpp:
        added start backup parameter to enable setting wait state,
        and set different timeouts depending on waitstate
      ndb/src/mgmclient/CommandInterpreter.cpp:
        moved listen of backup event out of backup and into separete thread
        thread created at connect() and destroyed at disconnect()
        added start backup command options "nowait" "wait completed" "wait started"
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        added more options to start backup to set wait state
        + set timeout depending on wait state
        + some debug printouts
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        added more options to start backup to set wait state
      ndb/src/mgmsrv/Services.cpp:
        removed old backup code
        added use of stard backup otions
        fixed log level settings
      ndb/test/src/NdbBackup.cpp:
        adopted to new wait state option in start backup
      f8b6b3c6
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 670dfb2e
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-ref-4.1
      
      670dfb2e
    • unknown's avatar
      fixed optimized SOME subquery · a7964606
      unknown authored
      
      mysql-test/r/subselect.result:
        correct results of SOME subquery
      sql/item_cmpfunc.cc:
        some comments added
        fixed optimized SOME subquery
      a7964606