1. 31 Jan, 2005 2 commits
    • unknown's avatar
      Bug#7011 · a737134a
      unknown authored
        Fix tests after merge from 4.0
      
      a737134a
    • unknown's avatar
      Bug#7011 · 4ea4d24d
      unknown authored
        Merge from 4.0
      
      
      sql/sql_select.cc:
        Auto merged
      4ea4d24d
  2. 30 Jan, 2005 1 commit
    • unknown's avatar
      Bug#7011 · b8ab81f1
      unknown authored
        Fix replication for multi-update
        new test - rpl_multi_update2
      
      
      sql/mysql_priv.h:
        Bug#7011
          New function mysql_multi_update_lock()
      sql/sql_parse.cc:
        Bug#7011
          New function check_multi_update_lock()
          For multi-update on slave, perform an early open&lock
      sql/sql_update.cc:
        Bug#7011
          Split out multi-update locking into its own function,
            mysql_multi_update_lock()
      b8ab81f1
  3. 29 Jan, 2005 5 commits
  4. 28 Jan, 2005 7 commits
  5. 27 Jan, 2005 13 commits
    • unknown's avatar
      Bug#8167 signal usage clash between mysql server and ndb shared memory · c5925932
      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
      c5925932
    • unknown's avatar
      Remove unused configure.in name TOOLS_LIBS. · aee180d6
      unknown authored
      
      configure.in:
        Remove unused TOOLS_LIBS: LIBS and CLIENT_LIBS should
        be enough for the global configure.in
      aee180d6
    • unknown's avatar
      Bug #5185 mysqldump for windows database gets table names with different case · b88da72b
      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
      b88da72b
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · f0fd14fd
      unknown authored
      into mysql.com:/export/space/pekka/ndb/version/my41
      
      f0fd14fd
    • unknown's avatar
      ndb - make YEAR and TIMESTAMP into ndb types · e1b0ecb0
      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
      e1b0ecb0
    • unknown's avatar
      Re-enabled the use of --prefix. · c79f71a3
      unknown authored
      Adjusted the "Usage:" string.
      Ordered the option recognition in reverse order from "Usage:".
      
      c79f71a3
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 7c3c4902
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      7c3c4902
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0b0368b6
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
      
      0b0368b6
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 468405c9
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      468405c9
    • unknown's avatar
      item_timefunc.cc: · 20b9ba07
      unknown authored
        CAST now always return a well-formed character string.
      
      
      sql/item_timefunc.cc:
        CAST now always return a well-formed character string.
      20b9ba07
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 21a1ec5e
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
      
      21a1ec5e
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c890f625
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1
      
      c890f625
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 158fa087
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      158fa087
  6. 26 Jan, 2005 12 commits
    • unknown's avatar
      Fix for bug #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ() function · 6a5d1092
      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.
      6a5d1092
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 924e0c0f
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      924e0c0f
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 9990b5d2
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      9990b5d2
    • unknown's avatar
      Test Bug: Memory leaks in the archive handler. · af62bb81
      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.
      af62bb81
    • unknown's avatar
      Only enable Innodb extra debugging when using the --debug=full configure option · 17e64fbf
      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
      17e64fbf
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2ea6d344
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      2ea6d344
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c8746a66
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1
      
      
      include/my_global.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      c8746a66
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8c3b8ced
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
      
      8c3b8ced
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · f7271edd
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      f7271edd
    • unknown's avatar
      Added -DDBUG_ON to CXXFLAGS when compiling with debugging · d90681bd
      unknown authored
      This fixes a memory allocation bug in Innobase as structs was defined differently in .c and .cc files
      
      d90681bd
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8df4eead
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      8df4eead
    • unknown's avatar
      Bug#8101 unique indexes which attribute are _not_ specified in the order of... · ea162f8e
      unknown authored
      Bug#8101  unique indexes which attribute are _not_ specified in the order of the table does not work
      
      
      ea162f8e