1. 05 May, 2005 14 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · c1e79858
      unknown authored
      into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
      
      
      c1e79858
    • unknown's avatar
      making rpl_sp.test hostname-independent · 481e743b
      unknown authored
      
      mysql-test/t/rpl_sp.test:
        making test hostname-independent (don't know why the problem didn't appear on my machine)
      mysql-test/r/rpl_sp.result:
        result update
      481e743b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · b6317e3a
      unknown authored
      into sergbook.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      configure.in:
        Auto merged
      b6317e3a
    • unknown's avatar
      gcc 2.92 compatibility · cba5abe6
      unknown authored
      
      config/ac-macros/misc.m4:
        better USE_MYSYS_NEW detection
      configure.in:
        better USE_MYSYS_NEW detection
      extra/yassl/src/Makefile.am:
        better USE_MYSYS_NEW detection
      extra/yassl/taocrypt/include/runtime.hpp:
        better USE_MYSYS_NEW detection
      cba5abe6
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 63604387
      unknown authored
      into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
      
      
      63604387
    • unknown's avatar
      Post merge fixes (merge of Bug#9777) · 2e185482
      unknown authored
      2e185482
    • unknown's avatar
      Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146... · af12ff65
      unknown authored
        Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions).
        Approximative, because it's using our binlogging way (what we call "query"-level) and this is not as good as record-level binlog (5.1) would be. It imposes several
        limitations to routines, and has caveats (which I'll document, and for which the server will try to issue errors but that is not always possible).
        Reason I don't propagate caller info to the binlog as planned is that on master and slave
        users may be different; even with that some caveats would remain.
      
      
      mysql-test/mysql-test-run.sh:
        In the testsuite we know what we do, we are not creating nasty routines, and breaking binlog is ok except in rpl_sp.
      mysql-test/r/blackhole.result:
        Updating results now that 4.1 has been merged
      mysql-test/valgrind.supp:
            Some suppressions for Valgrind (useful on my machine Suse 9.1);
            this is just adding to the already existing suppressions of pthread and dl.
      sql/item_func.cc:
            Don't binlog the substatements when executing a function. If the function
            is declared to modify data and does not complete, warning "broken binlog".
            Note that SELECT myfunc() will not be binlogged even if myfunc() updates data (will be documented);
            but INSERT INTO t VALUES(myfunc()) will be binlogged (what decides is if the caller
            gets binlogged; the function changes nothing to binlogging).
      sql/log_event.cc:
            Just making functions which can be re-used when we binlog more strings
            in status_vars in Query_log_event (e.g. one day "user", "host").
      sql/log_event.h:
        comment
      sql/mysql_priv.h:
            --log-bin-trust-routine-creators
      sql/mysqld.cc:
            --log-bin-trust-routine-creators
      sql/set_var.cc:
            --log-bin-trust-routine-creators
      sql/share/errmsg.txt:
        error messages to warn about problems with routines and binlog
      sql/slave.cc:
            If in a routine, replication table inclusion/exclusion rules always answer "replicate!" (see comment in code).
      sql/sp.cc:
            If binlog is on: errors if one wants to create a non-deterministic update routine
            (repeatability problem - note that the test is not perfect for functions) or does not have SUPER (because routines can easily
            be made to destroy slave's data with just CREATE ROUTINE and EXECUTE priv on master).
            --log-bin-trust-routine-creators removes these errors.
            Binlogging of CREATE PROCEDURE|FUNCTION.
      sql/sql_acl.cc:
            No thd==0 in tables_ok().
      sql/sql_parse.cc:
            Binlogging of CALL (and not of the substatements of the SP).
            If SP returns error, we don't binlog it (see comment); we push warning in this case.
            Binlogging of ALTER|DROP PROCEDURE|FUNCTION with safety messages.
      af12ff65
    • unknown's avatar
      Manual merge · 7f338097
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ndb_restore.test:
        Auto merged
      ndb/test/src/NDBT_ResultRow.cpp:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      7f338097
    • unknown's avatar
      A fix and test case for Bug#9777 " Empty set returned by Prepared Statement when it · c758512a
      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
      c758512a
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · f3883ad0
      unknown authored
      into mysql.com:/Users/kent/mysql/cw/mysql-4.1
      
      
      f3883ad0
    • unknown's avatar
      mwcc-wrapper, compile-darwin-mwcc, mwar-wrapper: · 203543d1
      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
      203543d1
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · a4053ca3
      unknown authored
      into hundin.mysql.fi:/home/jan/mysql-4.1
      
      
      a4053ca3
    • unknown's avatar
      terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h: · f59fef3f
      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
      f59fef3f
    • unknown's avatar
      Fig compiler error. · 709c4ad1
      unknown authored
      709c4ad1
  2. 04 May, 2005 19 commits
  3. 03 May, 2005 7 commits
    • unknown's avatar
      Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0 · 7b4374f6
      unknown authored
      into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-test-5.0
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      7b4374f6
    • unknown's avatar
      Manual merge of Bug#9096 · 3aa89efc
      unknown authored
      3aa89efc
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-root · b883aeba
      unknown authored
      into mysql.com:/opt/local/work/mysql-4.1-9096-fresh
      
      
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      b883aeba
    • unknown's avatar
      A fix and test case for Bug#9096 "select doesn't return all matched · 9fcda7fc
      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.
      9fcda7fc
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9724795f
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-test-valgrind
      
      
      9724795f
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · c6257d20
      unknown authored
      into hundin.mysql.fi:/home/jan/mysql-4.1
      
      
      c6257d20
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 21d3d43c
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-test-valgrind
      
      
      sql/sql_select.cc:
        Auto merged
      21d3d43c