1. 07 Dec, 2006 2 commits
    • unknown's avatar
      Merge shakedown.(none):/home/jpipes/dev/bug20246/my41-bug20246 · d86aaae5
      unknown authored
      into  shakedown.(none):/home/jpipes/dev/bug20246/my50-bug20246
      
      
      include/mysql.h:
        Auto merged
      d86aaae5
    • unknown's avatar
      Fix for Bug #20246 (enum mysql_enum_shutdown_level not well-defined in mysql_com.h) · 9e48e73f
      unknown authored
      MYSQL_VERSION_ID is tested before it has been defined.  This leads to
      a warning when compiling with -Wundef and it also will break the
      internal logic of mysql_com.h as soon as MYSQL_VERSION_ID exceeds
      50000.
      
      The fix entailed a simple re-ordering of included files in mysql.h
      
      
      include/mysql.h:
        Fix for Bug #20246 (enum mysql_enum_shutdown_level not well-defined in mysql_com.h)
        
        MYSQL_VERSION_ID is tested before it has been defined.  This leads to
        a warning when compiling with -Wundef and it also will break the
        internal logic of mysql_com.h as soon as MYSQL_VERSION_ID exceeds
        50000.
        
        Placed the #include for mysql_version.h above mysql_com.h to resolve conflict
      9e48e73f
  2. 05 Dec, 2006 7 commits
  3. 04 Dec, 2006 13 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · cd38313c
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      Makefile.am:
        Auto merged
      client/mysqltest.c:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      cd38313c
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 2e5a6f9e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      Docs/Makefile.am:
        Auto merged
      Makefile.am:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/Makefile.am:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      mysql-test/lib/mtr_io.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      extra/yassl/taocrypt/include/algebra.hpp:
        Manual merge with import of upstream yaSSL
      2e5a6f9e
    • unknown's avatar
      mysqltest · 9f1fa169
      unknown authored
      Close any statements that might be open before program exit
      Close any statments that might be open when calling "disable_ps_protocol"
      
      
      client/mysqltest.c:
        Close any statements that might be open before program exit
        Close any statments that might be open when calling "disable_ps_protocol"
      9f1fa169
    • unknown's avatar
      mysql-test-run.pl: Append .nlm to the binary name on NetWare · 7200e2e7
      unknown authored
      
      mysql-test/lib/mtr_misc.pl:
        Append .nlm to the binary name on NetWare
      7200e2e7
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 11c27cf6
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      11c27cf6
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · c0612e45
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      Makefile.am:
        Auto merged
      client/mysqltest.c:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      c0612e45
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · 33fc8d50
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      33fc8d50
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my50-bug17951 · a031e503
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
      
      
      myisam/myisampack.c:
        Auto merged
      a031e503
    • unknown's avatar
      Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt · 85b1701a
      unknown authored
      into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0
      
      
      sql/item_func.cc:
        Auto merged
      85b1701a
    • unknown's avatar
      Bug#24389 mysqltest: Could not open connection 'default': 2013 Lost connection to MySQL · d2f1fd79
      unknown authored
       - Add CR_CONN_HOST_ERROR to list of errorcode that trigger another connection
         attempt in mysqltest
      
      
      client/mysqltest.c:
        Add CR_CONN_HOST_ERROR to errorcodes that trigger a reconnect
      d2f1fd79
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6b603221
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
      
      
      ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      6b603221
    • unknown's avatar
      type_varchar.result: · 818bec7f
      unknown authored
        fixed a valgrind problem
      
      
      mysql-test/r/type_varchar.result:
        fixed a valgrind problem
      818bec7f
    • unknown's avatar
      item_func.cc: · 63b2be3c
      unknown authored
         fixed a valgrind warning
      type_varchar.test:
        fixed a valgrind warning
      
      
      mysql-test/t/type_varchar.test:
        fixed a valgrind warning
      sql/item_func.cc:
         fixed a valgrind warning
      63b2be3c
  4. 02 Dec, 2006 2 commits
    • unknown's avatar
      mysql_install_db.sh: · 1172c8ae
      unknown authored
        If --srcdir and --windows is given, check if error message file
        is in source or build tree (bug#24557)
      Makefile.am:
        Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
      mysql_install_db.sh:
        Added --srcdir=DIR option, used from top Makefile.am in dist-hook
        target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
      Makefile.am:
        Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
        the source and build tree.
        Call "mysql_install_db" with new option --srcdir, to enable the script
        to find all that is needed, if source and build directory is not the same
        (bug#24557)
      
      
      scripts/mysql_install_db.sh:
        If --srcdir and --windows is given, check if error message file
        is in source or build tree (bug#24557)
      Makefile.am:
        Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
        the source and build tree.
        Call "mysql_install_db" with new option --srcdir, to enable the script
        to find all that is needed, if source and build directory is not the same
        (bug#24557)
      include/Makefile.am:
        Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
      1172c8ae
    • unknown's avatar
      Makefile.am: · ca35cae7
      unknown authored
        Added "mysql_client_test.def"
      mysql_client_test.def:
        BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
      
      
      netware/mysql_client_test.def:
        BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
      netware/Makefile.am:
        Added "mysql_client_test.def"
      ca35cae7
  5. 01 Dec, 2006 16 commits
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 65da49e6
      unknown authored
      into  example.com:/work/bug24395-v2/my50
      
      
      myisam/mi_open.c:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      65da49e6
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/mysql-4.1-build · 9243f624
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.0-build
      
      
      9243f624
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 6b9d3ccb
      unknown authored
      into  example.com:/work/bug24395-v2/my41
      
      
      myisam/mi_open.c:
        Auto merged
      6b9d3ccb
    • unknown's avatar
      mysql_upgrade.def Makefile.am: · d2eabe30
      unknown authored
        Added new "mysql_upgrade.def" for Netware (bug#23504)
      *.def:
        Allocate 128K stack for all executables (bug#23504)
      
      
      netware/comp_err.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/isamchk.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/isamlog.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/libmysql.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/my_print_defaults.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisam_ftdump.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisamchk.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisamlog.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/myisampack.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_install_db.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_test_run.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_waitpid.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqladmin.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlbinlog.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlcheck.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqld.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqld_safe.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqldump.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlimport.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqlshow.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysqltest.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/pack_isam.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/perror.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/replace.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/resolve_stack_dump.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/resolveip.def:
        Allocate 128K stack for all executables (bug#23504)
      netware/mysql_upgrade.def:
        BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_upgrade.def
      netware/Makefile.am:
        Added "mysql_upgrade.def"
      d2eabe30
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043 · 48595c28
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      mysql-test/t/rpl_sp.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      mysql-test/r/rpl_sp.result:
        - Merged
      48595c28
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 7d3bf44e
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      7d3bf44e
    • unknown's avatar
      ndb - bug#24752 · f8c69117
      unknown authored
        This prevent any subsequent node restarts, but it's better than crashing an alive node
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Fix for bug#24752
        This prevent any subsequent node restarts, but it's better than crashing an alive node
      f8c69117
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel · c06f995b
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
      
      
      client/mysqltest.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      c06f995b
    • unknown's avatar
      Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS" · 2f0b1d65
      unknown authored
      - Refactoring of duplicate code
      - Modified bad test cases
      - Changed expected error when operating on information_schema.
      
      
      mysql-test/r/information_schema.result:
        - updated result file with new error code.
      mysql-test/r/rpl_sp.result:
        - Modified test case
      mysql-test/t/information_schema.test:
        - Changed error code for operations on information_schema
      mysql-test/t/rpl_sp.test:
        - Modified test case
      sql/sql_parse.cc:
        - Cleaned up code:
          * replace tab with space
          * simplified if/switch statements
          * refactored duplicated code
      2f0b1d65
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 8e56426c
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/vm/SimulatedBlock.cpp:
        Auto merged
      ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      8e56426c
    • unknown's avatar
      ndb - bug#24748 · a29f5276
      unknown authored
        Skip rollback if only committedRead in transaction
      
      
      ndb/src/ndbapi/NdbTransaction.cpp:
        Skip rollback if only committedRead in transaction
      a29f5276
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0184996b
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
      
      
      0184996b
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 114197b5
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
      
      
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      114197b5
    • unknown's avatar
      ndb - · 61c5b80e
      unknown authored
        add testcase for bug#24717
       + fix typo
      
      
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Add new error insert 9002
          which is 9000, but will auto enable when started
      ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
        Add new error insert 9002
          which is 9000, but will auto enable when started
      ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
        Fix typo
      ndb/test/ndbapi/testNodeRestart.cpp:
        add testcase for bug#24717
      ndb/test/run-test/daily-basic-tests.txt:
        add testcase for bug#24717
      61c5b80e
    • unknown's avatar
      ndb - bug#24717 · cc00d542
      unknown authored
        5.0 version
        Add some extra state to try to prevent sending committedread to node too early
      
      
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        remove extra virtual-indirection
      ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
        remove extra virtual-indirection
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        remove extra virtual-indirection
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Add retry mechanism to send TCKEYREF
          (as extra safety)
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Add retry mechanism to send TCKEYREF
          (as extra safety)
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Add extra state to prevent sending committed reads to node to early
          (before connection establishment)
      ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
        Add extra state to prevent sending committed reads to node to early
          (before connection establishment)
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Add extra state to prevent sending committed reads to node to early
          (before connection establishment)
      ndb/src/kernel/vm/SimulatedBlock.cpp:
        remove extra virtual-indirection
      ndb/src/kernel/vm/SimulatedBlock.hpp:
        remove extra virtual-indirection
      cc00d542
    • unknown's avatar
      Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj · 8e0f8a62
      unknown authored
      into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb
      
      
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      8e0f8a62