1. 28 Jan, 2005 3 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · bf89dc06
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/tztime.cc:
        Auto merged
      bf89dc06
    • unknown's avatar
      Do-compile: · 418a0630
      unknown authored
        ndbcluster requires more ports, this is the reason why builds will not start on multiple builds
      
      
      Build-tools/Do-compile:
        ndbcluster requires more ports, this is the reason why builds will not start on multiple builds
      418a0630
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c5922fcc
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      c5922fcc
  2. 27 Jan, 2005 10 commits
    • 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
      Re-enabled the use of --prefix. · a271a6c8
      unknown authored
      Adjusted the "Usage:" string.
      Ordered the option recognition in reverse order from "Usage:".
      
      
      a271a6c8
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 99fdc5ef
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      
      99fdc5ef
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4e5a513c
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
      
      
      4e5a513c
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · f6297a90
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      
      f6297a90
    • unknown's avatar
      item_timefunc.cc: · 199a139d
      unknown authored
        CAST now always return a well-formed character string.
      
      
      sql/item_timefunc.cc:
        CAST now always return a well-formed character string.
      199a139d
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9a9b3f28
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
      
      
      9a9b3f28
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 513a70a3
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1
      
      
      513a70a3
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · fcb2f0cc
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      
      fcb2f0cc
  3. 26 Jan, 2005 17 commits
    • unknown's avatar
      Fix for bug #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ() function · 20bd0bd6
      unknown authored
      does not work well together". Now using simplier and more correct
      implementation of st_lex::unlink_first_table()/link_first_table_back() 
      (It also nicely handles case when global table list is created because
      of implictly used time zone tables). (2nd attempt)
      
      Fix for bug #7705 "CONVERT_TZ() crashes with subquery/WHERE on index
      column". Implemented new approach for caching objects for constant
      time zone arguments. Now instead of determining whenever these arguments
      are constants and performing time zone lookup at fix_fields() stage, we
      do it on first get_date() invocation.
      
      Cleanup of global @@time_zone variable handling.
      
      
      mysql-test/r/timezone2.result:
        Added test for bugs #7705 "CONVERT_TZ() crashes with subquery/WHERE on
        index column" and #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ()
        function does not work well together".
      mysql-test/t/timezone2.test:
        Added test for bugs #7705 "CONVERT_TZ() crashes with subquery/WHERE on
        index column" and #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ()
        function does not work well together".
      sql/item_timefunc.cc:
        Item_func_convert_tz():
          New approach for caching objects for constant time zone arguments.
          Now instead of determining whenever these arguments are constants
          and performing time zone lookup at fix_fields() stage, we do it
          on first get_date() invocation. This works better in cases when 
          const_item() for these arguments returns true only on get_date()
          stage but not on fix_fields() stage (e.g. this happens in quries
          with joins or derived tables).
      sql/item_timefunc.h:
        Item_func_convert_tz():
          Added from_tz_cached/to_tz_cached members indicating whenever we
          already have Time_zone object representing one of constant time zone
          arguments.
      sql/set_var.cc:
        Cleaned up global @@time_zone variable handling. Now we use proper
        locking when we are setting or reading its value.
      sql/set_var.h:
        Removed declaration of sys_var_thd_time_zone::get_tz_ptr() method, which
        no longer used.
      sql/sql_lex.cc:
        st_lex::unlink_first_table(), st_lex::link_first_table_back():
         Simplify implementation according to Monty's suggestion.
         Instead doing something special if global and local table lists
         are the same, we simply save/restore pointers to first elements
         of both global and local lists (which works even when this lists
         are the same!). This handles nicely the case when we have separate
         global table list becuase time zone tables are implicitly used.
      sql/tztime.cc:
        Backport of Monty's fixes from 5.0, which give us nicer error messages
        if we haven't found time zone with such name or its description.
      20bd0bd6
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · d2e2de1b
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      d2e2de1b
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · fee6edd9
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      
      fee6edd9
    • unknown's avatar
      Test Bug: Memory leaks in the archive handler. · b6e00331
      unknown authored
      Moved initialization code into a new init function.
      Added a new cleanup function.
      Added a call to close the meta file.
      
      
      
      mysql-test/t/archive.test:
        Test Bug: Memory leaks in the archive handler.
        Fixed a typo.
      sql/examples/ha_archive.h:
        Test Bug: Memory leaks in the archive handler.
        Added declarations for the new init/cleanup functions.
      sql/handler.cc:
        Test Bug: Memory leaks in the archive handler.
        Added calls of the new init/cleanup functions.
      b6e00331
    • unknown's avatar
      Only enable Innodb extra debugging when using the --debug=full configure option · 3c3ca269
      unknown authored
      
      BUILD/SETUP.sh:
        Abort if wrong options
      BUILD/compile-pentium64-debug:
        Always use full debugging
      innobase/fil/fil0fil.c:
        Fixed wrong printf() format
      3c3ca269
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · a898252a
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      
      a898252a
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · edda6bb0
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1
      
      
      include/my_global.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      edda6bb0
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 21bc76b9
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
      
      
      21bc76b9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 9ffd94d9
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      
      9ffd94d9
    • unknown's avatar
      Added -DDBUG_ON to CXXFLAGS when compiling with debugging · d9274b33
      unknown authored
      This fixes a memory allocation bug in Innobase as structs was defined differently in .c and .cc files
      
      
      d9274b33
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ccd08ea8
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      ccd08ea8
    • unknown's avatar
      Bug#8101 unique indexes which attribute are _not_ specified in the order of... · d041ed2d
      unknown authored
      Bug#8101  unique indexes which attribute are _not_ specified in the order of the table does not work
      
      
      
      d041ed2d
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9d170189
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      9d170189
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 61aa9e74
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
      
      
      61aa9e74
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · f712a3d8
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      
      sql/sql_select.cc:
        Auto merged
      f712a3d8
    • unknown's avatar
      innobase/include/univ.i · ea279502
      unknown authored
          remove a change that broke the test
      
      
      innobase/include/univ.i:
        remove a change that broke the test
      sql/item_create.cc:
        better fix
      ea279502
    • unknown's avatar
      order_by.result, order_by.test: · 235edc21
      unknown authored
        Added test case for bug #7672 that existed only in 4.0.
      
      
      mysql-test/t/order_by.test:
        Added test case for bug #7672 that existed only in 4.0.
      mysql-test/r/order_by.result:
        Added test case for bug #7672 that existed only in 4.0.
      235edc21
  4. 25 Jan, 2005 10 commits