1. 12 Jul, 2005 3 commits
  2. 11 Jul, 2005 17 commits
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · ed244881
      unknown authored
      into  mysql.com:/home/pem/work/mysql-5.0
      
      
      ed244881
    • unknown's avatar
      Post-review fix. · cc2ad349
      unknown authored
      
      sql/sql_yacc.yy:
        Added explanation to comment.
      cc2ad349
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 · b3e420b3
      unknown authored
      into  linux.site:/home/reggie/bk/mysql-5.0
      
      
      b3e420b3
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · e9f74b0a
      unknown authored
      into  mysql.com:/home/pem/work/mysql-5.0
      
      
      e9f74b0a
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6c8004f5
      unknown authored
      into brian-akers-computer.local:/Users/brian/mysql/comment-5.0
      
      
      6c8004f5
    • unknown's avatar
      Added a test for glibtoolize so that the autoconf tools that come installed on... · 96035298
      unknown authored
      Added a test for glibtoolize so that the autoconf tools that come installed on OSX will work fine (so no need to replace them). 
      
      
      BUILD/autorun.sh:
        Added a test for glibtoolize. This will fix issues with compiling on OSX
      96035298
    • unknown's avatar
      cmd-line-utils/libedit/chared.c: Fix compile problem caused by use of "uint"... · c580293e
      unknown authored
      cmd-line-utils/libedit/chared.c: Fix compile problem caused by use of "uint" which is undefined on QNX.
      
      
      cmd-line-utils/libedit/chared.c:
        Re-apply vva's fix:
        cmd-line-utils/libedit/chared.c@1.4, 2004-08-31 17:50:59+05:00, vva@eagle.mysql.r18.ru
          discarded using of uint because it's undefined on qnx
      c580293e
    • unknown's avatar
      Updated system_mysql_db.result after mysql.proc definition changes. · 990a97d4
      unknown authored
      
      mysql-test/r/system_mysql_db.result:
        Updated result after mysql.proc definition changes.
      990a97d4
    • unknown's avatar
      ha_archive.cc: · 313bda9e
      unknown authored
        Added cast to fix windows compile error
      
      
      sql/examples/ha_archive.cc:
        Added cast to fix windows compile error
      313bda9e
    • unknown's avatar
      field_conv.cc: · b18b97aa
      unknown authored
        Identation fix
      
      
      sql/field_conv.cc:
        Identation fix
      b18b97aa
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · eb314af4
      unknown authored
      into  mysql.com:/home/pem/work/mysql-5.0
      
      
      mysql-test/r/sp-error.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp-error.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      eb314af4
    • unknown's avatar
      sql_insert.cc: · 799299a5
      unknown authored
        Added cast to bool to fix windows compile problem
      
      
      sql/sql_insert.cc:
        Added cast to bool to fix windows compile problem
      799299a5
    • unknown's avatar
      field_conv.cc: · dce0304a
      unknown authored
        Bug#11591
        CHAR column with utf8 does not work properly
        (more chars than expected)
        do_cut_string didn't call well_formed_length,
        and copied all data, which was wrong in the
        case of multibyte character set.
      ctype_utf8.result, ctype_utf8.test:
        adding test case
      
      
      sql/field_conv.cc:
        Bug#11591
        CHAR column with utf8 does not work properly
        (more chars than expected)
        do_cut_string didn't call well_formed_length,
        and copied all data, which was wrong in the
        case of multibyte character set.
      mysql-test/t/ctype_utf8.test:
        adding test case
      mysql-test/r/ctype_utf8.result:
        adding test caser
      dce0304a
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 83772bc5
      unknown authored
      into brian-akers-computer.local:/Users/brian/mysql/optimize-5.0
      
      
      sql/examples/ha_archive.h:
        Auto merged
      83772bc5
    • unknown's avatar
      Fixed 32bit issue, reworked error logic for open tables, and redid the repair... · a339be0f
      unknown authored
      Fixed 32bit issue, reworked error logic for open tables, and redid the repair table code so that it uses the extended optimize table code.
      
      
      sql/examples/ha_archive.cc:
        Fixed issue with 32bit systems giving warnings on bit shift (this is due to the fix by Jim to change to ha_rows). The error logic for opening a table was reworked after studing up on a reported issue. It has been reworked to create a share in all situations. The repair table will just have to figure everything out or toss its own error. The read only filesystem and permission denied problems were solved. Repair table code now rebuilds with the new optimize table extended code (so it no longer does the work itself).
      a339be0f
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6951bad6
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      6951bad6
    • unknown's avatar
      Refactoring of write_row() into two parts to allow future additions. Also... · 46f0327e
      unknown authored
      Refactoring of write_row() into two parts to allow future additions. Also rewrote the OPTIMIZE TABLE code, to add new extended optimize. This form of optimize rebuilds not only the file, but each individual row. 
      
      
      mysql-test/r/archive.result:
        Update results file for new OPTIMIZE TABLE <foo> EXTENDED command.
      mysql-test/t/archive.test:
        Added new test for extended optimize
      sql/examples/ha_archive.cc:
        Refactored write_row code into two parts. This will allow me to abstract it out once I add in new row format. This also allowed code sharing for the new optimize command (which will be used for new repair code).
      sql/examples/ha_archive.h:
        Added new real_write_row() method for writing out rows.
      46f0327e
  3. 10 Jul, 2005 1 commit
  4. 09 Jul, 2005 5 commits
    • unknown's avatar
      Manual fixes after merging patch for bug #8406 "Triggers crash if referencing · d0c69a82
      unknown authored
      a table" with main tree.
      
      
      mysql-test/r/trigger.result:
        Temporalily disable part of test which exposes bug #11554 (work on which is in
        progress).
      mysql-test/t/sp-error.test:
        After merge fix.
          Fixed wrong delimiter command.
      mysql-test/t/trigger.test:
        Temporalily disable part of test which exposes bug #11554 (work on which is in
        progress).
      sql/sp.cc:
        After merge fix.
          Item_arena was renamed to Query_arena.
      sql/sp.h:
        After merge fix.
          Item_arena was renamed to Query_arena.
      sql/sql_lex.cc:
        After merge fix.
          LEX::spfuns/spprocs hashes were replaces with one LEX::sroutines hash.
      d0c69a82
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · eef5f17b
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg8406
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      mysql-test/r/sp-error.result:
        Manual merge.
      mysql-test/t/sp-error.test:
        Manual merge.
      sql/sp_head.cc:
        Manual merge.
      sql/sql_yacc.yy:
        Manual merge.
      eef5f17b
    • unknown's avatar
      Enable support of access to tables from triggers. Thus fix bug #8406 "Triggers · 14b1f91b
      unknown authored
      crash if referencing a table" and several other related bugs.
      Fix for bug #11834 "Re-execution of prepared statement with dropped function
      crashes server." which was spotted during work on previous bugs.
      
      Also couple of nice cleanups:
      - Replaced two separate hashes for stored routines used by statement with one.
      - Now instead of doing one pass through all routines used in statement for
        caching them and then doing another pass for adding their tables to table
        list, we do only one pass during which do both things.
      
      
      mysql-test/r/sp-error.result:
        Added test for bug #11834 "Re-execution of prepared statement with dropped
        function crashes server" also covering handling of prepared statements
        which use stored functions but does not require prelocking.
      mysql-test/r/sp.result:
        Updated test for LOCK TABLES with views in table list.
        (Old version of statement used in this test will work ok now, since prelocking
         algorithm was tuned and will lock only one multi-set of tables for each routine
         even if this routine is used in several different views).
      mysql-test/r/trigger.result:
        Added several tests for triggers using tables.
      mysql-test/t/sp-error.test:
        Added test for bug #11834 "Re-execution of prepared statement with dropped
        function crashes server" also covering handling of prepared statements
        which use stored functions but does not require prelocking.
      mysql-test/t/sp.test:
        Updated comment about recursive views to reflect current situation.
        Updated test for LOCK TABLES with views in table list.
        (Old version of statement used in this test will work ok now, since prelocking
         algorithm was tuned and will lock only one multi-set of tables for each routine
         even if this routine is used in several different views).
      mysql-test/t/trigger.test:
        Added several tests for triggers using tables.
      sql/item_func.cc:
        Item_func_sp::cleanup():
          By next statement execution stored function can be dropped or altered so
          we can't assume that sp_head object for it will be still valid.
      sql/sp.cc:
        - Added Sroutine_hash_entry structure that represents element in the set of
          stored routines used by statement or routine. We can't as before use
          LEX_STRING for this purprose because we want link all elements of this set
          in list.
        - Replaced sp_add_to_hash() with sp_add_used_routine() which takes into account
          that now we use one hash for stored routines used by statement instead of two
          and which mantains list linking all elelemnts in this hash.
        - Renamed sp_merge_hash() to sp_update_sp_used_routines().
        - Introduced sp_update_stmt_used_routines() for adding elements to the set of
          routines used by statement from another similar set for statement or routine.
          This function will also mantain list linking elements of destination set.
        - Now instead of one sp_cache_routines() function we have family of 
          sp_cache_routines_and_add_tables() functions which are also responsible for
          adding tables used by routines being cached to statement table list. Nice
          optimization - thanks to list linking all elements in the hash of routines
          used by statement we don't need to perform several iterations over this hash
          (as it was before in cases when we have added new elements to it).
      sql/sp.h:
        Added declarations of functions used for manipulations with set (hash) of stored
        routines used by statement.
      sql/sp_head.cc:
        sp_name::init_qname():
          Now sp_name also holds key identifying routine in the set (hash) of
          stored routines used by statement. 
        sp_head:
          Instead of two separate hashes sp_funs/m_spprocs representing sets of stored
          routines used by this routine we use one hash - m_sroutines. 
        sp_instr_set_trigger_field:
          Added support for subqueries in assignments to row accessors in triggers.
        Removed definition of sp_add_sp_tables_to_table_list() and auxilary functions 
        since now we don't have separate stage on which we add tables used by routines
        used by statement to table list for prelocking. We do it on the same stage as
        we load those routines in SP cache. So all this functionality moved to
        sp_cache_routines_and_add_tables() family of functions.
      sql/sp_head.h:
        sp_name:
          Now this class also holds key identifying routine in the set (hash) of stored
          routines used by statement. 
        sp_head:
          Instead of two separate hashes sp_funs/m_spprocs representing sets of stored
          routines used by this routine we use one hash - m_sroutines. 
        sp_instr_set_trigger_field:
          Added support for subqueries in assignments to row accessors in triggers.
        Removed declaration of sp_add_sp_tables_to_table_list() since now we don't have
        separate stage on which we add tables used by routines used by statement to
        table list for prelocking. We do it on the same stage as we load those routines
        in SP cache.
      sql/sql_base.cc:
        open_tables():
        - LEX::spfuns/spprocs hashes were replaced with one LEX::sroutines hash.
        - Now instead of doing one pass through all routines used in statement for
          caching them and then doing another pass for adding their tables to table
          list, we do only one pass during which do both things. It is easy to do
          since all routines in the set of routines used by statement are linked in
          the list. This also allows us to calculate table list for prelocking more
          precisely.
        - Now triggers properly inform prelocking algorithm about tables they use.
      sql/sql_lex.cc:
        lex_start():
          Replaced LEX::spfuns/spprocs with with one LEX::sroutines hash.
          Added LEX::sroutines_list list linking all elements in this hash.
        st_lex::st_lex():
          Moved definition of LEX constructor to sql_lex.cc file to be able
          use sp_sroutine_key declaration from sp.h in it.
      sql/sql_lex.h:
        LEX:
          Replaced two separate hashes for stored routines used by statement with one.
          Added list linking all elements in this hash to be able to iterate through all
          elements and add new elements to this hash at the same time.
          Moved constructor definition to sql_lex.cc.
      sql/sql_parse.cc:
        mysql_execute_command():
          Replaced LEX::spfuns/spprocs with one LEX::sroutines hash.
      sql/sql_trigger.cc:
        Added missing GNU GPL notice.
        Table_triggers_list::check_n_load()
          Added initialization of sroutines_key which stores key representing
          triggers of this table in the set (hash) of routines used by this statement.
      sql/sql_trigger.h:
        Added missing GNU GPL notice.
        Table_triggers_list:
          Added sroutines_key member to store key representing triggers of this
          table in the set (hash) of routines used by this statement.
          Declared sp_cache_routines_and_add_tables_for_triggers() as friend since
          it needs access to sroutines_key and trigger bodies.
      sql/sql_yacc.yy:
        - Now we use sp_add_used_routine() instead of sp_add_to_hash() for adding
          elements to the set of stored routines used in statement.
        - Enabled support of subqueries as right sides in assignments to triggers' row
          accessors.
      14b1f91b
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 99c3faa5
      unknown authored
      into  zim.(none):/home/brian/mysql/foo-5.0
      
      
      99c3faa5
    • unknown's avatar
      Fixed indention issue, made scan_rows an ha_rows type, and fixed show table... · 3096eac9
      unknown authored
      Fixed indention issue, made scan_rows an ha_rows type, and fixed show table status so archive rows are displayed as being compressed. 
      
      
      sql/examples/ha_archive.h:
        Fixed indention issues, modified scan_rows to being ha_rows, and fixed the diplsay show table status to mention that rows inside of archive are compressed.
      3096eac9
  5. 08 Jul, 2005 14 commits
    • unknown's avatar
      - reverted and optimized a merge · de1254ad
      unknown authored
      de1254ad
    • unknown's avatar
      Merge · 31a5bba4
      unknown authored
      
      mysql-test/Makefile.am:
        Auto merged
      scripts/make_binary_distribution.sh:
        SCCS merged
      31a5bba4
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1-build · 8dce2760
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      8dce2760
    • unknown's avatar
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · a50621e8
      unknown authored
      into  mysql.com:/home/pem/work/mysql-5.0
      
      
      a50621e8
    • unknown's avatar
      Fixed BUG#11365: Stored Procedure: Crash on Procedure operation · accdff51
      unknown authored
        Two separate problems. A key buffer was too small in sp.cc for multi-byte
        fields, and the creation and fixing of mysql.proc in the scripts hadn't been
        updated with the correct character sets and collations (like the other
        system tables had).
        Note: No special test case, as the use of utf8 for mysql.proc will make
        any existing crash (if the buffer overrrun wasn't fixed).
      
      
      mysql-test/r/sp-error.result:
        Updated test case for too long SP names (as the limit has increased with the use of utf8).
      mysql-test/t/sp-error.test:
        Updated test case for too long SP names (as the limit has increased with the use of utf8).
      scripts/mysql_create_system_tables.sh:
        Use utf8 for mysql.proc, just like for the other system tables.
      scripts/mysql_fix_privilege_tables.sql:
        Use utf8 for mysql.proc, just like for the other system tables.
        (Some tabs also replaced by space)
      sql/sp.cc:
        Use a larger key buffer for stored procedures to avoid stack overrun with multi-byte keys.
      accdff51
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca · 1f58b8f9
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      1f58b8f9
    • unknown's avatar
      mysql_client_test.dsp: · 6fcb9562
      unknown authored
        Corrected libs and lib search path for debug target
      
      
      VC++Files/tests/mysql_client_test.dsp:
        Corrected libs and lib search path for debug target
      6fcb9562
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6eedec68
      unknown authored
      into igor-inspiron.creware.com:/home/igor/mysql-5.0
      
      
      6eedec68
    • unknown's avatar
      Merge igor-inspiron.creware.com:/home/igor/mysql-5.0 · b24aa065
      unknown authored
      into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      b24aa065
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 7672befa
      unknown authored
      into  mysql.com:/home/pem/work/mysql-5.0
      
      
      7672befa
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-5.0.9-clone · 586e91ab
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      586e91ab
    • unknown's avatar
      - manual merge of the addition of including mysqlt-test/t/*.def · d261c2af
      unknown authored
      
      mysql-test/Makefile.am:
        - manual merge
      scripts/make_binary_distribution.sh:
        - manual merge
      d261c2af
    • unknown's avatar
      ctype_utf8.test: · 47c921e3
      unknown authored
        Added a test case for bug #11484.
      hp_hash.c:
        Fixed bug #11484.
        This bug in the function hp_rec_key_cmp resulted in wrong
        comparison of varchar multibyte keys if the bytes after 
        string values happened to be different. This caused wrong
        results for queries returning DISTINCT varchar fields in
        multibyte charsets (e.g. in utf8).
      
      
      heap/hp_hash.c:
        Fixed bug #11484.
        This bug in the function hp_rec_key_cmp resulted in wrong
        comparison of varchar multibyte keys if the bytes after 
        string values happened to be different. This caused wrong
        results for queries returning DISTINCT varchar fields in
        multibyte charsets (e.g. in utf8).
      mysql-test/t/ctype_utf8.test:
        Added a test case for bug #11484.
      47c921e3