1. 16 Jun, 2005 3 commits
    • unknown's avatar
      BUG#11132 Connections stuck in CLOSE_WAIT · 82297c1c
      unknown authored
      This fixes the problem in 5.0 in the correct way.
      
      The previous patch (for 4.1) is only valid for 4.1 and is done at the right time
      for 4.1.
      
      
      ndb/src/kernel/main.cpp:
        The ndbd angel process keeps the mgm connection open as it retains a reference
        to the socket.
        
        this means that when the mgm server is killed, the socket stays in CLOSE_WAIT 
        (the ndb process will close() it okay in 5.0, as we reused it for a transporter
        but this isn't enough as the angel process still has a reference to that socket).
        
        so, by adding in a theConfig->closeConfiguration(); in the angel process, the ndb
        process is left with the only reference to the socket - which it can close whenever
        it likes (namely when the connection is terminated).
      82297c1c
    • unknown's avatar
      BUG#11132 Connections stuck in CLOSE_WAIT · 7748d388
      unknown authored
      The 4.1 fix is not valid for 5.0. Remove it.
      
      
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        This fix is not valid for 5.0 as we use the mgm server connection for more than
        just fetching the initial configuration
      7748d388
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug11132 · 37b02e7c
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11132
      
      
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Auto merged
      37b02e7c
  2. 15 Jun, 2005 25 commits
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · fc465d14
      unknown authored
      into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
      
      
      fc465d14
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8419d747
      unknown authored
      into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
      
      
      8419d747
    • unknown's avatar
      Manual merge · 24de7092
      unknown authored
      
      sql/field.cc:
        Auto merged
      24de7092
    • unknown's avatar
      cast.result, cast.test: · 1575df00
      unknown authored
        Added test case for bug #11283.
      field.h, field.cc:
        Fixed bug #11283: wrong conversion from varchar to decimal.
        Added methods Field_string::val_decimal,
        Field_varstring::val_decimal, Field_blob::val_decimal.
        They are not inherited from the base class Field_longstr
        anymore.
      
      
      sql/field.cc:
        Fixed bug #11283: wrong conversion from varchar to decimal.
        Added methods Field_string::val_decimal,
        Field_varstring::val_decimal, Field_blob::val_decimal.
        They are not inherited from the base class Field_longstr
        anymore.
      sql/field.h:
        Fixed bug #11283: wrong conversion from varchar to decimal.
        Added methods Field_string::val_decimal,
        Field_varstring::val_decimal, Field_blob::val_decimal.
        They are not inherited from the base class Field_longstr
        anymore.
      mysql-test/t/cast.test:
        Added test case for bug #11283.
      mysql-test/r/cast.result:
        Added test case for bug #11283.
      1575df00
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 2ec50db8
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.10632
      
      
      strings/decimal.c:
        Auto merged
      2ec50db8
    • unknown's avatar
      Fix for bug #10632 (CEILING returns wrong result) · df60c7ef
      unknown authored
      
      mysql-test/r/func_math.result:
        test result fixed
      mysql-test/t/func_math.test:
        test case added
      strings/decimal.c:
        handling of round_digit changed - we have to check all the digits after
        the point if round_digit is 0
      df60c7ef
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 04ec8eca
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.10337
      
      
      strings/decimal.c:
        Auto merged
      04ec8eca
    • unknown's avatar
      Fix for bug #10337 (cast(NULL DECIMAL) crashes the server) · e4cdb193
      unknown authored
      
      mysql-test/r/cast.result:
        test result fixed
      mysql-test/t/cast.test:
        test case added
      sql/item_func.cc:
        checks for NULL added
      strings/decimal.c:
        we need to return specified 'scale' for the rounded decimal
      e4cdb193
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7fdcb69b
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      7fdcb69b
    • unknown's avatar
      Added comment after Serg's review · 6393d023
      unknown authored
      6393d023
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · e7a26a13
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      e7a26a13
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 85d688a4
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      85d688a4
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · c813e97c
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      c813e97c
    • unknown's avatar
      join_nested.result, join_nested.test: · ad57284c
      unknown authored
        Added a teast case for bug #11284.
      sql_select.cc:
        Fixed bug #11284.
        Optimization with empty inner table currently cannot be
        used in the case of nested outer join.
      
      
      sql/sql_select.cc:
        Fixed bug #11284.
        Optimization with empty inner table currently cannot be
        used in the case of nested outer join.
      mysql-test/t/join_nested.test:
        Added a teast case for bug #11284.
      ad57284c
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · d925e516
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      d925e516
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 67c204c4
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      sql/sql_select.cc:
        Auto merged
      67c204c4
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · b0df4494
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      b0df4494
    • unknown's avatar
    • unknown's avatar
      join_outer.result, join_outer.test: · 098d02eb
      unknown authored
        Added a test case for bug #11285.
      sql_select.cc:
        Fixed bug #11285.
        The problem occurred with Item_equal in an 'on expression'
        that was evaluated to false.
      
      
      sql/sql_select.cc:
        Fixed bug #11285.
        The problem occurred with Item_equal in an 'on expression'
        that was evaluated to false.
      mysql-test/t/join_outer.test:
        Added a test case for bug #11285.
      mysql-test/r/join_outer.result:
        Added a test case for bug #11285.
      098d02eb
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · fd39c731
      unknown authored
      into mysql.com:/home/timka/mysql/src/5.0-dbg
      
      
      fd39c731
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 749a4e91
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      749a4e91
    • unknown's avatar
    • unknown's avatar
      b0502fc2
    • unknown's avatar
      Fix for BUG#11211 "GROUP BY doesn't work correctly" · 476ca52e
      unknown authored
        
      When the GROUP BY clause contains a column reference that can be resolved to
      both an aliased column in the SELECT list, and to a column in the FROM clause,
      the group column is resolved to the column in the FROM clause (for ANSI conformance).
      However, it may be so that the user's intent is just the other way around, and he/she
      gets the query results grouped by a completely different column than expexted.
      This patch adds a warning in such cases that tells the user that there is potential
      ambiguity in the group column.
      
      sql/sql_select.cc
      - Added a warning when a GROUP column is ambiguous due to that there is a
        column reference with the same name both in the SELECT and FROM clauses.
        In this case we resolve to the column in FROM clause and warn the user
        of a possible ambiguity.
      - More extensive comments.
      - Changed the function to return bool instead of int (as in other places).
      
      mysql-test/t/group_by.test
        Added test for BUG#11211.
      
      mysql-test/r/group_by.result
        Added test for BUG#11211.
      
      
      mysql-test/r/group_by.result:
        Import patch 11211.diff
      mysql-test/t/group_by.test:
        Import patch 11211.diff
      sql/sql_select.cc:
        Import patch 11211.diff
      BitKeeper/etc/ignore:
        Added ndb/src/dummy.cpp to the ignore list
      mysql-test/r/alias.result:
        Added warning for potentially ambiguous column.
      mysql-test/r/having.result:
        Added warning for potentially ambiguous column.
      476ca52e
    • unknown's avatar
      BUG#11132 Connections stuck in CLOSE_WAIT · b7807263
      unknown authored
      In 4.1 (it is different in 5.0), we do not use the mgm connection after fetching the
      configuration (and if we did, we would have to have calls to check the connection and
      reconnect if needed - in case the mgm server had restarted) so we can disconnect after
      first use.
      
      This means we won't have connections stuck in CLOSE_WAIT when the mgm server shuts down.
      
      
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Disconnect from management server after configuration is fetched.
      b7807263
  3. 14 Jun, 2005 12 commits
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 894fd6ae
      unknown authored
      into mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      894fd6ae
    • unknown's avatar
      fix of BUG#11111 fix · 4d8cbb0c
      unknown authored
      
      sql/item.h:
        revrited as recursive
      sql/sql_select.cc:
        real_type is virtual
      tests/mysql_client_test.c:
        check results abd delete views
      4d8cbb0c
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 228ec063
      unknown authored
      into mysql.com:/space/my/mysql-5.0-build
      
      
      support-files/mysql.spec.sh:
        Auto merged
      228ec063
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 10061029
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
      
      
      10061029
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 970e20b7
      unknown authored
      into  moonbone.local:/work/mysql-5.0-bug-11111
      
      
      970e20b7
    • unknown's avatar
      Fix 11 "fetch from view returns wrong data" · 4095a52a
      unknown authored
      Wrong method for creating temporary field was choosen, which results in
      sending int field with int header but lonlong data.
      
      Test case is added to mysql_client_test.c because client library is required
      to test the bug.
      
      
      
      tests/mysql_client_test.c:
        Test case for bug#11111 "fetch from view returns wrong data"
      sql/sql_select.cc:
        Fix bug #11111 "fetch from view returns wrong data"
      sql/item.h:
        Fix bug #11111 "fetch from view returns wrong data"
      4095a52a
    • unknown's avatar
      7f5d2213
    • unknown's avatar
      WL#2286 - Compile MySQL w/YASSL support · 70b58ecb
      unknown authored
          Fix for link failures on boxes with non-gnu compiler.
          Fix for compilation failure on hpux11.
      
      
      extra/yassl/taocrypt/src/misc.cpp:
        Adjust __HP_aCC value to solve compilation problem on hpux11.
      tools/Makefile.am:
        Add a dummy C++ file to mysqltestmanager to make libtool use a C++ linker:
        this lets mysqltestmanager link when using yaSSL and a non-gcc C++ compiler.
      70b58ecb
    • unknown's avatar
      prohibit opening Query cache for SP cursors (BUG#9715) · e1c2646a
      unknown authored
      
      mysql-test/r/query_cache.result:
        testing cursors in SP with QC
        testing suspicious but working using selects in function with QC
      mysql-test/t/query_cache.test:
        testing cursors in SP with QC
        testing suspicious but working using selects in function with QC
      sql/sp_head.h:
        method for prohibiting of QC using SP query
      sql/sp_rcontext.cc:
        prohibit opening Query cache for SP cursors
      sql/sp_rcontext.h:
        constructor moved to .cc file to be able to use methods from lex_keeper
      e1c2646a
    • unknown's avatar
      - Do not build the RPMs statically on i386 by default, only when adding either · d9287762
      unknown authored
         "--with static" or "--define '_with_static 1'" to the RPM build options. 
         Static linking really only makes sense when linking against the specially patched
         glibc 2.2.5.
      
      
      support-files/mysql.spec.sh:
         - Do not build statically on i386 by default, only when adding either "--with
           static" or "--define '_with_static 1'" to the RPM build options. Static
           linking really only makes sense when linking against the specially patched
           glibc 2.2.5.
      d9287762
    • unknown's avatar
      Final patch to the bug #11314 (HAVING DEFAULT hangs) · d5600efd
      unknown authored
      
      sql/item.cc:
        it's safer not to reassign arg member
      d5600efd
    • unknown's avatar
      Added order by for failing ps_7ndb test · 110eb52d
      unknown authored
      110eb52d