1. 06 May, 2005 14 commits
    • unknown's avatar
      merge · 454d58be
      unknown authored
      
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/key.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      454d58be
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 281c85a3
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-5.0.4
      
      281c85a3
    • unknown's avatar
      After merge fix · 779daedb
      unknown authored
      
      innobase/include/srv0srv.h:
        Restore accidentally deleted comment.
      779daedb
    • unknown's avatar
      Merge · 19b39736
      unknown authored
      19b39736
    • unknown's avatar
      Fixes while reviewing new code · 19fc09c5
      unknown authored
      Added option --count to mysqlshow (to show number of rows)
      Fixed possible core dump in information schema
      
      
      client/client_priv.h:
        --count for mysqlshow
      client/mysqlshow.c:
        Added option --count to be used when the user want's number of rows per table in the output
        (We shouldn't use count(*) as default as this can be a slow operation)
      mysys/my_thr_init.c:
        Correct comment
      sql/ha_berkeley.cc:
        Remove not used variable
      sql/ha_berkeley.h:
        Remove not used variable
      sql/ha_innodb.cc:
        Remove not used function
      sql/ha_ndbcluster.cc:
        false -> FALSE
        true -> TRUE
      sql/handler.cc:
        Added and fixed comments
        Remove 'strange' code to remove compiler warnings (better to do things like this with attribute)
      sql/item.cc:
        false -> FALSE
      sql/item_cmpfunc.cc:
        Fixed indentation
      sql/item_cmpfunc.h:
        marked BETWEEN as a bool function
      sql/item_func.cc:
        Simple optimzation
      sql/key.cc:
        Removed wrong code
      sql/log.cc:
        Check result from open_index_file()
      sql/mysql_priv.h:
        Simplyfy some test of netware
      sql/mysqld.cc:
        Fixed indentation
        Check result form open_index_file()
        Simplify code with IF_NETWARE()
      sql/opt_range.cc:
        false -> FALSE
        true -> TRUE
        Fixed indentation
      sql/opt_sum.cc:
        Fixed comments
      sql/sp_head.cc:
        Simple optimzation
        Move variable declarations to begining of blocks
      sql/sql_acl.cc:
        Fix long lines
        Rename xx -> column
        Move declaration to beginning of block
      sql/sql_parse.cc:
        Removed comment
      sql/sql_select.cc:
        Indentation fixes
      sql/sql_show.cc:
        Fixed reference outside of array (possible core dump)
      sql/sql_table.cc:
        Simplify code
        Combine common code
      sql/sql_test.cc:
        false -> FALSE
      sql/sql_trigger.cc:
        false -> false
        true -> TRUE
      sql/sql_yacc.yy:
        Simpler test
      sql/unireg.cc:
        Added comment
      19fc09c5
    • unknown's avatar
      A fix (bug #10404: select 0/0 returns 0). · 5021d68a
      unknown authored
      
      strings/decimal.c:
        A fix (bug #10404: select 0/0 returns 0).
        We should check the second argument (0?) first.
      5021d68a
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 426d8dd8
      unknown authored
      into mysql.com:/root/mysql-5.0
      
      426d8dd8
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · b1fd9674
      unknown authored
      into mysql.com:/root/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      b1fd9674
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b687d32d
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-bg9841
      
      
      mysql-test/r/sp.result:
        Auto merged
      b687d32d
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · c786ac21
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-4.1
      
      
      sql/ha_innodb.cc:
        Auto merged
      c786ac21
    • unknown's avatar
      merging cp932 from 4.1 · 27772e3c
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/deleted/.del-have_cp932.inc:
        Delete: mysql-test/include/have_cp932.inc
      BitKeeper/deleted/.del-ctype_cp932.result:
        Delete: mysql-test/r/ctype_cp932.result
      BitKeeper/deleted/.del-have_cp932.require:
        Delete: mysql-test/r/have_cp932.require
      BitKeeper/deleted/.del-ctype_cp932.test:
        Delete: mysql-test/t/ctype_cp932.test
      BitKeeper/deleted/.del-ctype-cp932.c:
        Delete: strings/ctype-cp932.c
      include/m_ctype.h:
        Auto merged
      mysys/charset-def.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      27772e3c
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · e274e3b3
      unknown authored
      into mysql.com:/home/ram/work/5.0
      
      e274e3b3
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 240b144f
      unknown authored
      into mysql.com:/root/mysql-5.0
      
      
      sql/sql_select.cc:
        Auto merged
      240b144f
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7c731b00
      unknown authored
      into mysql.com:/home/ram/work/5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      7c731b00
  2. 05 May, 2005 26 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
      Merge mysql.com:/space/my/mysql-4.1-build · e3dd4d83
      unknown authored
      into mysql.com:/space/my/mysql-5.0-build
      
      e3dd4d83
    • unknown's avatar
    • unknown's avatar
      Tests and results fixed with last precision/decimal related modifications · e1c6c977
      unknown authored
      
      mysql-test/r/case.result:
        test result fixed
      mysql-test/r/create.result:
        test result fixed
      mysql-test/r/distinct.result:
        test result fixed
      mysql-test/r/func_group.result:
        test result fixed
      mysql-test/r/func_op.result:
        test result fixed
      mysql-test/r/group_by.result:
        test result fixed
      mysql-test/r/metadata.result:
        test result fixed
      mysql-test/r/olap.result:
        test result fixed
      mysql-test/r/ps_2myisam.result:
        test result fixed
      mysql-test/r/ps_3innodb.result:
        test result fixed
      mysql-test/r/ps_4heap.result:
        test result fixed
      mysql-test/r/ps_5merge.result:
        test result fixed
      mysql-test/r/ps_6bdb.result:
        test result fixed
      mysql-test/r/ps_7ndb.result:
        test result fixed
      mysql-test/r/select.result:
        test result fixed
      mysql-test/r/sp.result:
        test result fixed
      mysql-test/r/type_decimal.result:
        test result fixed
      mysql-test/r/type_newdecimal.result:
        test result fixed
      mysql-test/r/union.result:
        test result fixed
      mysql-test/r/variables.result:
        test result fixed
      mysql-test/t/func_group.test:
        test modified
      mysql-test/t/olap.test:
        test modified
      mysql-test/t/type_decimal.test:
        test modified
      e1c6c977
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-5.0.clean · 52b075cc
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.prec
      
      52b075cc
    • 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
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · e6c2943c
      unknown authored
      into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
      
      e6c2943c
    • unknown's avatar
      making rpl_sp.test hostname-independent · 97dd699a
      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
      97dd699a
    • unknown's avatar
      Bug#9509 Optimizer: wrong result after AND with latin1_german2_ci · 4b7f9b61
      unknown authored
      We cannot propagate constants with tricky collations.
      
      4b7f9b61
    • unknown's avatar
      Fix for bug #9841 "Unexpected read lock when trying to update a view in · a1be4b81
      unknown authored
      a stored procedure" (version 2).
      
      To handle updates and inserts into view in SP properly we should set
      lock types for tables of the view's main select when we are opening
      view for prelocking purproses.
      
      
      mysql-test/r/sp.result:
        Added test case for bug #9841 "Unexpected read lock when trying to update
        a view in a stored procedure"
      mysql-test/t/sp.test:
        Added test case for bug #9841 "Unexpected read lock when trying to update
        a view in a stored procedure"
      sql/sql_view.cc:
        mysql_make_view():
          To handle updates and inserts into view in SP properly we should set
          lock types for tables of the view's main select when we are opening
          view for prelocking purproses.
          Also it is more correct to use LEX::select_lex::get_table_list() 
          instead of 'view_tables' variable for obtaining list of those
          tables.
      a1be4b81
    • unknown's avatar
      Merge · 62b675ce
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/item.h:
        SCCS merged
      62b675ce
    • unknown's avatar
      A lot of fixes to Precision math · 94dca613
      unknown authored
      Mostly about precision/decimals of the results of the operations
      
      
      include/decimal.h:
        decimal interface changed a little
      sql/field.cc:
        a lot of precision/decimals related changes to the Field_new_decimal
      sql/field.h:
        Field_new_decimal interface changed
      sql/ha_ndbcluster.cc:
        f->precision should be used here
      sql/item.cc:
        precision/decimals counting related changes
      sql/item.h:
        precision/decimals counting related changes
      sql/item_cmpfunc.cc:
        precision/decimals counting related changes
      sql/item_cmpfunc.h:
        precision/decimals counting related changes
      sql/item_func.cc:
        precision/decimals counting related changes
      sql/item_func.h:
        precision/decimals counting related changes
      sql/item_sum.cc:
        precision/decimals counting related changes
      sql/item_sum.h:
        precision/decimals counting related changes
      sql/my_decimal.cc:
        precision/decimals counting related changes
      sql/my_decimal.h:
        precision/decimals counting related changes
      sql/mysqld.cc:
        precision/decimals counting related changes
      sql/set_var.cc:
        precision/decimals counting related changes
      sql/sp_head.cc:
        dbug_decimal_print was replaced with dbug_decimal_as_string
      sql/sql_class.h:
        div_precincrement variable added
      sql/sql_parse.cc:
        precision/decimals counting related changes
      sql/sql_select.cc:
        precision/decimals counting related changes
      sql/sql_show.cc:
        Field::representation_length was removed
      strings/decimal.c:
        decimal_actual_fraction was introduced
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      94dca613
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · ba8bd61e
      unknown authored
      into ram-book.(none):/home/ram/work/5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      ba8bd61e
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 67385aaf
      unknown authored
      into sergbook.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      configure.in:
        Auto merged
      67385aaf
    • unknown's avatar
      gcc 2.92 compatibility · 784208d2
      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
      784208d2
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 903f76a3
      unknown authored
      into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
      
      903f76a3
    • unknown's avatar
      Post merge fixes (merge of Bug#9777) · b60882c0
      unknown authored
      b60882c0
    • unknown's avatar
      Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146... · 684d2a62
      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.
      684d2a62
    • unknown's avatar
      A fix (bug #10179: error in default value setting). · d60bbfbc
      unknown authored
      
      include/my_handler.h:
        A fix (bug #10179: error in default value setting).
        Proper masks added: we should not touch extra bits.
      sql/key.cc:
        A fix (bug #10179: error in default value setting).
        Unnecessary code removed.
      sql/unireg.cc:
        A fix (bug #10179: error in default value setting).
        1. we should take into account uneven bits (for bit fields) stored among NULL bits.
        2. changed code which sets NULL bits for fields.
        3. changed code which sets unused bits after NULL bits.
        4. unused variables removed.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      d60bbfbc
    • 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
      Manual merge · 6accd9c4
      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
      6accd9c4
    • 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