1. 03 Oct, 2005 6 commits
    • unknown's avatar
      Bug #13197 NDB needs better error message for not enough memory. · a1f9ec01
      unknown authored
      - added 2 new error codes for out of data and index memory during SR
      
      + removed c++ style comments from c file
      
      
      ndb/include/mgmapi/ndbd_exit_codes.h:
        Bug #13197  	NDB needs better error message for not enough memory.
        - added 2 new error codes for out of data and index memory during SR
      ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
        Bug #13197  	NDB needs better error message for not enough memory.
        - added 2 new error codes for out of data and index memory during SR
      ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
        Bug #13197  	NDB needs better error message for not enough memory.
        - added 2 new error codes for out of data and index memory during SR
      a1f9ec01
    • unknown's avatar
      added structured ndbd exit codes · b1d8aa67
      unknown authored
      
      BitKeeper/deleted/.del-ErrorMessages.hpp~9ab815d55a13433a:
        Delete: ndb/src/kernel/error/ErrorMessages.hpp
      config/ac-macros/ha_ndbcluster.m4:
        add ndb mgmapi to ndbcluster_includes
      extra/perror.c:
        perror to print also ndbd exit codes
      ndb/include/Makefile.am:
        added new ndbd exit code include file to src distribution
      ndb/include/kernel/signaldata/EventReport.hpp:
        backported from 5.1, included node id in event report signal
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        backported from 5.1, included node id in event report signal
      b1d8aa67
    • unknown's avatar
      Fix -ansi -pedantic compilation failure. · 257eddcb
      unknown authored
      257eddcb
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · b2ee385f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
      
      
      b2ee385f
    • unknown's avatar
      ndb - mysql-test-run ndb_config · eaeb04a7
      unknown authored
        Fix 32/64 bit insecure code 
      
      
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Fix 32/64 bit insecure/useless code
      eaeb04a7
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · b912aff8
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
      
      
      b912aff8
  2. 30 Sep, 2005 34 commits
    • unknown's avatar
      Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 · 05df35e3
      unknown authored
      into mysql.com:/Users/eric/dev/hton-mysql-5.0
      
      
      05df35e3
    • unknown's avatar
      Move handler specific options into handlerton flag check · d553b667
      unknown authored
      BUG#13108
      
      
      mysql-test/r/federated.result:
        added test results for federated alter table
      mysql-test/t/federated.test:
        added test for federated alter table
      sql/examples/ha_example.cc:
        supports table re-creation
      sql/examples/ha_tina.cc:
        supports table re-creation
      sql/ha_blackhole.cc:
        supports table re-creation
      sql/ha_federated.cc:
        added flag for not supporting alter
      sql/ha_heap.cc:
        supports table recreation
      sql/ha_myisam.cc:
        supports table recreation
      sql/ha_myisammrg.cc:
        supports table re-creation
      sql/handler.cc:
        implemented flag check function
      sql/handler.h:
        added additional handlerton flags
        created a function to test flags
        replace ha_supports_generate macro with call to flag check
      sql/sql_delete.cc:
        replaced ha_supports_generate with handlerton flag check
      sql/sql_table.cc:
        added check for handlerton check for alter support
      d553b667
    • unknown's avatar
      WL#2789 "Instance Manager: test using mysql-test-run testing framework" · 43c8f453
      unknown authored
      Add Instance Manager tests.
      
      
      mysql-test/include/im_check_os.inc:
        Currently Instance Manager tests are known to work only on UNIX platform.
        This header file is included in each IM-test in order to skip the test
        on Windows.
      mysql-test/r/im_daemon_life_cycle.result:
        Results file for Instance Manager daemon test.
      mysql-test/r/im_life_cycle.result:
        Results file for Instance Manager life cycle test.
      mysql-test/r/im_options_set.result:
        Results file for Instance Manager SET statement test.
      mysql-test/r/im_options_unset.result:
        Results file for Instance Manager UNSET statement test.
      mysql-test/r/im_utils.result:
        Results file for Instance Manager utils test.
      mysql-test/t/im_daemon_life_cycle-im.opt:
        Options file for Instance Manager daemon test.
      mysql-test/t/im_daemon_life_cycle.imtest:
        Instance Manager daemon test (mysqltestrun-part).
      mysql-test/t/im_life_cycle.imtest:
        Instance Manager life cycle test.
      mysql-test/t/im_options_set.imtest:
        Instance Manager SET statement test.
      mysql-test/t/im_options_unset.imtest:
        Instance Manager UNSET statement test.
      mysql-test/t/im_utils.imtest:
        Instance Manager utils test.
      mysql-test/t/kill_n_check.sh:
        The helper script. Its main idea is to kill some process and
        check that the process will (or will not) be restarted.
      43c8f453
    • unknown's avatar
      WL#2789 "Instance Manager: test using mysql-test-run testing framework" · 46d8163b
      unknown authored
      1) Add support to testing Instance Manager in daemon mode;
      2) Don't run Instance Manager tests when running with --ps-protocol option;
      
      
      mysql-test/lib/mtr_cases.pl:
        WL#2789 "Instance Manager: test using mysql-test-run testing framework"
        Skip/disable Instance Manager tests in the following cases:
          - we are testing embedded server;
          - we are running with --ps-protocol;
          - Instance Manager executable does not exist;
        Report about the reason in the standard way.
      mysql-test/lib/mtr_process.pl:
        WL#2789 "Instance Manager: test using mysql-test-run testing framework"
        Make several attempts (i.e. send several signals to process) while trying to kill it.
      mysql-test/mysql-test-run.pl:
        WL#2789 "Instance Manager: test using mysql-test-run testing framework"
        Add support for testing Instance Manager in daemon mode.
      46d8163b
    • unknown's avatar
      Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13629 · eeae3fc3
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-merges
      
      
      eeae3fc3
    • unknown's avatar
      Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release · 246bd8ca
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg13629
      
      
      246bd8ca
    • unknown's avatar
      Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7d3c939e
      unknown authored
      into  mysql.com:/home/hartmut/projects/mysql/dev/5.0
      
      
      ndb/tools/ndb_config.cpp:
        Auto merged
      7d3c939e
    • unknown's avatar
      CygWin build fix (Bug #13640) · 0585fcbe
      unknown authored
      0585fcbe
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c3d473ab
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      c3d473ab
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 39ba8376
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-bug-13597
      
      
      39ba8376
    • unknown's avatar
      Fix for bug #13629 "view test crashes for debug build" (also includes better · 9b7e4a2a
      unknown authored
      fix for bug #13451 "view test produces warning about unfreed memory").
      
      
      sql/sql_view.cc:
        mysql_rename_view():
          Intead of doing full-blown opening of view and then doing extensive cleanup
          of its and main LEXes afterwards, let us just read and parse its .FRM file.
      9b7e4a2a
    • unknown's avatar
      Merge hundin.mysql.fi:/home/marko/mysql-4.1 · ff2f28d9
      unknown authored
      into  hundin.mysql.fi:/home/marko/mysql-5.0-bk
      
      
      sql/ha_innodb.cc:
        Ignore 4.1 specific change.
      ff2f28d9
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · b21b0b2a
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      b21b0b2a
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 972da434
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
      
      
      include/my_sys.h:
        Auto merged
      972da434
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4dd48359
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
      
      
      4dd48359
    • unknown's avatar
      InnoDB: After review fix · afed50ae
      unknown authored
      
      sql/ha_innodb.cc:
        Avoid bitwise arithmetics, as it might be difficult to read.  The
        added readability costs one register and two instructions on x86.
      afed50ae
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 936a6905
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/t/mysqldump.test:
        Auto merged
      936a6905
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1d31ee29
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      1d31ee29
    • unknown's avatar
      ndb - · 937de41a
      unknown authored
        Fix compile error with gcc296
      
      
      ndb/src/common/util/SimpleProperties.cpp:
        Fix compile error with gcc296
      937de41a
    • unknown's avatar
      Raise the version. · d04eb651
      unknown authored
      d04eb651
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5f5fc659
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      5f5fc659
    • unknown's avatar
      Fix for Bug#12629, "mysqld_multi produces syntax error". · d1538465
      unknown authored
      Quote here is unneccessary as it should all be handled in
      quote_opt_arg().
      
      
      d1538465
    • unknown's avatar
      InnoDB: On UPDATE, trim UCS2 columns correctly. (Bug #12178) · a14a34be
      unknown authored
      
      sql/ha_innodb.cc:
        innobase_convert_and_store_changed_col(), calc_row_difference():
         Replace parameter "is_unsigned" with "prtype".
        innobase_convert_and_store_changed_col():
         When trimming spaces, note that UCS2 spaces are 0x0020, not 0x20.
      a14a34be
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3bb53a7c
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
      
      
      myisam/mi_open.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisamdef.h:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      3bb53a7c
    • unknown's avatar
      Merge mysql.com:/M50/noserver-5.0 into mysql.com:/M50/mysql-5.0 · 06e08e04
      unknown authored
      
      mysys/mf_keycache.c:
        Auto merged
      06e08e04
    • unknown's avatar
      Change "mf_keycache.c" so that it can be compiled without thread support (bug#11680): · cc430c68
      unknown authored
      "configure --without-server"   (without giving "--enable-thread-safe-client").
      
      
      mysys/mf_keycache.c:
        This module is needed both in the server (multi-threaded) and in some myisam tools (single-threaded).
        For the latter use, compilation failed in a "configure --without-server" as thread support was not
        defined then (unless "--enable-thread-safe-client" was also given, but this should not be required).
        The solution is to guard all threading operations in "#ifdef THREAD", and in the "#else" case adding
        assertions where appropriate. This fixes bug#11680.
        Also minor cleanup: Delete an unused variable, change "return" -> "DBUG_RETURN" in one place.
      cc430c68
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 710a2e29
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
        Auto merged
      710a2e29
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · d3febe80
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      include/my_sys.h:
        Auto merged
      mysys/default.c:
        Auto merged
      d3febe80
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 8aebd062
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/tools/ndb_config.cpp:
        merge
      8aebd062
    • unknown's avatar
      ndb_config · 7337ba76
      unknown authored
        Check returnvalue on load/fetch configuration
      
      
      ndb/tools/ndb_config.cpp:
        Check returnvalue on load/fetch configuration
      7337ba76
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0a467b5f
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-sept30-test
      
      
      0a467b5f
    • unknown's avatar
      BUG#13081: Disable ROR-index_merge for NDB tables (by adding a · b8ad9d14
      unknown authored
      HA_KEY_SCAN_NOT_ROR index flag) as NDB index scans are not guaranteed to be ROR 
      scans. 
      
      
      b8ad9d14
    • unknown's avatar
      ndb · dbc72145
      unknown authored
        Add support/test for using my.cnf [cluster_config]
      
      
      mysql-test/r/ndb_config.result:
        Add support for ndb_config to read my.cnf
      mysql-test/t/ndb_config.test:
        Add support for ndb_config to read my.cnf
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        merge
      ndb/tools/ndb_config.cpp:
        Add support for ndb_config to read my.cnf
      mysql-test/std_data/ndb_config_mycnf1.cnf:
        New BitKeeper file ``mysql-test/std_data/ndb_config_mycnf1.cnf''
      dbc72145
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 60ee9326
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      60ee9326