1. 12 Oct, 2005 24 commits
    • unknown's avatar
      fixes after merge of 4.1. · 16f3cb03
      unknown authored
      
      mysql-test/r/subselect.result:
        correcting non-ascii chars hosed by automerge as usual
      mysql-test/t/subselect.test:
        correcting non-ascii chars hosed by automerge as usual
      sql/log_event.cc:
        correcting bad manual merge. ZERO_LEN is not needed in 5.0, as ::exec_event() just tell()s the relay log instead
        of using get_event_len().
      sql/log_event.h:
        get_event_len() is not needed in 5.0, ZERO_LEN neither.
      sql/slave.cc:
        fixes to take into account 5.0 specificities in replication. ZERO_LEN is not needed.
      16f3cb03
    • unknown's avatar
      Building with compile-pentium-valgrind-max (without safemalloc) defines my_free() without flags, · bec38058
      unknown authored
      so a typo on flags will go unnoticed; I put flags in this my_free() definition (as a no-op which
      will still make the compiler check correctness of the flags). Applied: this caught a typo in my_realloc.c. Kindly approved by Konstantin and Mats.
      
      
      include/my_sys.h:
        When we define my_free(PTR,FG) to be my_no_flags_free(PTR) we don't make the compiler check
        correctness of FG, which can hurt if another person build with a different definition of my_free;
        so I add FG in the expression.
      mysys/my_realloc.c:
        typo found by the change in my_sys.h :)
      bec38058
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · e7ac9b92
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.0
      
      
      e7ac9b92
    • unknown's avatar
      Merge mysql.com:/home/mysql_src/mysql-4.1 · 7f8be07b
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.0
      
      
      7f8be07b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 431753ec
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-repl
      
      
      431753ec
    • unknown's avatar
      make_binary_distribution.sh: · bf1f78c1
      unknown authored
        Copy *.cnf files in mysql-test/std_data/
      Makefile.am:
        Added std_data/*.cnf to copy ndb config
      
      
      mysql-test/Makefile.am:
        Added std_data/*.cnf to copy ndb config
      scripts/make_binary_distribution.sh:
        Copy *.cnf files in mysql-test/std_data/
      bf1f78c1
    • unknown's avatar
      To force a restart at the end of test, the option file must be non-empty, it's... · 3b3712fd
      unknown authored
      To force a restart at the end of test, the option file must be non-empty, it's not enough if it exists and is empty.
      
      
      mysql-test/t/rpl_dual_pos_advance-master.opt:
        the option file must be non-empty (because there's a -z test in mysql-test-run)
      3b3712fd
    • unknown's avatar
      Merge mysql.com:/home/mysql_src/mysql-4.1 · 8b1a32ae
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.0;
      a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset
      
      
      BitKeeper/deleted/.del-compile-pentium64-valgrind-max:
        Delete: BUILD/compile-pentium64-valgrind-max
      BitKeeper/etc/config:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      client/mysqltest.c:
        manual merge
      mysql-test/r/subselect.result:
        manual merge
      mysql-test/t/subselect.test:
        manual merge
      sql/log_event.cc:
        manual merge
      sql/log_event.h:
        manual merge
      sql/slave.cc:
        manual merge
      sql/sql_yacc.yy:
        manual merge
      8b1a32ae
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 92713c00
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-repl
      
      
      sql/sp_head.cc:
        Auto merged
      92713c00
    • unknown's avatar
      Temporary solution for bug #13969 "Routines which are replicated from master · f48db1bc
      unknown authored
      can't be executed on slave". It will be possible to solve this problem
      in more correct way when we will implement WL#2897 "Complete definer support
      in the stored routines".
      
      
      mysql-test/r/rpl_sp.result:
        Added test for bug #13969 "Routines which are replicated from master can't be
        executed on slave".
      mysql-test/t/rpl_sp.test:
        Added test for bug #13969 "Routines which are replicated from master can't be
        executed on slave".
      sql/sp_head.cc:
        sp_change_security_context():
          Currently the slave replication thread creates all stored routines with
          definer ''@'', ignoring the actual definer. When the slave replication
          thread executes these routines, it ignores the definer, and so the routines
          work. However, in case of a failover, the replica operates in a normal mysqld
          mode and changes security context to the definer when executing a routine.
          A proper fix for this issue is described in WL#2897 "Complete definer support
          in the stored routines". Until this WL is implemented, we need this temporary
          fix, which ignores errors when changing security context.
      f48db1bc
    • unknown's avatar
      slave.cc: · 3f11381b
      unknown authored
        SCCS merged
      
      
      sql/slave.cc:
        SCCS merged
      3f11381b
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 8d9c66a5
      unknown authored
      into  mysql.com:/usr/home/pem/bug13510/mysql-5.0
      
      
      8d9c66a5
    • unknown's avatar
      556fdfbd
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 60534415
      unknown authored
      into  mysql.com:/usr/home/pem/bug13510/mysql-5.0
      
      
      60534415
    • unknown's avatar
      merge · 61dfc334
      unknown authored
      61dfc334
    • unknown's avatar
      Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc; · 7ff27a61
      unknown authored
      in short we now record whenever the slave I/O thread ignores a master's event because of its server id,
      and use this info in the slave SQL thread to advance Exec_master_log_pos. Because if we
      do not, this variable stays at the position of the last executed event, i.e. the last *non-ignored*
      executed one, which may not be the last of the master's binlog (and so the slave *looks* behind
      the master though it's data-wise it's not).
      
      
      mysql-test/t/rpl_dual_pos_advance-master.opt:
        empty; its goal is just to trigger a server restart after running the test,
        so that the master forgets that it was a slave (otherwise it affects the following tests).
      sql/log.cc:
        No more default arguments for Rotate_log_event constructor.
        MYSQL_LOG::appendv() is now called without mutex.
      sql/log_event.cc:
        Moving one Rotate_log_event constructor from log_event.h. Support for on-demand choice of
        duplicating the string argument of the constructor or not (because there now are needs for both
        alternatives, see slave.cc).
      sql/log_event.h:
        We now have a case where a Rotate_log_event is executed by the slave SQL thread while
        not being in the relay log, so it needs to pretend its length is 0: a ZERO_LEN flag for that;
        a flag DUP_NAME (replaces "bool alloced") to be able to choose if we want the constructor
        to duplicate the string argument or not.
      sql/slave.cc:
        A comment for BUG#13861 (to be fixed). llstr() instead of %ld as the number is ulonglong.
        mi->rli becomes rli in some places.
        Fix for BUG#13023:
        - in the slave I/O thread, whenever we ignore an event because of its server id we update
        a couple of coordinates in memory
        - in the slave SQL thread, whenever we bump into the end of the latest relay log, we check
        this couple of coordinates to see if we should advance our Exec_master_log_pos.
        - when the slave I/O thread terminates it saves these in-memory coordinates into a Rotate event
        in the relay log, so that they are durable.
      sql/slave.h:
        A couple of coordinates in RELAY_LOG_INFO to keep track of the last ignored events received
        by the slave I/O thread (ignored because of the server id).
      mysql-test/r/rpl_dual_pos_advance.result:
        New BitKeeper file ``mysql-test/r/rpl_dual_pos_advance.result''
      mysql-test/t/rpl_dual_pos_advance.test:
        Test for BUG#13023 (with a part, disabled, to test BUG#13861 when I fix it).
        Before the fix, this test used to hang.
      7ff27a61
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · efd99d95
      unknown authored
      into  mysql.com:/usr/home/pem/bug13616/mysql-5.0
      
      
      sql/sp_head.cc:
        Auto merged
      efd99d95
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 51ebdc65
      unknown authored
      into  mysql.com:/usr/home/pem/bug13616/mysql-5.0
      
      
      51ebdc65
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 14b89a32
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      14b89a32
    • unknown's avatar
      after merge fix · f96b66ef
      unknown authored
      
      config/ac-macros/yassl.m4:
        added HAVE_YASSL variable
      sql/mysqld.cc:
        added HAVE_YASSL define
      f96b66ef
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 9af6650a
      unknown authored
      into  mysql.com:/users/grog/4.1
      
      
      9af6650a
    • unknown's avatar
      sql_yacc.yy: · be559ad6
      unknown authored
        Bug #10308: Parse 'purge master logs' with subselect correctly.
      subselect.test:
        Bug #10308: Test for 'purge master logs' with subselect.
      subselect.result:
        Bug #10308: Test result for 'purge master logs' with subselect.
      
      
      mysql-test/r/subselect.result:
        Bug #10308: Test result for 'purge master logs' with subselect.
      mysql-test/t/subselect.test:
        Bug #10308: Test for 'purge master logs' with subselect.
      sql/sql_yacc.yy:
        Bug #10308: Parse 'purge master logs' with subselect correctly.
      be559ad6
    • unknown's avatar
      Merge lgrimmer@bk-internal:/home/bk/mysql-5.0 · 771fadef
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      771fadef
    • unknown's avatar
      4.1->5.0 merge · 533b8ba2
      unknown authored
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        manual merge
      533b8ba2
  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 mysql.com:/space/my/mysql-4.1 · 87308abf
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      87308abf
    • 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
      To help people avoid BUG#2122 "changing hostname confuses master or slave" until it's fixed, · 149a2833
      unknown authored
      we now issue a warning (at slave's server startup only) when a relay log is named
      using the implicit hostname-relay-bin naming. Like we already do for binlogs.
      
      
      sql/slave.cc:
        To help people avoid BUG#2122 "changing hostname confuses master or slave" until it's fixed,
        we now issue a warning (at slave's server startup only) when a relay log is named
        using the implicit hostname-relay-bin naming. Like I had already added a similar startup warning
        when a binlog is named using the implicit hostname-bin naming.
        name_warning_sent is so that at most one warning per startup is sent.
      149a2833
    • 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