1. 06 May, 2005 10 commits
  2. 05 May, 2005 15 commits
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 8d5ad62a
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      8d5ad62a
    • unknown's avatar
    • unknown's avatar
      Added cp932 character set · 2ad56abe
      unknown authored
      2ad56abe
    • unknown's avatar
      Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6d045048
      unknown authored
      into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      6d045048
    • unknown's avatar
      Added cp932 character set · bc42a29e
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      bc42a29e
    • unknown's avatar
      Bug #10245 VC++ compiler error with mysql.cc · 656b4e5a
      unknown authored
      Only print the read line version if we are on a platform that supports readline
      
      mysql.cc:
        Add #ifdef to only print readline version if we are on a platform that supports readline
      
      
      client/mysql.cc:
        Add #ifdef to only print readline version if we are on a platform that supports readline
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      656b4e5a
    • unknown's avatar
      Bug #9721 net_write_timeout not used on Windows · 42b776dd
      unknown authored
      Added an extra parameter to all calls to timeout().  
      1 means we want to set the write timeout
      0 means we wnat to set the read timeout
      
      viossl.c:
        Add which parameter to ssl timeout routine
      vio_priv.h:
        Added which parameter to vio_ignore_timeout and vio_ssl_timeout
      violite.h:
        Add which parameter to vio_timeout sigs
      net_serv.cc:
        Use proper which code in call to vio_timeout to set the proper timeout
      viosocket.c:
        Set the appropriate timeout in vio_timeout
      
      
      vio/viosocket.c:
        Set the appropriate timeout in vio_timeout
      sql/net_serv.cc:
        Use proper which code in call to vio_timeout to set the proper timeout
      include/violite.h:
        Add which parameter to vio_timeout sigs
      vio/vio_priv.h:
        Added which parameter to vio_ignore_timeout and vio_ssl_timeout
      vio/viossl.c:
        Add which parameter to ssl timeout routine
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      42b776dd
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · bdf330bf
      unknown authored
      into mysql.com:/home/gluh/MySQL/Devel/mysql-4.1
      
      bdf330bf
    • unknown's avatar
      A fix and test case for Bug#9777 " Empty set returned by Prepared Statement when it · 7d794dcc
      unknown authored
       should return a non empty one"
      (see comments for the changed files for details).
      
      
      mysql-test/r/ps.result:
        A test case for Bug#9777: tests results fixed.
      mysql-test/t/ps.test:
        A test case for Bug#9777
      sql/item.cc:
        A fix for Bug#9777: when creating a constant item from within 
        Item_int_with_ref::new_item, create the item by value, not by name.
        This should work with prepared statements placeholders.
        Item_int_with_ref is a special optimization case used
         when we compare datetime constants with datetime value.
        Converting the item to integer early is OK as it is in line
        with the purpose of Item_int_with_ref - to speed up comparison by 
        using integers.
        Minor cleanups.
      sql/item.h:
        Declaration for Item_int_with_ref::new_item
      7d794dcc
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · d7a6c0b1
      unknown authored
      into mysql.com:/Users/kent/mysql/cw/mysql-4.1
      
      d7a6c0b1
    • unknown's avatar
      mwcc-wrapper, compile-darwin-mwcc, mwar-wrapper: · f98f5a92
      unknown authored
        Initial Metrowerks CodeWarrior compiler support
        new file
      
      
      support-files/MacOSX/mwar-wrapper:
        Initial Metrowerks CodeWarrior compiler support
      BUILD/compile-darwin-mwcc:
        Initial Metrowerks CodeWarrior compiler support
      support-files/MacOSX/mwcc-wrapper:
        Initial Metrowerks CodeWarrior compiler support
      f98f5a92
    • unknown's avatar
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · 374c24cd
      unknown authored
      into hundin.mysql.fi:/home/jan/mysql-4.1
      
      374c24cd
    • unknown's avatar
      terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h: · 2b9ae6cf
      unknown authored
        Initial Metrowerks CodeWarrior compiler support
      
      
      cmd-line-utils/libedit/config.h:
        Initial Metrowerks CodeWarrior compiler support
      configure.in:
        Initial Metrowerks CodeWarrior compiler support
      include/my_sys.h:
        Initial Metrowerks CodeWarrior compiler support
      sql/sql_bitmap.h:
        Initial Metrowerks CodeWarrior compiler support
      cmd-line-utils/readline/terminal.c:
        Initial Metrowerks CodeWarrior compiler support
      2b9ae6cf
    • unknown's avatar
      Fig compiler error. · f8925476
      unknown authored
      f8925476
  3. 04 May, 2005 8 commits
  4. 03 May, 2005 3 commits
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-root · 4e4d5ea3
      unknown authored
      into mysql.com:/opt/local/work/mysql-4.1-9096-fresh
      
      
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      4e4d5ea3
    • unknown's avatar
      A fix and test case for Bug#9096 "select doesn't return all matched · eb9e992b
      unknown authored
      records if prepared statements is used".
      This fix changes equality evaluation method of basic constants from
      by-name to by-value, thus effectively enabling use of parameter markers
      in some optimizations (constants propagation, evaluation of possible
      keys for query).
      
      
      mysql-test/r/ps.result:
        Test results for the test case for Bug#9096
      mysql-test/t/ps.test:
        A short test case for Bug#9096 "select doesn't return all matched records if
         prepared statements is used". The is enough to reproduce the
        glitch in update_ref_and_keys causing the bug to occur.
      sql/item.cc:
        Implement by-value equality evaluation of basic constants.
        This is needed to work with Item_param values. Until now
        Item_param was compared with other items by its name, which is always "?".
        The bug at hand showed up when an integer
        constant was created from one parameter marker (with value 200887 and
         name "?") and then compared by-name with another parameter marker
        (with value 860 and name "?"). True returned by this comparison resulted
        in a wrong table access method used to evaluate the query.
        Implement Item_param methods needed to emulate "basic constant" mode at 
        full.
      sql/item.h:
        Change declaration of basic_const_item(): now it also widens its 
        argument from const Item * to Item * if the argument is a basic constant.
        Declare eq() for all basic constatns, as long as now they 
        are compared by value, not by name. Each constant needs its own
        comparison method.
        Declarations of Item_param methods needed to fully emulate 
        a basic constant when parameter value is set.
      sql/item_func.cc:
        Fix wrong casts.
      eb9e992b
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · 86bae853
      unknown authored
      into hundin.mysql.fi:/home/jan/mysql-4.1
      
      86bae853
  5. 02 May, 2005 4 commits