1. 03 Jul, 2006 5 commits
    • unknown's avatar
      Bug#20783: Valgrind uninitialised warning in test case ctype_uca · c3ef0267
      unknown authored
        
      Two functions have different ideas of what a string should look like;
      one of them reads memory it assumes the other one may have written.
      And "if you assume ..."
        
      We now use a more defensive variety of the assuming function, this fixes
      a warning thrown by the valgrind tool.
      
      
      sql/item_cmpfunc.cc:
        c_ptr() makes incorrect assumptions about the string we get from
        out of args[0]->val_str(&tmp); c_str_safe() is more defensive.
      c3ef0267
    • unknown's avatar
      client.c: · e34b9cfb
      unknown authored
        Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def
      
      
      sql-common/client.c:
        Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def
      e34b9cfb
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 3702ae2d
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
      
      
      3702ae2d
    • unknown's avatar
      mwldnlm, mwccnlm, mwasmnlm: · 9ecc01a9
      unknown authored
        Use Perl for filtering, do more filtering
      
      
      netware/BUILD/mwasmnlm:
        Use Perl for filtering, do more filtering
      netware/BUILD/mwccnlm:
        Use Perl for filtering, do more filtering
      netware/BUILD/mwldnlm:
        Use Perl for filtering, do more filtering
      9ecc01a9
    • unknown's avatar
      Makefile.am: · 97c21888
      unknown authored
        Avoid duplicate symbol errors on Netware
      mwldnlm, mwccnlm, mwasmnlm:
        Filter garbage characters from output
      
      
      netware/BUILD/mwasmnlm:
        Filter garbage characters from output
      netware/BUILD/mwccnlm:
        Filter garbage characters from output
      netware/BUILD/mwldnlm:
        Filter garbage characters from output
      tests/Makefile.am:
        Avoid duplicate symbol errors on Netware
      97c21888
  2. 01 Jul, 2006 2 commits
    • unknown's avatar
      mysqld.vcproj: · 84e72c2b
      unknown authored
        Don't define __NT__ for 'Max' target
      
      
      VC++Files/sql/mysqld.vcproj:
        Don't define __NT__ for 'Max' target
      84e72c2b
    • unknown's avatar
      my_sys.h: · 805e8554
      unknown authored
        Added missing parameter type change for _my_strdup_with_length()
      
      
      include/my_sys.h:
        Added missing parameter type change for _my_strdup_with_length()
      805e8554
  3. 30 Jun, 2006 4 commits
    • unknown's avatar
      Manual transfer of the following changeset into the 5.0.23 release clone: · 2b380332
      unknown authored
         1.2525 06/06/30 18:29:27 monty@mysql.com +3 -0
         Reverted wrong bug fix (Bug#11228)
      
      
      mysql-test/r/key.result:
        Manual transfer of the following fix into the 5.0.23 release clone:
           1.27 06/06/30 18:29:25 monty@mysql.com +9 -1
           Fixed result after removing wrong bug fix
      mysql-test/t/key.test:
        Manual transfer of the following fix into the 5.0.23 release clone:
           1.24 06/06/30 18:29:25 monty@mysql.com +1 -0
           Added SHOW CREATE TABLE, which is the proper way to check for table definitions
      sql/table.cc:
        Manual transfer of the following fix into the 5.0.23 release clone:
           1.135 06/06/30 18:29:25 monty@mysql.com +21 -0
           Reverted wrong bug fix.   ...
      2b380332
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 4a6a237f
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.0-release
      
      
      4a6a237f
    • unknown's avatar
      BUG#20769: Dangling pointer in ctype_recoding test case. · d9cb536a
      unknown authored
      In some functions dealing with strings and character sets, the wrong
      pointers were saved for restoration in THD::rollback_item_tree_changes().
      This could potentially cause random corruption or crashes.
      
      Fixed by passing the original Item ** locations, not local stack copies.
      
      Also remove unnecessary use of default arguments.
      
      
      sql/item.cc:
        Function agg_item_charsets() now handles non-consequtive Item *'s.
      sql/item.h:
        Remove use of default argument.
      sql/item_cmpfunc.cc:
        Remove use of default argument.
      sql/item_func.cc:
        Remove use of default argument.
      sql/item_func.h:
        Function agg_item_charsets() now handles non-consequtive Item *'s.
      sql/item_strfunc.cc:
        Pass original Item **'s to agg_arg_charsets(), not local copies, to ensure
        proper restoration in THD::rollback_item_tree_changes().
      sql/item_sum.cc:
        Remove use of default argument.
      d9cb536a
    • unknown's avatar
      mysql.spec.sh: · b76a6873
      unknown authored
        Disable old RPM strip
      my_global.h:
        Fixed wrong cast, which caused problems with gcc 4.0 and
        floats in prepared statements (Bug #19694)
      mysqlmanager.vcproj:
        Place output files in common release/debug directory
      
      
      server-tools/instance-manager/mysqlmanager.vcproj:
        Place output files in common release/debug directory
      include/my_global.h:
        Fixed wrong cast, which caused problems with gcc 4.0 and
        floats in prepared statements (Bug #19694)
      support-files/mysql.spec.sh:
        Disable old RPM strip
      b76a6873
  4. 29 Jun, 2006 10 commits
  5. 28 Jun, 2006 19 commits
    • unknown's avatar
      A fix for Bug#19022 "Memory bug when switching db during trigger execution". · 88843709
      unknown authored
      No test case as the bug is in an existing test case (rpl_trigger.test
      when it is run under valgrind).
      The warning was caused by memory corruption in replication slave: thd->db
      was pointing at a stack address that was previously used by 
      sp_head::execute()::old_db. This happened because mysql_change_db
      behaved differently in replication slave and did not make a copy of the 
      argument to assign to thd->db. 
      The solution is to always free the old value of thd->db and allocate a new
      copy, regardless whether we're running in a replication slave or not.
      
      
      sql/log_event.cc:
        Move rewrite_db to log_event.cc, the only place where it is used.
      sql/slave.cc:
        Move rewrite_db to log_event.cc
      sql/slave.h:
        Remove an unneeded declaration.
      sql/sql_class.h:
        Fix set_db to always free the old db, even if the argument is NULL.
        Add a comment.
      sql/sql_db.cc:
        Always make a deep copy of the argument in mysql_change_db, even 
        if running in a replication slave. This is necessary because 
        sp_use_new_db (stored procedures) assumes that mysql_change_db always makes
        a deep copy of the argument, and thus passes a pointer to stack into it.
        This assumption was true for all cases except the replication slave thread.
      88843709
    • unknown's avatar
      BUG #19773 · 9016a6be
      unknown authored
      Pushbuild fixes to result file, test, and header file for federated.
      
      
      mysql-test/r/federated.result:
        BUG #19773
        
        Pushbuild fixes - result file had hard-coded port
      mysql-test/t/federated.test:
        BUG #19773
        
        Pushbuild fixes Test was missing --replace_result
      sql/ha_federated.h:
        BUG #19773
        
        HPUX and Windows failed with variable named row and *row in method declaration
      9016a6be
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-runtime · d127fa3b
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-18005
      
      
      sql/sql_trigger.cc:
        Auto merged
      d127fa3b
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7f9a6aa9
      unknown authored
      into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0-engines-bug19773
      
      
      sql/ha_federated.cc:
        Auto merged
      7f9a6aa9
    • unknown's avatar
      Merge xiphis.org:/home/antony/work2/p4-bug12096.2 · 76d0badd
      unknown authored
      into  xiphis.org:/home/antony/work2/p4-bug12096.2-merge
      
      
      configure.in:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      76d0badd
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 11d38c1d
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      11d38c1d
    • unknown's avatar
      BUG#20739. · 48b09e2a
      unknown authored
      In the Windows build files, the "Max nt" configuration for some reason
      had the mysql_client_test project disabled. Enable it.
      
      
      VC++Files/mysql.sln:
        The "Max nt" configuration for some reason had the mysql_client_test
        project disabled. Enable it.
      48b09e2a
    • unknown's avatar
      Disabled test case for Windows (BUG#20753) · 1fdccc89
      unknown authored
      1fdccc89
    • unknown's avatar
      BUG#20739 · ffaacf0d
      unknown authored
      Improved definition of mysys configuration for -nt builds.
      
      
      VC++Files/mysql.sln:
        Use the name 'nt' instead of 'Release' for configuration.
      VC++Files/mysys/mysys.vcproj:
        Use the name 'nt' instead of 'Release' for configuration.
        Use separate output files for NT and non-NT configurations.
      ffaacf0d
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2f45384b
      unknown authored
      into  mysql.com:/home/tnurnberg/mysql-5.0
      
      
      2f45384b
    • unknown's avatar
      Merge mysql.com:/home/tnurnberg/work/mysql-5.0-maint-19857 · 03ce4312
      unknown authored
      into  mysql.com:/home/tnurnberg/mysql-5.0
      
      
      03ce4312
    • unknown's avatar
      Bug#19857: When a user with CREATE ROUTINE priv creates a routine it results in NULL p/w · 5312b349
      unknown authored
        
      sp_grant_privileges(), the function that GRANTs EXECUTE + ALTER privs on a SP,
      did so creating a user-entry with not password; mysql_routine_grant() would then
      write that "change" to the user-table.
      
      
      mysql-test/r/sp-security.result:
        prove that creating a stored procedure will not destroy the creator's password
      mysql-test/t/sp-security.test:
        prove that creating a stored procedure will not destroy the creator's password
      sql/sql_acl.cc:
        get password from ACLs, convert to correct format, and use it when
        forcing GRANTS for SPs
      5312b349
    • unknown's avatar
      BUG#20739: __NT__ not probably defined for mysys project. · f659c1b7
      unknown authored
      Make sure for the mysys project that __NT__ is defined in *nt solution
      configurations (but not in other configurations).
      
      
      VC++Files/mysql.sln:
        Define __NT__ in mysys for *nt configurations.
      VC++Files/mysys/mysys.vcproj:
        Add configurations with __NT__ defined.
      mysql-test/mysql-test-run.pl:
        Also allow testing a "Max nt" build.
      f659c1b7
    • unknown's avatar
      Adding __NT__ to Max Win32 configuration. · cd3dedc9
      unknown authored
      cd3dedc9
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · b5f89708
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
      
      
      sql/set_var.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      b5f89708
    • unknown's avatar
      BUG #19773 · 2ee3ef2e
      unknown authored
        
      Final-review fixes per Monty, pre-push. OK'd for 
      push. Please see each file's comments.
      
      
      
      mysql-test/r/federated.result:
        BUG #19773
            
        Results for multi-table deletes, updates
      mysql-test/t/federated.test:
        BUG #19773
            
        Test multi table update and delete. Added drop table to end of previous test.
      sql/ha_federated.cc:
        BUG #19773 
            
        Post-review changes, per Monty. 3rd patch, OK'd for push.
        - Added index_read_idx_with_result_set, which uses the result set passed to it
        - Hash by entire connection scheme
        - Protected store_result result set for table scan by adding a method result set
          to index_read_idx and index_read which is passed to index_read_with_result, which
          in turn iterates over the single record via read_next.
          This is a change from having two result sets in the first two patches. 
          This keeps the code clean and avoids the need for yet another result set.
        - Rewrote ::position and ::rnd_pos to store position - if primary key use 
          primary key, if not, use record buffer.
        - Rewrote get_share to store hash with connect string vs. table name
        - delete_row added subtration of "records" by affected->rows
        - Added read_next to handle what rnd_next used to do (converting raw record
           to query and vice versa)
        - Removed many DBUG_PRINT lines
        - Removed memset initialisation since subsequent loop accomplishes
        - Removed un-necessary mysql_free_result lines
      sql/ha_federated.h:
         BUG #19773
            
            Fixed "SET " to " SET " to make sure built statements are built with 
            "UPDATE `t1` SET .." instead of "UPDATE `t1`SET"
      2ee3ef2e
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 8169f210
      unknown authored
      into  mysql.com:/home/alexi/bugs/mysql-5.0-19208
      
      
      8169f210
    • unknown's avatar
      Fixing BUG#17719 "Delete of binlog files fails on Windows" · 39defccf
      unknown authored
       and BUG#19208 "Test 'rpl000017' hangs on Windows".
       Both bugs are caused by attempting to delete an opened
       file and to create immediatedly a new one with the same
       name. On Windows it can be supported only on NT-platforms
       (by using FILE_SHARE_DELETE mode and with renaming the
       file before deletion). Because deleting not-closed files
       is not supported on all platforms (e.g. Win 98|ME) this
       is to be considered harmful and should be eliminated by
       a "code redesign".
      
      
      VC++Files/mysys/mysys.vcproj:
        To be sure that __NT__ is defined for Win configurations.
         Temporary, to be changed in more appropriate way.
      include/my_sys.h:
        Adding my_delete_allow_opened to be invoked to delete
         a (possibly) not closed file on Windows NT-platforms.
      mysys/my_delete.c:
        Adding nt_share_delete() function implementing
         a (possibly) not closed file deletion on Windows NT.
      sql/log.cc:
        MYSQL_LOG::reset_logs(): Deleting usually not
         closed binlog files.
      39defccf
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · a4c95a18
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
      
      
      a4c95a18