1. 11 Oct, 2005 11 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 562163e4
      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
      562163e4
    • unknown's avatar
      Reviewing new pushed code · d6ccd7c7
      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()
      d6ccd7c7
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 122b48fd
      unknown authored
      into moonbone.local:/work/13327-bug-5.0-mysql
      
      122b48fd
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 751e45ad
      unknown authored
      into moonbone.local:/work/13327-bug-5.0-mysql
      
      751e45ad
    • unknown's avatar
      Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 · f6290f2c
      unknown authored
      into mysql.com:/Users/eric/dev/mysql-5.0
      
      f6290f2c
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-13650 · 58e8167e
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      58e8167e
    • unknown's avatar
      Merge abarkov@bk-internal:/home/bk/mysql-5.0 · 0aedfc6e
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b9278
      
      0aedfc6e
    • unknown's avatar
      complete.c: · b83fb7fa
      unknown authored
        Fixed compilation problem on FreeBSD,
        after discussion with Jani.
        Doesn't FreeBSD follow the standard?
        
      
      
      cmd-line-utils/readline/complete.c:
        Fixed
      b83fb7fa
    • unknown's avatar
      Merging · a7b70b1f
      unknown authored
      
      mysql-test/r/type_float.result:
        merging
      a7b70b1f
    • unknown's avatar
      Merging · cddbc86c
      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
      cddbc86c
    • unknown's avatar
      BUG#13724 conditionally added CONNECTION='connect string' for SHOW CREATE TABLE · c425a29b
      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
      c425a29b
  2. 10 Oct, 2005 15 commits
  3. 09 Oct, 2005 1 commit
    • unknown's avatar
      Remove protocol_cursor.cpp (no longer used) from sources · 7ee2da8d
      unknown authored
      Fix a compile failure
      
      
      BitKeeper/deleted/.del-protocol_cursor.cc~2a1ab8e023a166a4:
        Delete: sql/protocol_cursor.cc
      VC++Files/libmysqld/libmysqld.dsp:
        Remove protocol_cursor.cpp (no longer used) from sources
      VC++Files/sql/mysqld.dsp:
        Remove protocol_cursor.cpp (no longer used) from sources
      sql/mysqld.cc:
        Fix a compile failure
      7ee2da8d
  4. 08 Oct, 2005 6 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 466766d5
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      server-tools/instance-manager/mysql_connection.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      466766d5
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 3765ae2d
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      3765ae2d
    • unknown's avatar
      Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 · 1d2a0050
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      mysql-test/r/rpl_flush_tables.result:
        Auto merged
      mysql-test/t/rpl_flush_tables.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      1d2a0050
    • unknown's avatar
      pthread_handler_decl() changed to be ctags-friendly · 02a5f758
      unknown authored
      (and contain extern "C" when necessary)
      
      02a5f758
    • unknown's avatar
      Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE" · 390bcf23
      unknown authored
      don't allow STOP SLAVE if global read lock is in taken
      
      390bcf23
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b1e7fe47
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      BUILD/SETUP.sh:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/information_schema_inno.result:
        Auto merged
      mysql-test/r/multi_statement.result:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/r/temp_table.result:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      mysql-test/t/information_schema_inno.test:
        Auto merged
      mysql-test/t/multi_statement.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/temp_table.test:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/structs.h:
        Auto merged
      sql/table.h:
        Auto merged
      strings/decimal.c:
        Auto merged
      sql/sql_parse.cc:
        manual merge
      sql/sql_prepare.cc:
        manual merge
      sql/table.cc:
        manual merge
      b1e7fe47
  5. 07 Oct, 2005 7 commits