1. 12 Oct, 2005 9 commits
  2. 11 Oct, 2005 16 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 706157f0
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      server-tools/instance-manager/instance.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_manager.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      706157f0
    • unknown's avatar
      Reviewing new pushed code · 0ce12f70
      unknown authored
      - CHAR() now returns binary string as default
      - CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
      - Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
        (Some old systems returns ETIME and it's safer to test for both values
         than to try to write a wrapper for each old system)
      - Fixed new introduced bug in NOT BETWEEN X and X
      - Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
      - Use octet2hex() for all conversion of string to hex
      - Simplify and optimize code
      
      
      client/mysqldump.c:
        Simple optimizations of new code
        Indentation fixes
      client/mysqltest.c:
        Removed not needed variable
      include/mysql_com.h:
        Made octec2hex() more usable
      mysql-test/r/ctype_utf8.result:
        CHAR() now returns binary string as default
      mysql-test/r/func_str.result:
        CHAR() now returns binary string as default
      mysql-test/r/range.result:
        Added test to verify new introduced bug in NOT BETWEEN X and X
      mysql-test/r/user_var-binlog.result:
        CHAR() now returns binary string as default
      mysql-test/r/view.result:
        More tests of view rename
      mysql-test/t/ctype_utf8.test:
        CHAR() now returns binary string as default
      mysql-test/t/func_str.test:
        CHAR() now returns binary string as default
      mysql-test/t/range.test:
        Added test to verify new introduced bug in NOT BETWEEN X and X
      mysql-test/t/view.test:
        More tests of view rename
      mysys/mf_keycache.c:
        Indentation changes
        Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
      mysys/my_os2cond.c:
        Fix to MySQL coding style
        Optimized functions
      mysys/thr_lock.c:
        Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
      mysys/thr_mutex.c:
        Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
      server-tools/instance-manager/instance.cc:
        Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
      server-tools/instance-manager/thread_registry.cc:
        Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
      sql/ha_federated.cc:
        Use octet2hex()
      sql/ha_ndbcluster.cc:
        Removed not used variable
      sql/handler.cc:
        Simplify code
        Use *NONE* instead of 'none' for not existing storage engine
        Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
      sql/item.h:
        Remove not needed test for *ref.  (If ref is set, it should never point at 0)
      sql/item_func.cc:
        Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
        Simplify code
        More comments
        Require that last argument to find_and_check_access() is given
        (Made code shorter and faster)
      sql/item_strfunc.cc:
        Changed CHAR() to return result in binary collation
        CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
        
        Bar will shortly add the following syntax:
        CHAR(.... USING character_set)
        and ensure that
        CONVERT(CHAR(....) USING utf8) cuts not legal utf8 strings
        Use ocet2hex()
      sql/item_strfunc.h:
        CHAR() now returns a binary string
      sql/log_event.cc:
        Use octet2hex()
        Simplify code
      sql/parse_file.cc:
        Indentation fixes
        Use for() instead of while()
      sql/password.c:
        Make octet2hex() more generally usable by returning pointer to end 0
      sql/slave.cc:
        Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
      sql/sql_base.cc:
        Indentation fixes
      sql/sql_insert.cc:
        Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
      sql/sql_manager.cc:
        Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
      sql/sql_parse.cc:
        Don't check thd->db when checking for function privileges
      sql/sql_prepare.cc:
        Fixed wrong merge
      sql/sql_select.cc:
        Fixed new bug for NOT BETWEEN X and X
      sql/sql_show.cc:
        Removed not used variable
      sql/sql_table.cc:
        Indentation fixed
        Removed DBUG_PRINT that is obvious from context
      sql/sql_view.cc:
        Simplify code
      sql/unireg.cc:
        Use octet2hex()
      0ce12f70
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4857e205
      unknown authored
      into moonbone.local:/work/13327-bug-5.0-mysql
      
      
      4857e205
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1-build · 1cd63ae3
      unknown authored
      into mysql.com:/space/my/mysql-5.0-build
      
      
      scripts/make_win_src_distribution.sh:
        Auto merged
      1cd63ae3
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · cdec188e
      unknown authored
      into moonbone.local:/work/13327-bug-5.0-mysql
      
      
      cdec188e
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.0-build · 7d868794
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      scripts/make_win_src_distribution.sh:
        Auto merged
      7d868794
    • unknown's avatar
      - added Docs/manual.chm to the windows source distribution (BUG#13899) · 28dffbcd
      unknown authored
      
      scripts/make_win_src_distribution.sh:
        - added Docs/manual.chm to the windows source distribution (BUG#13899). The file
          is placed in there by the Bootstrap script, which pulls it from the mysqldoc
          repository
      28dffbcd
    • unknown's avatar
      Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 · 49a33c57
      unknown authored
      into mysql.com:/Users/eric/dev/mysql-5.0
      
      
      49a33c57
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-13650 · efd15a58
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      efd15a58
    • unknown's avatar
      Fixed BUG#13510: Setting password local variable changes current password · 71c89622
      unknown authored
        Disallow conflicting use of variables named "password" and "names". If such
        a variable is declared, and "SET ... = ..." is used for them, an error is
        returned; the user must resolve the conflict by either using `var` (indicating
        that the local variable is set) or by renaming the variable.
        This is necessary since setting "password" and "names" are treated as special
        cases by the parser.
      
      
      mysql-test/r/sp-error.result:
        New test cases for BUG#13510
      mysql-test/t/sp-error.test:
        New test cases for BUG#13510
      sql/share/errmsg.txt:
        New error message for when certain variable names are use which would be
        parsed the wrong way. (E.g. "password" and "names")
      sql/sql_yacc.yy:
        Check if "names" or "password" are used as local variable/parameter, in which
        case "set names" or "set password" will be parsed the wrong way. Give an error
        message instead.
      71c89622
    • unknown's avatar
      Merge abarkov@bk-internal:/home/bk/mysql-5.0 · d471e9de
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b9278
      
      
      d471e9de
    • unknown's avatar
      complete.c: · a942a6c3
      unknown authored
        Fixed compilation problem on FreeBSD,
        after discussion with Jani.
        Doesn't FreeBSD follow the standard?
        
      
      
      cmd-line-utils/readline/complete.c:
        Fixed
      a942a6c3
    • unknown's avatar
      Merging · f1b93086
      unknown authored
      
      mysql-test/r/type_float.result:
        merging
      f1b93086
    • unknown's avatar
      Fix for bug#9270 multiple SSL race conditions (for 5.0 tree) · a31b47cd
      unknown authored
        The fix is needed to perform locking on shared data structures
        This is modification of patch proposed by Leandro Santi
        (see http://webs.sinectis.com.ar/lesanti/misc/mysql-4.0.23a-openssl_locking.patch)
      
      
      sql/mysqld.cc:
        Fix for bug#9270 multiple SSL race conditions (for 5.0 tree)
          The fix is needed to perform locking on shared data structures
      a31b47cd
    • unknown's avatar
      Merging · 57e970db
      unknown authored
      
      mysql-test/t/type_float.test:
        Auto merged
      mysql-test/r/type_decimal.result:
        merging
      mysql-test/r/type_float.result:
        merging
      mysql-test/r/union.result:
        merging
      mysql-test/t/type_decimal.test:
        merging
      sql/item.cc:
        merging
      57e970db
    • unknown's avatar
      BUG#13724 conditionally added CONNECTION='connect string' for SHOW CREATE TABLE · 7efa1939
      unknown authored
      
      mysql-test/r/federated.result:
        test results for SHOW CREATE TABLE
      mysql-test/t/federated.test:
        added test for SHOW CREATE TABLE
      sql/sql_show.cc:
        added connect_string for SHOW CREATE TABLE
      7efa1939
  3. 10 Oct, 2005 15 commits