1. 15 Sep, 2004 1 commit
  2. 14 Sep, 2004 1 commit
    • unknown's avatar
      Fixed a couple of bugs. · 48b4ba62
      unknown authored
      
      sql/ha_ndbcluster.cc:
        Changed some old global variables to per thread specific in ha_ndbcluster.cc
      sql/sql_help.cc:
        Added parenthesis.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      48b4ba62
  3. 13 Sep, 2004 3 commits
    • unknown's avatar
      Two small fixes to make -debug version usable again. · 21eb87c5
      unknown authored
      
      include/my_sys.h:
        Temporaly reverting Monty's optimization of clear_alloc_root() since it makes -debug server
        unusable.
      sql/sql_select.cc:
        After merge fix. Now deletion is done outside of handle_select().
        (We fixed the same issue with deletion of LEX::result in 4.1 for prepared statements
         but in more general way).
      21eb87c5
    • unknown's avatar
      Merge. · 2bbed0d2
      unknown authored
      
      include/my_sys.h:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/sql_class.h:
        Merge
      2bbed0d2
    • unknown's avatar
      9c00cf35
  4. 11 Sep, 2004 4 commits
  5. 10 Sep, 2004 13 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 081f604d
      unknown authored
      into mysql.com:/home/cps/mysql/devel/im/default_patch/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      081f604d
    • unknown's avatar
      Fixed a problem causing load_defaults not to accept some command-line · 3169e04c
      unknown authored
      options.
      
      
      mysys/default.c:
        Fixed search_files function to return the number of used arguments
        properly.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      3169e04c
    • unknown's avatar
      Fix bad output in SHOW CREATE VIEW, update affected · b6afce2f
      unknown authored
      test result.
      
      
      mysql-test/r/view.result:
        Update test result to match sql_show.cc change.
      sql/sql_show.cc:
        Fix bad output in SHOW CREATE VIEW.
      b6afce2f
    • unknown's avatar
      view with WHERE in nested join (BUG#5511) · 5593c48b
      unknown authored
      
      mysql-test/r/view.result:
        view with WHERE in nested join
      mysql-test/t/view.test:
        view with WHERE in nested join
      sql/table.cc:
        fixed merging of VIEW
      5593c48b
    • unknown's avatar
      sql_yacc.yy: · 28f30f55
      unknown authored
        Make "FRAC_SECOND"/"SQL_TSI_FRAC_SECOND" non-reserved words,
        must like "SECOND"/"SQL_TSI_SECOND", "MINUTE"/"SQL_TSI_MINUTE",
        etc.
        Will wait for okay to push. (It doesn't break any tests.)
      
      
      sql/sql_yacc.yy:
        Make "FRAC_SECOND"/"SQL_TSI_FRAC_SECOND" non-reserved words,
        must like "SECOND"/"SQL_TSI_SECOND", "MINUTE"/"SQL_TSI_MINUTE",
        etc.
      28f30f55
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 73c15338
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0-merge
      
      73c15338
    • unknown's avatar
      Fixed BUG#4941: Stored procedure crash fetching null value into variable. · 7f1a4671
      unknown authored
      
      mysql-test/r/sp.result:
        New test case for BUG#4941.
      mysql-test/t/sp.test:
        New test case for BUG#4941.
      sql/protocol_cursor.cc:
        Handle null values.
      sql/sp_rcontext.cc:
        Handle null values.
      7f1a4671
    • unknown's avatar
      post merge fix · a0b7ff7f
      unknown authored
      a0b7ff7f
    • unknown's avatar
      Merge · 28d840f6
      unknown authored
      
      sql/sql_handler.cc:
        Auto merged
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      28d840f6
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 01b88943
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      01b88943
    • unknown's avatar
      thd pointer fixed · 1c373f7c
      unknown authored
      
      BitKeeper/etc/ignore:
        Added libmysqld/sql_trigger.cc to the ignore list
      mysql-test/r/merge.result:
        fix of test
      1c373f7c
    • unknown's avatar
      Fixed BUG#3294: Stored procedure crash if table dropped before use. · e5caf6e5
      unknown authored
        Dropping the table was not the real problem, the problem was with errors
        occuring within error handlers.
      
      
      mysql-test/r/sp-error.result:
        New test case for BUG#3294.
      mysql-test/t/sp-error.test:
        New test case for BUG#3294.
      sql/sp_head.cc:
        Use hreturn instruction both for continue and exit handlers (a special case
        of a jump).
      sql/sp_head.h:
        Use hreturn instruction both for continue and exit handlers (a special case
        of a jump).
      sql/sp_rcontext.cc:
        Keep track on if we're in a handler already, for error handling.
      sql/sp_rcontext.h:
        Keep track on if we're in a handler already, for error handling.
      sql/sql_yacc.yy:
        Use hreturn instruction both for continue and exit handlers (a special case
        of a jump).
      e5caf6e5
    • unknown's avatar
      Fixed --with-embedded builds. · 3678fe2a
      unknown authored
      Added previously missing sql_trigger.cc file to embedded library.
      
      
      BitKeeper/etc/ignore:
        Added libmysqld/sql_trigger.cc to the ignore list
      libmysqld/Makefile.am:
        Added previously sql_trigger.cc file to embedded library.
      3678fe2a
  6. 09 Sep, 2004 10 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · f863f8dc
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.h:
        Auto merged
      f863f8dc
    • unknown's avatar
      post merge fixes · 04e9cd42
      unknown authored
      
      mysql-test/t/merge.test:
        additional test
      sql/item.h:
        parameter to detect need of saving view field names
      sql/item_subselect.cc:
        arena fix
        used nearest thd pointer
      sql/item_sum.cc:
        after merge fix
      sql/mysql_priv.h:
        after merge fix
      sql/sql_base.cc:
        fixed unique test
        fixed postmerge arena mamgement
      sql/sql_class.h:
        mey method to detect conventional execution
      sql/sql_handler.cc:
        new parameter
      sql/sql_lex.cc:
        fixed postmerge arena mamgement
      sql/sql_parse.cc:
        fixed unique test
      sql/sql_select.cc:
        fixed postmerge arena mamgement
      sql/sql_union.cc:
        fixed postmerge arena mamgement
      sql/sql_view.cc:
        fixed postmerge arena mamgement
      sql/table.cc:
        fixed postmerge arena mamgement
      04e9cd42
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · aa732512
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-1218-a
      
      
      sql/item_func.h:
        Auto merged
      aa732512
    • unknown's avatar
      After merge fixes for WL#1218 "Triggers" · c5357dd6
      unknown authored
      
      mysql-test/t/trigger.test:
        After merge fix, error codes corrected.
      sql/sp_head.cc:
        After mrege fix. Fixed typo.
      sql/sql_trigger.cc:
        After merge fix. wait_if_gloabl_read_lock has one more argument now.
      c5357dd6
    • unknown's avatar
      Fixed BUG#4487: Stored procedure connection aborted if uninitialized char. · 93903260
      unknown authored
      
      mysql-test/r/sp.result:
        New test case for BUG#4487.
      mysql-test/t/sp.test:
        New test case for BUG#4487.
      sql/item_func.h:
        Propagate null_value properly in sp functions.
      93903260
    • unknown's avatar
      Yet another manual merge with main tree for patch for WL#1218 "Triggers" · 74f0d860
      unknown authored
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/share/dutch/errmsg.txt:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/estonian/errmsg.txt:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/german/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/russian/errmsg.txt:
        Auto merged
      sql/share/serbian/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      include/mysqld_error.h:
        Manual merge.
      sql/Makefile.am:
        Manual merge.
      sql/mysql_priv.h:
        Manual merge.
      sql/sp_head.cc:
        Manual merge.
      sql/sql_lex.cc:
        Manual merge.
      sql/sql_yacc.yy:
        Manual merge.
      74f0d860
    • unknown's avatar
      merge · 4d64a5a6
      unknown authored
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      4d64a5a6
    • unknown's avatar
      Update after merge · 79637b2c
      unknown authored
      79637b2c
    • unknown's avatar
      Merge on pull · 1de7da1a
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/my_sys.h:
        Auto merged
      mysql-test/r/func_in.result:
        Auto merged
      1de7da1a
    • unknown's avatar
      After merge fixes of merge with 4.1 that included the new arena code. · 74e8c6af
      unknown authored
      Fixed (together with Guilhem) bugs in mysqlbinlog regarding --offset
      Prefix addresses with 0x for easier comparisons of debug logs
      Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
      This fix changed some 'index' queries to 'range' queries in the test suite
      Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
      This fix removed of a lot of 'Using where' notes in the test suite.
      Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
      Give NOTE instead of WARNING for safe field-type conversions
      
      
      Makefile.am:
        Don't automaticly update files from bk
      client/mysqlbinlog.cc:
        Merge with 4.1 (+ apply bug fixes for --offset and --start-position)
      include/my_sys.h:
        Faster clear_alloc_root()
      mysql-test/r/bdb.result:
        Updated results after merge
      mysql-test/r/create.result:
        Updated results after merge
      mysql-test/r/func_group.result:
        Updated results after merge
      mysql-test/r/func_if.result:
        Updated results after merge
      mysql-test/r/heap_btree.result:
        Updated results after merge
      mysql-test/r/index_merge.result:
        Updated results after merge
      mysql-test/r/index_merge_ror.result:
        Updated results after merge
      mysql-test/r/innodb.result:
        Updated results after merge
      mysql-test/r/join_outer.result:
        Updated results after merge
      mysql-test/r/mysqlbinlog2.result:
        Updated results after merge
      mysql-test/r/negation_elimination.result:
        Updated results after merge
      mysql-test/r/null.result:
        Updated results after merge
        Added more tests
      mysql-test/r/null_key.result:
        Updated results after merge
        Added more tests
      mysql-test/r/order_by.result:
        Updated results after merge
      mysql-test/r/range.result:
        Updated results after merge
        Added more tests
      mysql-test/r/rpl_charset.result:
        Updated results after merge
      mysql-test/r/sp-error.result:
        Updated results after merge
      mysql-test/r/sp.result:
        Updated results after merge
        Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle
      mysql-test/r/type_blob.result:
        Updated results after merge
        (Some warnings are now notes)
      mysql-test/r/user_var.result:
        Updated results after merge
        Added more tests
      mysql-test/r/variables.result:
        Updated results after merge
      mysql-test/r/view.result:
        Updated results after merge
      mysql-test/t/mysqlbinlog2.test:
        Updated tests to use new positions
      mysql-test/t/null.test:
        More tests
      mysql-test/t/null_key.test:
        More tests
      mysql-test/t/range.test:
        More tests
      mysql-test/t/rpl_charset.test:
        Avoid big diffs in the future if tests changes
      mysql-test/t/sp-error.test:
        Updated error numbers
      mysql-test/t/sp-security.test:
        Updated error numbers
      mysql-test/t/sp.test:
        Updated results after merge
        Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle
      mysql-test/t/user_var.test:
        More tests
      mysql-test/t/view.test:
        Updated error numbers
      mysys/my_alloc.c:
        Write into debug log the address of the allocated area
      sql/ha_isam.cc:
        Prefix addresses with 0x for easier comparisons of debug logs
      sql/ha_myisam.cc:
        Prefix addresses with 0x for easier comparisons of debug logs
      sql/ha_ndbcluster.cc:
        Add missing enum to switch
      sql/handler.cc:
        remove compiler warning
      sql/item.cc:
        More debugging
        Simple cleanup
      sql/item.h:
        Move Item::cleanup() to item.cc
      sql/item_cmpfunc.cc:
        Fix arena code
      sql/item_subselect.cc:
        After merge fixes
      sql/item_subselect.h:
        After merge fixes
      sql/item_sum.cc:
        Updated comment
      sql/log_event.cc:
        Remove wrong test
      sql/mysql_priv.h:
        Indentation fixes
      sql/mysqld.cc:
        After merge fixes
        Added 0x to pointers in debug log
      sql/opt_range.cc:
        Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
        This fix changed some 'index' queries to 'range' queries in the test suite
      sql/set_var.cc:
        Indentation fixes
      sql/sp_head.cc:
        Set state to INITIALIZED to make SP work with new arena code
      sql/sql_base.cc:
        After merge fixes
      sql/sql_class.cc:
        More debugging
        Use clear_alloc_root() instead of init_alloc_root() as the former is faster
      sql/sql_class.h:
        New method 'only_prepare()'
      sql/sql_lex.cc:
        After merge fixes
      sql/sql_lex.h:
        After merge fixes
      sql/sql_parse.cc:
        Fix for timezone tables. (The old way to add timezone tables to global list in 'create_total_list' doesn't work anymore)
        Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
      sql/sql_prepare.cc:
        After merge fixes
      sql/sql_select.cc:
        Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
        This fix removed of a lot of 'Using where' notes in the test suite
      sql/sql_table.cc:
        Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
      sql/sql_union.cc:
        After merge fix
      sql/sql_view.cc:
        After merge fix
      sql/table.cc:
        After merge fix
      sql/tztime.cc:
        Update timezone table handling to use new table lists structure
      sql/tztime.h:
        Update timezone table handling to use new table lists structure
      sql/unireg.cc:
        Use 0x before pointers
      74e8c6af
  7. 08 Sep, 2004 5 commits
    • unknown's avatar
      WL#1218 "Triggers" · ccbcf94d
      unknown authored
      After review and after merge fixes.
      
      
      mysql-test/t/trigger.test:
        After merge fix. Updated error codes.
      sql/sp_head.cc:
        After merge fix.
        To give some chances for functions/triggers we have to close tables during sp_instr_* 
        execution only if we have opened them before.
      sql/sp_head.h:
        After merge fix. sp_instr constructor now takes one more argument.
      sql/sql_trigger.cc:
        After merge and review fixes.
        Some variable renaming and optimizations.
      sql/sql_yacc.yy:
        After merge fixes.
        sp_instr_* classes now require sp context as constructor parameter.
        Also we should be careful with adding table for which we are creating trigger to table 
        list. Some elements in trigger body can damage LEX::query_tables and so we should add this
        table to list only after parsing trigger body.
      ccbcf94d
    • unknown's avatar
      Fixed BUG#5000: SPs can be created with no default database. · b1fe1b74
      unknown authored
        Easy to prevent crash, but the question was how to treat this case?
        We ended up implementing the "global" SPs (i.e. with no associated
        db), which were planned but left unresolved when SPs moved into dbs.
        So now things like "call .p()" work too.
      
      
      mysql-test/r/sp-error.result:
        New test case for BUG#5000, and "global" SPs in general.
      mysql-test/t/sp-error.test:
        New test case for BUG#5000, and "global" SPs in general.
      sql/sp.cc:
        Prevent crash when the new db is null.
      sql/sp_head.cc:
        Don't set the db part of the name to thd->db, we have already set it correctly
        in the provided name struct.
        Also, don't attempt to change "no-db" when executing an SP.
      sql/sql_yacc.yy:
        Added support for the "global SP" syntax, e.g ".p()".
      b1fe1b74
    • unknown's avatar
      Fixed BUG#5258: Stored procedure modified date is 0000-00-00. · 82503c58
      unknown authored
        Althought techically not a but (as it's functioning as designed),
        it was decided that the design should be changed. Some users have
        a problem with dates being '0000-00-00' and the SQL standard specifies
        that the modification date should be the same as the creation date
        at creation.
      
      
      mysql-test/r/sp.result:
        New test case for BUG#5258.
      mysql-test/t/sp.test:
        New test case for BUG#5258.
      sql/sp.cc:
        Set the modification time at creation too.
      82503c58
    • unknown's avatar
      Merge of changes from the main tree to tree for WL#1218 "Triggers". · c7fdd679
      unknown authored
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/parse_file.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      include/mysqld_error.h:
        Manual merge.
      sql/mysql_priv.h:
        Manual merge.
      sql/share/czech/errmsg.txt:
        Manual merge.
      sql/share/danish/errmsg.txt:
        Manual merge.
      sql/share/dutch/errmsg.txt:
        Manual merge.
      sql/share/english/errmsg.txt:
        Manual merge.
      sql/share/estonian/errmsg.txt:
        Manual merge.
      sql/share/french/errmsg.txt:
        Manual merge.
      sql/share/german/errmsg.txt:
        Manual merge.
      sql/share/greek/errmsg.txt:
        Manual merge.
      sql/share/hungarian/errmsg.txt:
        Manual merge.
      sql/share/italian/errmsg.txt:
        Manual merge.
      sql/share/japanese/errmsg.txt:
        Manual merge.
      sql/share/korean/errmsg.txt:
        Manual merge.
      sql/share/norwegian-ny/errmsg.txt:
        Manual merge.
      sql/share/norwegian/errmsg.txt:
        Manual merge.
      sql/share/polish/errmsg.txt:
        Manual merge.
      sql/share/portuguese/errmsg.txt:
        Manual merge.
      sql/share/romanian/errmsg.txt:
        Manual merge.
      sql/share/russian/errmsg.txt:
        Manual merge.
      sql/share/serbian/errmsg.txt:
        Manual merge.
      sql/share/slovak/errmsg.txt:
        Manual merge.
      sql/share/spanish/errmsg.txt:
        Manual merge.
      sql/share/swedish/errmsg.txt:
        Manual merge.
      sql/share/ukrainian/errmsg.txt:
        Manual merge.
      sql/sp_head.cc:
        Manual merge.
      c7fdd679
    • unknown's avatar
      test of updating and fetching from the same table check (BUG##5157) · cbdbccaf
      unknown authored
      
      mysql-test/r/lowercase_view.result:
        test of updating and fetching from the same table check
      mysql-test/r/view.result:
        test of updating and fetching from the same table check
      mysql-test/t/lowercase_view.test:
        test of updating and fetching from the same table check
      mysql-test/t/view.test:
        test of updating and fetching from the same table check
      sql/mysql_priv.h:
        unique table test
      sql/sql_base.cc:
        unique table test which take into account views added
      sql/sql_delete.cc:
        unique table test which take into account views added
      sql/sql_insert.cc:
        unique table test which take into account views added
      sql/sql_parse.cc:
        unique table test which take into account views added
      sql/sql_update.cc:
        unique table test which take into account views added
      sql/sql_view.cc:
        unique table test which take into account views added
      sql/table.h:
        save next independent (do not belong to current view) table
      cbdbccaf
  8. 07 Sep, 2004 3 commits