1. 02 Dec, 2003 2 commits
    • unknown's avatar
      index_merge.result: · 90f35502
      unknown authored
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      
      
      mysql-test/r/index_merge.result:
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      90f35502
    • unknown's avatar
      join_outer.result, null.result, null.test: · 48f81aa0
      unknown authored
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      item_cmpfunc.h:
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      
      
      sql/item_cmpfunc.h:
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (big #1990).
      mysql-test/t/null.test:
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      mysql-test/r/null.result:
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      mysql-test/r/join_outer.result:
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      48f81aa0
  2. 27 Nov, 2003 3 commits
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 104967f8
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0
      
      104967f8
    • unknown's avatar
      Fix for bug 1974 · 3ff52e8e
      unknown authored
      3ff52e8e
    • unknown's avatar
      Fixed BUG#1965: Opening a cursor hangs client when malformed select fails · 016c5b89
      unknown authored
        and BUG#1966: "select 1 into a" on top-level hangs client
      
      
      include/mysql_com.h:
        Added no_send_eof flag to NET for SP cursors (the simple read-only version).
      mysql-test/r/sp-error.result:
        Added tests for BUG#1965 and BUG#1966.
      mysql-test/t/sp-error.test:
        Added tests for BUG#1965 and BUG#1966.
      sql/net_serv.cc:
        Added no_send_eof flag to NET for SP cursors (the simple read-only version).
      sql/protocol.cc:
        Added no_send_eof flag to NET for SP cursors (the simple read-only version).
      sql/sp_rcontext.cc:
        Use net->no_send_eof flag to prevent eofs during cursor open (instead of
        the dirty vio=0 which didn't work).
      sql/sp_rcontext.h:
        Use net->no_send_eof flag to prevent eofs during cursor open (instead of
        the dirty vio=0 which didn't work).
      sql/sql_yacc.yy:
        Give error message if doing SELECT ... INTO localvar even if it's outside an SP.
      016c5b89
  3. 26 Nov, 2003 1 commit
  4. 25 Nov, 2003 2 commits
  5. 24 Nov, 2003 2 commits
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · d0bce630
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0
      
      d0bce630
    • unknown's avatar
      Changed "query" into "statement", and corrected SQL state code (04000->0A000). · 14be7a81
      unknown authored
      
      include/mysqld_error.h:
        Changed "query" into "statement".
      include/sql_state.h:
        Changed "query" into "statement", and corrected SQL state code.
      mysql-test/r/sp-error.result:
        Changed "query" into "statement", and corrected SQL state code.
      sql/share/czech/errmsg.txt:
        Changed "query" into "statement".
      sql/share/danish/errmsg.txt:
        Changed "query" into "statement".
      sql/share/dutch/errmsg.txt:
        Changed "query" into "statement".
      sql/share/english/errmsg.txt:
        Changed "query" into "statement".
      sql/share/estonian/errmsg.txt:
        Changed "query" into "statement".
      sql/share/french/errmsg.txt:
        Changed "query" into "statement".
      sql/share/german/errmsg.txt:
        Changed "query" into "statement".
      sql/share/greek/errmsg.txt:
        Changed "query" into "statement".
      sql/share/hungarian/errmsg.txt:
        Changed "query" into "statement".
      sql/share/italian/errmsg.txt:
        Changed "query" into "statement".
      sql/share/japanese/errmsg.txt:
        Changed "query" into "statement".
      sql/share/korean/errmsg.txt:
        Changed "query" into "statement".
      sql/share/norwegian-ny/errmsg.txt:
        Changed "query" into "statement".
      sql/share/norwegian/errmsg.txt:
        Changed "query" into "statement".
      sql/share/polish/errmsg.txt:
        Changed "query" into "statement".
      sql/share/portuguese/errmsg.txt:
        Changed "query" into "statement".
      sql/share/romanian/errmsg.txt:
        Changed "query" into "statement".
      sql/share/russian/errmsg.txt:
        Changed "query" into "statement".
      sql/share/serbian/errmsg.txt:
        Changed "query" into "statement".
      sql/share/slovak/errmsg.txt:
        Changed "query" into "statement".
      sql/share/spanish/errmsg.txt:
        Changed "query" into "statement".
      sql/share/swedish/errmsg.txt:
        Changed "query" into "statement".
      sql/share/ukrainian/errmsg.txt:
        Changed "query" into "statement".
      sql/sql_yacc.yy:
        Changed "query" into "statement".
      14be7a81
  6. 23 Nov, 2003 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7d3b43b1
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-5.0-root
      
      
      sql/sql_class.cc:
        Auto merged
      7d3b43b1
    • unknown's avatar
      Cleanups: · 618f09b5
      unknown authored
      - unused variable THD::con_root removed
      - we don't need to bzero(&warn_root) just before init_alloc_root(&warn_root)
      - we don't need to bzero(&transaction.mem_root) because we 
        bzero(&transaction) later in THD::THD
      - we don't need to free thd->mem_root thd->transaction.mem_root
        in handle_one_connection because they are freed in THD::~THD
        which is called in end_thread later 
      
      
      
      sql/sql_class.cc:
        Cleanups:
        - unused variable THD::con_root removed
        - we don't need to bzero(&warn_root) just before init_alloc_root(&warn_root)
        - we don't need to bzero(&transaction.mem_root) because we 
          bzero(&transaction) later in THD::THD
      sql/sql_class.h:
        Unused variable THD::con_root removed
      sql/sql_parse.cc:
        we don't need to free thd->mem_root and thd->transaction.mem_root
        because they are freed in THD::~THD
      618f09b5
  7. 21 Nov, 2003 9 commits
  8. 20 Nov, 2003 5 commits
    • unknown's avatar
      Merged, most likely needs post-merge fix · cf763a3f
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/opt_range.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_test.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/opt_range.cc:
        Merged
      sql/sql_select.cc:
        Merged
      cf763a3f
    • unknown's avatar
      logging_ok: · 765ee126
      unknown authored
        Logging to logging@openlogging.org accepted
      sql_union.cc, sql_select.cc, opt_range.h, opt_range.cc, opt_ft.h:
        Post-merge fixes
      Many files:
        new file
      
      
      sql/opt_ft.h:
        Post-merge fixes
      sql/opt_range.cc:
        Post-merge fixes
      sql/opt_range.h:
        Post-merge fixes
      sql/sql_select.cc:
        Post-merge fixes
      sql/sql_union.cc:
        Post-merge fixes
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      765ee126
    • unknown's avatar
      Fixed BUG#1874: Don't call fix_fields() indiscriminately, it resets null_value · de0eec17
      unknown authored
      for some items, which made aggregates like MIN(), MAX() and SUM() fail.
      
      
      mysql-test/r/sp.result:
        Test case for aggregate functions in SELECT INTO. (BUG#1874)
      mysql-test/t/sp.test:
        Test case for aggregate functions in SELECT INTO. (BUG#1874)
      de0eec17
    • unknown's avatar
      Handle null values correctly in SP local variables. · f5075e68
      unknown authored
      
      mysql-test/r/sp.result:
        Test for handling of null values.
      mysql-test/t/sp.test:
        Test for handling of null values.
      sql/item.h:
        Update null_value correctly in Item_splocal.
      f5075e68
    • unknown's avatar
      Bugfixes in SHOW CREATE PROCEDURE/FUNCTION and SHOW PROCEDURE/FUNCTION STATUS; · d9e6810e
      unknown authored
      - dropped routines should not show up in status
      - error handling for non-existing routines
      
      + some cleanup.
      
      
      mysql-test/r/sp-error.result:
        Test SHOW CREATE PROCEDURE for non-existing procedure.
      mysql-test/r/sp.result:
        Additional SHOW FUNCTION/PROCEDURE STATUS calls (make sure they don't show
        after being dropped).
      mysql-test/t/sp-error.test:
        Test SHOW CREATE PROCEDURE for non-existing procedure.
      mysql-test/t/sp.test:
        Additional SHOW FUNCTION/PROCEDURE STATUS calls (make sure they don't show
        after being dropped).
      sql/sp.cc:
        Fixed bug in SHOW ... STATUS after a routine has been dropped,
        and fixed the error return codes (for correct error handling).
        Also some general cleanup.
      sql/sp.h:
        Fixed prefix for external functions (should be sp_, not db_).
      sql/sql_parse.cc:
        Fixed error handling in SHOW CREATE PROCEDURE/FUNCTION.
      d9e6810e
  9. 19 Nov, 2003 6 commits
    • unknown's avatar
      Post-merge fixes. · 5603426a
      unknown authored
      5603426a
    • unknown's avatar
      Merging 4.1->5.0. · 5ea62070
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/triggers/post-commit:
        Auto merged
      client/mysql.cc:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisamdef.h:
        Auto merged
      mysql-test/r/rpl_temporary.result:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.h:
        Auto merged
      5ea62070
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · fbc40977
      unknown authored
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
      
      fbc40977
    • unknown's avatar
      cp850.xml: · 5113e9fb
      unknown authored
        There were errors in cp850: in unicode, ctype and sort arrays
      
      
      sql/share/charsets/cp850.xml:
        There were errors in cp850: in unicode, ctype and sort arrays
      5113e9fb
    • unknown's avatar
      Fixed BUG#1862 (flush table in SPs didn't work). · 1017f0cb
      unknown authored
      Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
      might work, SELECT INTO with not row now gives a "no data" warning (instead of
      the "empty query" error), etc.
      Updated test cases accordingly.
      
      
      mysql-test/r/sp-error.result:
        Corrected security syntax for alter/create procedure.
      mysql-test/r/sp.result:
        Corrected security syntax for alter/create procedure.
        New tests for setting local variables to null,
        bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
        and corrected "no data" warning for SELECT INTO with no rows.
      mysql-test/t/sp-error.test:
        Corrected security syntax for alter/create procedure.
      mysql-test/t/sp.test:
        Corrected security syntax for alter/create procedure.
        New tests for setting local variables to null,
        bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
        and corrected "no data" warning for SELECT INTO with no rows.
      sql/lex.h:
        Added SQL_SYM (and added a few _SYM suffixes for new symbols).
      sql/sp_head.cc:
        Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
        up in the wrong memroot).
        Catch errors and warnings even if return values is 0 from sub-statements.
        Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
        Set old table pointers to NULL after sub-statement call (since all tables are
        closed).
      sql/sql_class.cc:
        Corrected error message when no rows return by a SELECT INTO var; should
        be a "no data" warning.
      sql/sql_lex.h:
        Have to store the original table_list first pointer for some
        sub-statements in SPs.
      sql/sql_yacc.yy:
        Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
        suffixes, and fixed valgrind complaints for SP COMMENTs.
        (Also removed some now irrelevant comments.)
      1017f0cb
    • unknown's avatar
      Fixed C syntax error in mysys/mf_keycache.c. · a7534800
      unknown authored
      
      mysys/mf_keycache.c:
        Fixed C syntax error.
      a7534800
  10. 18 Nov, 2003 8 commits