1. 29 Jan, 2005 6 commits
  2. 28 Jan, 2005 20 commits
  3. 27 Jan, 2005 14 commits
    • unknown's avatar
      Merge · cca25e4d
      unknown authored
      
      ndb/include/Makefile.am:
        Auto merged
      ndb/include/mgmapi/mgmapi_config_parameters.h:
        Auto merged
      ndb/src/common/mgmcommon/IPCConfig.cpp:
        Auto merged
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      ndb/src/kernel/vm/Configuration.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/tools/delete_all.cpp:
        Auto merged
      ndb/tools/desc.cpp:
        Auto merged
      ndb/tools/drop_index.cpp:
        Auto merged
      ndb/tools/drop_tab.cpp:
        Auto merged
      ndb/tools/listTables.cpp:
        Auto merged
      ndb/tools/restore/restore_main.cpp:
        Auto merged
      ndb/tools/select_all.cpp:
        Auto merged
      ndb/tools/select_count.cpp:
        Auto merged
      ndb/tools/waiter.cpp:
        Auto merged
      ndb/include/util/ndb_opts.h:
        SCCS merged
      ndb/src/mgmsrv/main.cpp:
        resolved merge conflict
      cca25e4d
    • unknown's avatar
      Bug#8167 signal usage clash between mysql server and ndb shared memory · df7bb879
      unknown authored
          added shared memory config parameter, signum for use in signalling
          added global variable for holdign signum to be used for shared memory connection
          only fiddle with signals if it is set
          simplified common ndb client option handling
      
      
      ndb/include/Makefile.am:
        added common defaults file
      ndb/include/mgmapi/mgmapi_config_parameters.h:
        added shared memory config parameter, signum for use in signalling
      ndb/include/transporter/TransporterDefinitions.hpp:
        added shared memory config parameter, signum for use in signalling
      ndb/include/util/ndb_opts.h:
        simplified common ndb client option handling
      ndb/src/common/mgmcommon/IPCConfig.cpp:
        added shared memory config parameter, signum for use in signalling
      ndb/src/common/portlib/NdbThread.c:
        added global variable for holdign signum to be used for shared memory connection
        only block signals if shared memory is used
      ndb/src/common/transporter/SHM_Transporter.cpp:
        use signum in new global variable for shared memory signalling
      ndb/src/common/transporter/TransporterRegistry.cpp:
        use signum in new global variable for shared memory signalling
        only fiddle with signals if it is set
      ndb/src/cw/cpcd/main.cpp:
        ndb_opts not really used
      ndb/src/kernel/vm/Configuration.cpp:
        simplified common ndb client option handling
      ndb/src/mgmclient/main.cpp:
        simplified common ndb client option handling
      ndb/src/mgmsrv/ConfigInfo.cpp:
        added shared memory config parameter, signum for use in signalling
      ndb/src/mgmsrv/main.cpp:
        simplified common ndb client option handling
      ndb/tools/delete_all.cpp:
        simplified common ndb client option handling
      ndb/tools/desc.cpp:
        simplified common ndb client option handling
      ndb/tools/drop_index.cpp:
        simplified common ndb client option handling
      ndb/tools/drop_tab.cpp:
        simplified common ndb client option handling
      ndb/tools/listTables.cpp:
        simplified common ndb client option handling
      ndb/tools/restore/restore_main.cpp:
        simplified common ndb client option handling
      ndb/tools/select_all.cpp:
        simplified common ndb client option handling
      ndb/tools/select_count.cpp:
        simplified common ndb client option handling
      ndb/tools/waiter.cpp:
        simplified common ndb client option handling
      df7bb879
    • unknown's avatar
      Remove unused configure.in name TOOLS_LIBS. · b485ed7b
      unknown authored
      
      configure.in:
        Remove unused TOOLS_LIBS: LIBS and CLIENT_LIBS should
        be enough for the global configure.in
      b485ed7b
    • unknown's avatar
      Bug #5185 mysqldump for windows database gets table names with different case · b8cac714
      unknown authored
      Added the get_actual_table_name function that issues a SHOW TABLES LIKE '%s'.  This will get the table 
      name in the proper case.  We use this table name rather than the one given on the command line.  This will
      prevent problems when importing SQL on Linux that was generated on a Windows platform where case can be
      an issue.
      
      mysqldump.c:
        call get_actual_table_name to get the table name in the proper case
      
      
      client/mysqldump.c:
        call get_actual_table_name to get the table name in the proper case
      b8cac714
    • unknown's avatar
      ndb - post-merge fix · fce978c7
      unknown authored
      
      ndb/include/ndb_constants.h:
        post-merge fix
      fce978c7
    • unknown's avatar
      Merge · 763dfd7b
      unknown authored
      
      mysql-test/r/ndb_index_ordered.result:
        Auto merged
      mysql-test/t/ndb_index_ordered.test:
        Auto merged
      ndb/src/ndbapi/NdbDictionary.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        merge
      ndb/include/ndbapi/NdbDictionary.hpp:
        merge
      ndb/include/util/NdbSqlUtil.hpp:
        merge
      ndb/src/common/util/NdbSqlUtil.cpp:
        merge
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        merge
      ndb/src/ndbapi/NdbRecAttr.cpp:
        merge
      763dfd7b
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 96528854
      unknown authored
      into mysql.com:/export/space/pekka/ndb/version/my41
      
      
      96528854
    • unknown's avatar
      os0file.c: · 1c49d548
      unknown authored
        Add includes for the _stat() call to compile on Windows in Hot Backup build
      
      
      innobase/os/os0file.c:
        Add includes for the _stat() call to compile on Windows in Hot Backup build
      1c49d548
    • unknown's avatar
      ut0mem.c: · 563ebb43
      unknown authored
        Add a note to the error message that is printed when memory allocation fails: 32-bit computers usually have at most 2 GB or 4 GB process memory space
      
      
      innobase/ut/ut0mem.c:
        Add a note to the error message that is printed when memory allocation fails: 32-bit computers usually have at most 2 GB or 4 GB process memory space
      563ebb43
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9c02a351
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
      
      
      9c02a351
    • unknown's avatar
      ndb - make YEAR and TIMESTAMP into ndb types · 1ed40339
      unknown authored
      
      mysql-test/r/ndb_index_ordered.result:
        make YEAR and TIMESTAMP into ndb types
      mysql-test/t/ndb_index_ordered.test:
        make YEAR and TIMESTAMP into ndb types
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/include/ndbapi/NdbDictionary.hpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/include/util/NdbSqlUtil.hpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/src/common/util/NdbSqlUtil.cpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/src/ndbapi/NdbDictionary.cpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/src/ndbapi/NdbRecAttr.cpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/test/include/NdbSchemaOp.hpp:
        make YEAR and TIMESTAMP into ndb types
      sql/ha_ndbcluster.cc:
        make YEAR and TIMESTAMP into ndb types
      1ed40339
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3f0cb69a
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
      
      
      3f0cb69a
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 295db433
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      295db433
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1-4100 · 87fba518
      unknown authored
      into mysql.com:/home/mydev/mysql-5.0-5000
      
      
      BUILD/SETUP.sh:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/r/lowercase_table2.result:
        Auto merged
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/t/order_by.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      87fba518