1. 11 Oct, 2005 1 commit
    • 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
  2. 08 Oct, 2005 1 commit
    • 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
  3. 07 Oct, 2005 8 commits
    • unknown's avatar
      Simple changes during review of code · 2fe875af
      unknown authored
      Added back flag that I accidently removed in last patch
      
      
      sql/ha_federated.cc:
        Indentation cleanups
        Simple optimization using min() and strmake()
        Much simpler create()
      sql/sql_prepare.cc:
        Added back flag that I accidently removed in last patch
      sql/sql_table.cc:
        Simplify code by having error block last
      2fe875af
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f3fe3b8d
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      f3fe3b8d
    • unknown's avatar
      fix compile failure (which shows up in cygwin environment) · 1b05eec8
      unknown authored
      
      server-tools/instance-manager/mysql_connection.cc:
        fix pragma statement
      server-tools/instance-manager/user_map.cc:
        fix pragma statement
      1b05eec8
    • unknown's avatar
      Merge · 429abab6
      unknown authored
      
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      429abab6
    • unknown's avatar
      after merge fix · 8c257a4a
      unknown authored
      8c257a4a
    • unknown's avatar
      4.1 -> 5.0 merge · 03f5718e
      unknown authored
      
      client/mysql.cc:
        Auto merged
      mysql-test/t/rpl_openssl.test:
        Auto merged
      mysql-test/r/rpl_openssl.result:
        manual merge
      03f5718e
    • unknown's avatar
      Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails · e0fc2b87
      unknown authored
        allow select into outfile from I_S tables
        it is enough to add FILE_ACL for I_S tables only to 'check_table_access' function
        as we use 'any_db' for 'check_access' function in places where FILE_ACL is required
      
      
      mysql-test/t/outfile.test:
        Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails
          test case
      e0fc2b87
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 53ad4ab3
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-bug13484
      
      
      sql/ha_innodb.cc:
        Auto merged
      mysql-test/r/index_merge_innodb.result:
        Auto merged
      mysql-test/r/rowid_order_innodb.result:
        Auto merged
      mysql-test/t/index_merge_innodb.test:
        Auto merged
      53ad4ab3
  4. 06 Oct, 2005 16 commits
    • unknown's avatar
      make_binary_distribution.sh: · ca0980ca
      unknown authored
        Corrected platform name output
      Services.cpp:
        Dont print null address (back port from 5.0)
      
      
      ndb/src/mgmsrv/Services.cpp:
        Dont print null address (back port from 5.0)
      scripts/make_binary_distribution.sh:
        Corrected platform name output
      ca0980ca
    • unknown's avatar
      make_binary_distribution.sh: · 449b1f23
      unknown authored
        Reintroduced --machine
        Better sh compatibility, "for i ; do" is not portable
      
      
      scripts/make_binary_distribution.sh:
        Reintroduced --machine
        Better sh compatibility, "for i ; do" is not portable
      449b1f23
    • unknown's avatar
      Merge mysql.com:/home/dellis/mysqlab/bk/local_mysql-4.1 · bd80d76d
      unknown authored
      into  mysql.com:/home/dellis/mysqlab/bk/mysql-5.0
      
      bd80d76d
    • unknown's avatar
      Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1 · 560f103f
      unknown authored
      into  mysql.com:/home/dellis/mysqlab/bk/mysql-4.1
      
      560f103f
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 22e07f19
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
      
      22e07f19
    • unknown's avatar
      Fixed a bug in argument sending to get_one_option. · 9a64e0a7
      unknown authored
      Fixed documentation for findopt().
      Cleaned code a bit.
      
      9a64e0a7
    • unknown's avatar
      don't "init" binlog if opt_bin_log is not set · 7f37d2d7
      unknown authored
      (bug#13791 - mysqld crashes at startup in TC_LOG_MMAP::open)
      
      7f37d2d7
    • unknown's avatar
      make_binary_distribution.sh: · 619f70a6
      unknown authored
        Replaced --machine with --platform
        General code cleanup
      
      
      scripts/make_binary_distribution.sh:
        Replaced --machine with --platform
        General code cleanup
      619f70a6
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · a8655162
      unknown authored
      into mysql.com:/home/gluh/MySQL/Bugs/4.1.13605
      
      a8655162
    • unknown's avatar
      Review of code pushed since last 5.0 pull: · 872a537c
      unknown authored
      Ensure that ccache is also used for C programs
      mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
      mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
      Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
      Removed MY_UNIX_PATH from fn_format()
      Removed current_db_used from TABLE_LIST
      Removed usage of 'current_thd' in Item_splocal
      Removed some compiler warnings
      A bit faster longlong2str code
      
      
      
      BUILD/FINISH.sh:
        Ensure that ccache is also used for C programs
      BUILD/SETUP.sh:
        Ensure that ccache is also used for C programs
      client/mysql.cc:
        More debugging
        Ensure that 'delimiter' works the same way in batch mode as in normal mode.
        Compare 'delimiter' command case-insensitive.
        The above fixes the delimiter bugs so that we can now use ;; as a trigger/SP function delimiter in mysqldump.
      client/mysqldump.c:
        Indentation fixes
        Use ;; as a delmimiter for stored procedures and triggers instead of //
      client/mysqltest.c:
        Indentation fixes
      include/my_sys.h:
        Remove not needed MY_UNIX_PATH parameter
      mysql-test/r/alter_table.result:
        Better to reuse mysqltest database (test didn't properly delete mysqltest1 at start)
      mysql-test/r/func_str.result:
        More testing of CONV() (to ensure that longlong2str() works correctly)
      mysql-test/r/information_schema.result:
        Drop all used tables and views
        Rename view tables to 'v#' to ensure that if this test fails, not a lot of other test fails
      mysql-test/r/information_schema_inno.result:
        Drop all used tables
      mysql-test/r/multi_statement.result:
        Drop used tables
      mysql-test/r/mysql.result:
        Add error messages to result
      mysql-test/r/mysqldump.result:
        ;; is now used as SP/trigger delimiter
      mysql-test/r/mysqlshow.result:
        Drop used tables
      mysql-test/r/temp_table.result:
        Drop used views
        Rename views to v#
      mysql-test/t/alter_table.test:
        Better to reuse mysqltest database (test didn't properly delete mysqltest1 at start)
      mysql-test/t/func_str.test:
        More testing of CONV() (to ensure that longlong2str() works correctly)
      mysql-test/t/information_schema.test:
        Drop all used tables and views
        Rename view tables to 'v#' to ensure that if this test fails, not a lot of other test fails
      mysql-test/t/information_schema_inno.test:
        Drop all used tables
      mysql-test/t/multi_statement.test:
        Drop used tables
      mysql-test/t/mysql.test:
        Add error messages to result
      mysql-test/t/mysqlshow.test:
        Drop used tables
      mysql-test/t/temp_table.test:
        Drop used views
        Rename views to v#
      mysys/mf_format.c:
        Remove not needed MY_UNIX_PATH parameter
        (This goes against how fn_format() is supposed to work and also conflicts with other options like MY_RETURN_REAL_PATH)
      sql/ha_federated.cc:
        Removed extra empty line
      sql/item.cc:
        Use 'str_value' instead of 'str_value_ptr' to hold result for Item_splocal
        Remove some calls to 'thd' in Item_splocal by making 'thd' a class variable
        One doesn't have to set 'null_value' when calling 'is_null()'
      sql/item.h:
        Add THD as a class variable to Item_splocal
        Use 'str_value' instead of 'str_value_ptr' to hold temp result
        Fixed bug in Item_hex when used in CAST()
      sql/item_func.cc:
        Optimize new code
      sql/log_event.cc:
        Move 'to_unix_path()' out of fn_format()
      sql/opt_range.cc:
        Simplify code
      sql/sp_head.cc:
        Ensure that Item_splocal has thd set before we call '->this_item()'
      sql/sql_class.cc:
        Return error if Statement::insert() fails in either hash_insert()
      sql/sql_parse.cc:
        Remove 'current_db_used' as we can trivially check if db table qualifier was used without this.
        Simplify code
      sql/sql_prepare.cc:
        Use enum instead of const int, to avoid ugly code for VC++
      sql/structs.h:
        Remove compiler warnings when using STRING_WITH_LEN() with constant strings.
      sql/table.cc:
        Fixed indentation
      sql/table.h:
        Remove not needed current_db_used
      strings/decimal.c:
        Simplify code
      strings/longlong2str-x86.s:
        A bit faster longlong2str.
        (Took some ideas from Peter Gulutzan's code)
      strings/my_strtoll10.c:
        Simplify code for MetroWerks compiler
      872a537c
    • unknown's avatar
      Fix for bug#13605 'rpl_openssl' test hangs · 00a8b856
      unknown authored
      00a8b856
    • unknown's avatar
      Merge · 21530e79
      unknown authored
      21530e79
    • unknown's avatar
      Merge msdesk.(none):/home/msvensson/mysql-4.1 · f647668a
      unknown authored
      into  msdesk.(none):/home/msvensson/mysql-5.0
      
      
      BUILD/SETUP.sh:
        Auto merged
      BitKeeper/deleted/.del-ctype-cp932.c:
        Auto merged
      BitKeeper/deleted/.del-ctype_cp932.result:
        Auto merged
      BitKeeper/deleted/.del-ctype_cp932.test:
        Auto merged
      BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74:
        Auto merged
      innobase/os/os0sync.c:
        Auto merged
      mysql-test/r/ctype_tis620.result:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_uca.test:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/ctype_ujis.test:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-gbk.c:
        Auto merged
      strings/ctype-simple.c:
        Auto merged
      strings/ctype-sjis.c:
        Auto merged
      strings/ctype-ucs2.c:
        Auto merged
      client/mysql.cc:
        Sam change in both 4.1 and 5.0
      mysql-test/r/ctype_uca.result:
        Merge
      mysql-test/r/ctype_ujis.result:
        Merge
      strings/ctype-mb.c:
        Merge
      strings/ctype-tis620.c:
        Merge
      f647668a
    • unknown's avatar
      item_cmpfunc.cc: · 0e525946
      unknown authored
        Wrong variable.
      
      
      sql/item_cmpfunc.cc:
        Wrong variable.
      0e525946
    • unknown's avatar
      ndb - prelim perl scripts to autotest · eaee2d6e
      unknown authored
      
      BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74:
        Delete: mysql-test/ndb/ndb_range_bounds.pl
      eaee2d6e
    • unknown's avatar
      my_pthread.h: · 71b47603
      unknown authored
        Let pthread_mutex_init() macro return 0 on Windows
      mysql_priv.h:
        Return type is to be 'my_bool' for 'opt_enable_shared_memory'
      
      
      sql/mysql_priv.h:
        Return type is to be 'my_bool' for 'opt_enable_shared_memory'
      include/my_pthread.h:
        Let pthread_mutex_init() macro return 0 on Windows
      71b47603
  5. 05 Oct, 2005 13 commits
  6. 04 Oct, 2005 1 commit