1. 29 Mar, 2007 1 commit
    • unknown's avatar
      WL#3629 - Replication of Invocation and Invoked Features · 75686dc7
      unknown authored
      This patch corrects errors that occurred in a local manual merge as a result
      of updating the local repository and includes changes necessary to correct 
      problems found during the recalculation of next execution of events in RBR.
      
      
      mysql-test/include/rpl_events.inc:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch changes the rpl_events test to be more comprehensive in catching
        errors as a result of RBR. Changes include clarification of SELECTs with
        WHERE clauses and synchronization with master and slave.
      mysql-test/r/rpl_events.result:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch changes the results for the rpl_events test to accomodate the changes
        in the test.
      scripts/mysql_system_tables.sql:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch adds the originator column and a new enum value to the mysql.event table.
        This change was necessary to accomodate changes as a result of other patches.
      sql/event_data_objects.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch corrects an error in merging that occurred during manual merge.
        The status check was changed to include either ENABLED or DISABLED in the
        gate to change the status to SLAVESIDE_DISABLED for events replicated to 
        the slave.
        
        This patch also includes an update to correct a problem encountered during
        testing after the local merge. The update_timing_fields method is replicating
        the timing changes in RBR to the slave thereby over writing the change to the
        status column in the process. This code includes a check to turn off the next
        binlog event if in RBR.
      sql/event_queue.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch corrects an error in merging that occurred during manual merge.
        The code was corrected to include both types of disabled status enums
        (DISABLED, SLAVESIDE_DISABLED) in the create_event and update_event methods.
      sql/sql_show.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch corrects an error in merging that occurred during manual merge.
        It corrects the order in which the originator column appears in the show
        structures. The error caused incorrect output on SHOW EVENTS commands.
      75686dc7
  2. 26 Mar, 2007 1 commit
    • unknown's avatar
      Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl · ff1d6b22
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629
      
      
      BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
        Auto merged
      BitKeeper/deleted/.del-mysql_create_system_tables.sh:
        Auto merged
      scripts/mysql_system_tables_fix.sql:
        Auto merged
      sql/event_data_objects.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/event_data_objects.h:
        Manual merge.
      sql/event_queue.cc:
        Manual merge.
      sql/events.cc:
        Manual merge.
      ff1d6b22
  3. 22 Mar, 2007 8 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · 11aa04c9
      unknown authored
      into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-26194
      
      
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      11aa04c9
    • unknown's avatar
      Fix for BUG#26194 "mysqlbinlog --base64-output produces invalid SQL"; · 8ceea7c4
      unknown authored
      when it was printing a Query event, it produced invalid SQL (missing
      the BINLOG keyword, so the SQL started with the base64 string, which
      is incorrect).
      Note: no testcase; I have a .test which shows that the bugfix works,
      but it triggers BUG#26361 and so gives Valgrind warnings. I'm sending
      this test to the fixer of BUG#26361 for her/him to push when she/he
      fixes BUG#26361.
      
      
      client/mysqlbinlog.cc:
        writing the header (a line started with "#", i.e. a comment) and the
        body (the real operation) of an event to the same IO_CACHE
        (result_cache) confused the logic of Log_event::print_base64()
        (which is that if the cache is not empty then the BINLOG keyword
        should not be printed); it caused the BINLOG keyword to miss hence
        a syntactically wrong output of "mysqlbinlog --base64-output"
        for Query events.
        So we just use the two IO_CACHE already available in "print_event_info".
      sql/log_event.cc:
        using the new small inline function.
        Note that the replication code should one day be fixed to trap all
        errors (like disk write errors).
      sql/log_event.h:
        small inline function to group two operations: copying an IO_CACHE
        to a FILE, and reinitializing this IO_CACHE for being filled again.
      sql/records.cc:
        fix after merge
      8ceea7c4
    • unknown's avatar
      Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · 09f3dda7
      unknown authored
      into  romeo.(none):/home/bk/b23171-mysql-5.1-new-rpl
      
      
      09f3dda7
    • unknown's avatar
      BUG#23171: Illegal group log position · 05861963
      unknown authored
      Post-merge fixes.
      
      
      mysql-test/r/rpl_ndb_basic.result:
        Result change.
      sql/log_event.cc:
        Adding const-cast.
      05861963
    • unknown's avatar
      Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl · c4e4bc32
      unknown authored
      into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-26194
      will fix by hand
      
      
      mysql-test/t/rpl_misc_functions.test:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_derived.cc:
        Auto merged
      sql/sql_select.cc:
        will fix by hand
      sql/table.h:
        merge from 5.0
      c4e4bc32
    • unknown's avatar
      - renaming TMP_TABLE to NON_TRANSACTIONAL_TMP_TABLE because this is · 685d21b7
      unknown authored
      what it actually means (Monty approved the renaming)
      - correcting description of transaction_alloc command-line options
      (our manual is correct)
      - fix for a failure of rpl_trigger.
      
      
      mysql-test/t/rpl_misc_functions.test:
        test was cleaning up only on slave, but it's also needed on master,
        otherwise it influences rpl_trigger.test
      sql/lock.cc:
        clearer name
      sql/mysqld.cc:
        I checked the code that those two variables are not about binlogging
        but about the size of the transaction's memroot which is used
        to create savepoint structures and to store list of tables to be invalidated
        (for NDB). The manual has a correct description, no need to fix it.
      sql/sql_base.cc:
        clearer name
      sql/sql_derived.cc:
        clearer name
      sql/sql_select.cc:
        clearer name
      sql/table.h:
        clearer name: TMP_TABLE is used for non-transactional tables.
      685d21b7
    • unknown's avatar
      Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · 833ea3fd
      unknown authored
      into  romeo.(none):/home/bk/b23171-mysql-5.1-new-rpl
      
      
      mysql-test/r/rpl_row_tabledefs_2myisam.result:
        Auto merged
      mysql-test/r/rpl_row_tabledefs_3innodb.result:
        Auto merged
      sql/rpl_rli.cc:
        Auto merged
      sql/rpl_rli.h:
        Auto merged
      sql/rpl_utility.cc:
        Auto merged
      sql/rpl_utility.h:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/log.cc:
        Manual merge
      sql/log_event.cc:
        Manual merge
      sql/log_event.h:
        Manual merge
      sql/slave.cc:
        Manual merge
      sql/sql_binlog.cc:
        Manual merge
      833ea3fd
    • unknown's avatar
      BUG#23171: Illegal group log position · 8666675f
      unknown authored
      Tail fixes after re-applying patches to older version of clone.
      
      
      sql/log_event.cc:
        Name change of shall_skip() -> do_shall_skip()
        Introducing public shall_skip().
        Name change of skip reason enumeration constants.
        Removing extreneous argument to slave_print_msg() causing compiler warning.
      sql/log_event.h:
        Adding enumeration for skip reason.
        Factoring out exec_event() into exec_relay_log_event().
        Making public interface to event execution primitives.
        Adding documentation.
        Making some (internal) functions const-correct.
      sql/rpl_rli.cc:
        replicate_same_server_id is now a member variable of RLI.
      sql/rpl_rli.h:
        replicate_same_server_id is now a member variable of RLI.
      sql/slave.cc:
        Using RLI-specific member variable replicate_same_server_id instead of
        global instance.
        Moving comments about skipping logic to exec_relay_log_event().
        Moving event execution logic to exec_relay_log_event().
      sql/sql_binlog.cc:
        Using apply_event() directly and adding comment with explenation.
      8666675f
  4. 21 Mar, 2007 1 commit
    • unknown's avatar
      Merge mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_25543 · 89bfca83
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_25543
      
      
      mysql-test/r/rpl_misc_functions.result:
        Auto merged
      mysql-test/t/rpl_misc_functions.test:
        Auto merged
      sql/sql_class.cc:
        Manual merge of conflicts during push of BUG#25543.
      89bfca83
  5. 19 Mar, 2007 1 commit
  6. 16 Mar, 2007 1 commit
    • unknown's avatar
      WL#3629 - Replication of Invocation and Invoked Features · 62b41b5f
      unknown authored
      This changeset adds replication of events and user-defined functions. 
      There are several bug reports involved in this change:
      
      BUG#16421, BUG#17857, BUG#20384:
      This patch modifies the mysql.events table to permit the addition of
      another enum value for the status column. The column now has values
      of ('DISABLED','SLAVESIDE_DISABLED','ENABLED'). A status of
      SLAVESIDE_DISABLED is set on the slave during replication of events.
      This enables users to determine which events werereplicated from the 
      master and to later enable them if they promote the slave to a master.
      The CREATE, ALTER, and DROP statements are binlogged.
      A new test was added for replication of events (rpl_events).
      
      BUG#17671:
      This patch modifies the code to permit logging of user-defined functions.
      Note: this is the CREATE FUNCTION ... SONAME variety. A more friendly error 
      message to be displayed should a replicated user-defined function not be
      found in the loadable library or if the library is missing from the
      slave.The CREATE andDROP statements are binlogged. A new test was added 
      for replication of user-defined functions (rpl_udf). 
      
      The patch also adds a new column to the mysql.event table named
      'originator' that is used to store the server_id of the server that
      the event originated on. This enables users to promote a slave to a 
      master and later return the promoted slave to a slave and disable the
      replicated events.
      
      
      mysql-test/lib/init_db.sql:
        WL#3629 - Replication of Invocation and Invoked Feature
        This patch adds the SLAVESIDE_DISABLED to the list of enumerated 
        values for the mysql.event table.
        
        This patch adds the column 'originator' to the mysql.event table.
      mysql-test/r/events.result:
        WL#3629 - Replication of Invocation and Invoked Feature
        This patch adds the 'originator' column to the events test results.
        This was necessary to ensure the manual insert into mysql.event table 
        succeeds because the originator column is set to NOT NULL.
      mysql-test/r/events_grant.result:
        WL#3629 - Replication of Invocation and Invoked Feature
        This patch adds the 'originator' column to the events_grant test results.
        This was necessary to ensure the manual insert into mysql.event table 
        succeeds because the originator column is set to NOT NULL.
      mysql-test/r/events_restart_phase1.result:
        WL#3629 - Replication of Invocation and Invoked Feature
        This patch adds the 'originator' column to the events_restart_phase1
        test results. This was necessary to ensure the manual insert into 
        mysql.event table succeeds because the originator column is set to 
        NOT NULL.
      mysql-test/r/system_mysql_db.result:
        WL#3629 - Replication of Invocation and Invoked Feature
        This patch adds the SLAVESIDE_DISABLED to the list of enumerated 
        values for the mysql.event table.
        
        This patch adds the column 'originator' to the mysql.event table.
        
        These changes to the result file were necessary to ensure correct test
        results.
      mysql-test/t/events.test:
        WL#3629 - Replication of Invocation and Invoked Feature
        This patch adds the 'originator' column to the events
        test. This was necessary to ensure the manual insert into 
        mysql.event table succeeds because the originator column is set to 
        NOT NULL.
      mysql-test/t/events_restart_phase1.test:
        WL#3629 - Replication of Invocation and Invoked Feature
        This patch adds the 'originator' column to the events_restart_phase1
        test. This was necessary to ensure the manual insert into 
        mysql.event table succeeds because the originator column is set to 
        NOT NULL.
      scripts/mysql_create_system_tables.sh:
        WL#3629 - Replication of Invocation and Invoked Feature
        This patch adds the SLAVESIDE_DISABLED to the list of enumerated 
        values for the mysql.event table.
        
        This patch adds the column 'originator' to the mysql.event table.
      scripts/mysql_fix_privilege_tables.sql:
        WL#3629 - Replication of Invocation and Invoked Feature
        This patch adds the SLAVESIDE_DISABLED to the list of enumerated 
        values for the mysql.event table.
        
        This patch adds the column 'originator' to the mysql.event table.
      sql/event_data_objects.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch modifies the code to permit processing of the new enum
        SLAVESIDE_DISABLED which is set on the slave during replication
        of events. 
        
        This patch uses the new Event_basic:: enumerated values.
      sql/event_data_objects.h:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch moves the duplicated enumeration values for ENABLED, 
        SLAVESIDE_DISABLED, and DISABLED to the Event_basic class removing
        them from the other Event_* classes.
      sql/event_db_repository.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch modifies the code to permit processing of the new enum
        SLAVESIDE_DISABLED which is set on the slave during replication
        of events. 
        
        The patch also adds a new column to the mysql.event table named
        'originator' that is used to store the server_id of the server that
        the event originated on. This enables users to promote a slave to a 
        master and later return the promoted slave to a slave and disable the
        replicated events.
      sql/event_db_repository.h:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch modifies the code to add a new field named 'originator' 
        to the enum_event_table_field and associated structure.
      sql/event_queue.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch modifies the code to permit processing of the new enum
        SLAVESIDE_DISABLED which is set on the slave during replication
        of events.
      sql/events.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch modifies the code to permit processing of the new enum
        SLAVESIDE_DISABLED which is set on the slave during replication
        of events.
      sql/lex.h:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch modifies the code to add the new SLAVESIDE_DISABLE symbol
        to the lexical parser.
      sql/slave.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch modifies the code to permit the capture of the error on
        the slave when a UDF from a loadable library is not loaded on the server
        when replicated from the master.
      sql/sql_parse.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch removes the comment because drop functions commands 
        are replicated.
      sql/sql_show.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch modifies the code to permit processing of the new enum
        SLAVESIDE_DISABLED which is set on the slave during replication
        of events. The code also adds changes the display width of the status
        column for the schema table for the show events command and also adds
        the new column 'originator' to the events_field_info structure.
      sql/sql_udf.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch modifies the code to add the binlogging of the create and
        drop function events.
      sql/sql_yacc.yy:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch modifies the code to change the enumeration of the status
        column for the events in the parser. The code uses the Event_basic::
        enumerations allowing the enums to be defined in one place.
      mysql-test/t/rpl_events.test:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch adds a new test for testing replication of events. The test
        uses include files so that the test can test under both RBR and SBR.
      mysql-test/r/rpl_events.result:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch adds a new result file for testing replication of events.
      mysql-test/r/rpl_udf.result:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch adds a new result file for testing replication of UDFs.
      mysql-test/t/rpl_udf.test:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch adds a new test for testing replication of UDFs. The test
        uses include files so that the test can test under both RBR and SBR.
      mysql-test/include/rpl_events.inc:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch adds a new include file for testing replication of events.
        This file contains the core test procedures.
      mysql-test/include/rpl_udf.inc:
        WL#3629 - Replication of Invocation and Invoked Features
        This patch adds a new include file for testing replication of UDFs.
        This file contains the core test procedures.
      62b41b5f
  7. 10 Mar, 2007 5 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8a140cb7
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
      
      
      mysql-test/r/explain.result:
        Auto merged
      mysql-test/r/func_default.result:
        Auto merged
      mysql-test/r/func_regexp.result:
        Auto merged
      mysql-test/r/func_test.result:
        Auto merged
      mysql-test/r/having.result:
        Auto merged
      mysql-test/r/olap.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/r/varbinary.result:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      mysql-test/r/func_str.result:
        Manually merged
      mysql-test/t/func_str.test:
        Manually merged
      8a140cb7
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/15757-bug-5.0-opt-mysql · 2f774b47
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
      
      
      sql/item_strfunc.cc:
        Auto merged
      mysql-test/r/func_str.result:
        SCCS merged
      mysql-test/t/func_str.test:
        SCCS merged
      2f774b47
    • unknown's avatar
      Bug#15757: Wrong SUBSTRING() result when a tmp table was employed. · 816ea8a3
      unknown authored
      When the SUBSTRING() function was used over a LONGTEXT field the max_length of
      the SUBSTRING() result was wrongly calculated and set to 0. As the max_length
      parameter is used while tmp field creation it limits the length of the result
      field and leads to printing an empty string instead of the correct result.
      
      Now the Item_func_substr::fix_length_and_dec() function correctly calculates
      the max_length parameter.
      
      
      mysql-test/t/func_str.test:
        Added a test case for the bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
      mysql-test/r/func_str.result:
        Added a test case for the bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
      sql/item_strfunc.cc:
        Bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
        Now the Item_func_substr::fix_length_and_dec() function correctly calculates
        the max_length parameter.
      816ea8a3
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c0a05435
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
      
      
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      sql/item.cc:
        Auto merged
      c0a05435
    • unknown's avatar
      Fixed bug #26830: a crash for the query with a subselect containing ROLLUP. · 4d6ad7ac
      unknown authored
      Crash happened because the function get_best_group_min_max detected
      joins with ROLLUP incorrectly.
      
      
      mysql-test/r/olap.result:
        Added a test case for bug #26830.
      mysql-test/t/olap.test:
        Added a test case for bug #26830.
      4d6ad7ac
  8. 09 Mar, 2007 17 commits
    • unknown's avatar
      Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized · 944030ae
      unknown authored
      away.
      
      Additional fix for bug#22331. Now Item_field prints its value in the case of
      the const field.
      
      
      mysql-test/r/varbinary.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/union.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/subselect.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/func_test.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/having.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/func_regexp.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/func_str.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/func_default.result:
        Corrected test case after fix for bug#22331.
      mysql-test/r/explain.result:
        Corrected test case after fix for bug#22331.
      sql/sql_union.cc:
        Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
        away.
        Cleanup of the SELECT_LEX::order_list list.
      sql/item.h:
        Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
        away.
        Added the print() member function to the Item_field class.
      sql/item.cc:
        Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
        away.
        Added the print() member function to the Item_field class.
      944030ae
    • unknown's avatar
      Bug #25543 Replication of wrong values if using rand() in stored procedure · bcba75df
      unknown authored
      When rand() is called multiple times inside a stored procedure, the server does 
      not binlog the correct random seed values.
      
      This patch corrects the problem by resetting rand_used= 0 in 
      THD::cleanup_after_query() allowing the system to save the random seeds if needed
      for each command in a stored procedure body.
      
      However, rand_used is not reset if executing in a stored function or trigger 
      because these operations are binlogged by call and thus only the calling statement
      need detect the call to rand() made by its substatements. These substatements must 
      not set rand_used to 0 because it would remove the detection of rand() by the 
      calling statement.
      
      
      mysql-test/r/rpl_misc_functions.result:
        Bug #25543 Replication of wrong values if using rand() in stored procedure
        
        The result file was modified to include the correct processing of the new
        additions to the test. The results from execution are written to files on 
        both the master and the slave. The files are compared to ensure the values 
        from rand() generated on the master are correctly generated on the slave.
      mysql-test/t/rpl_misc_functions.test:
        Bug #25543 Replication of wrong values if using rand() in stored procedure
        
        The test was modified to include a test of a stored procedure that calls
        the rand() function multiple times. 
        
        The results from execution are written to files on both the master and the
        slave. The files are compared to ensure the values from rand() generated
        on the master are correctly generated on the slave.
      sql/sql_class.cc:
        Bug #25543 Replication of wrong values if using rand() in stored procedure
        
        The code was modified to reset rand_used so that detection of calls to rand() 
        will save random seeds if needed by the slave.
      bcba75df
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 209802eb
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      sql/item.cc:
        Auto merged
      209802eb
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 52fb60da
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
      
      
      52fb60da
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1 · d5f3bc14
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      d5f3bc14
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c7de22a1
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
      
      
      sql/item_strfunc.cc:
        Auto merged
      mysql-test/r/func_str.result:
        resolved test merge conflicts
      mysql-test/t/func_str.test:
        resolved test merge conflicts
      c7de22a1
    • unknown's avatar
      Bug #26281: · 29b6d554
      unknown authored
       Fixed boundry checks in the INSERT() function:
       were one off.
      
      
      mysql-test/r/func_str.result:
        Bug #26281: test case
      mysql-test/t/func_str.test:
        Bug #26281: test case
      sql/item_strfunc.cc:
        Bug #26281: fixed boundry checks
      29b6d554
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · e68df7a1
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.0-opt
      
      
      sql/item.cc:
        Auto merged
      e68df7a1
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 413604f9
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26661
      
      
      413604f9
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 84ceb01e
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      sql/sql_select.cc:
        Auto merged
      84ceb01e
    • unknown's avatar
      Fixed bug #26661: crash when order by clause in a union · 729bcaf4
      unknown authored
      construct references invalid name.
      Derived tables currently cannot use outer references.
      Thus there is no outer context for them.
      The 4.1 code takes this fact into account while the 
      Item_field::fix_outer_field code of 5.0 lost the check that blocks
      any attempts to resolve names in outer context for derived tables.
      
      
      mysql-test/r/union.result:
        Added a test case for bug #26661.
      mysql-test/t/union.test:
        Added a test case for bug #26661.
      sql/item.cc:
        Fixed bug #26661.
        Derived tables currently cannot use outer references.
        Thus there is no outer context for them.
        The 4.1 code takes this fact into account while the 
        Item_field::fix_outer_field code of 5.0 lost the check that blocks
        any attempts to resolve names in outer context for derived tables.
      729bcaf4
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 76542acd
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      sql/sql_select.cc:
        Auto merged
      76542acd
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 0b85b793
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/order_by.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      mysql-test/r/sp.result:
        merging
      mysql-test/r/view.result:
        merging
      mysql-test/t/func_str.test:
        merging
      mysql-test/t/view.test:
        merging
      0b85b793
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt · 3cd8b881
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      3cd8b881
    • unknown's avatar
      aftermerge fix · 32ed7ddc
      unknown authored
      
      mysql-test/r/sp.result:
        merging
      mysql-test/r/view.result:
        merging
      32ed7ddc
    • unknown's avatar
      aftermerge fix · 5c1e48c5
      unknown authored
      
      mysql-test/r/view.result:
        merging
      5c1e48c5
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-5.1 · e51213dd
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      e51213dd
  9. 08 Mar, 2007 5 commits
    • unknown's avatar
      rpl_ssl.result, rpl_ssl.test: · d4ede3f5
      unknown authored
        Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
      
      
      mysql-test/t/rpl_ssl.test:
        Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
      mysql-test/r/rpl_ssl.result:
        Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
      d4ede3f5
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1 · 3d52be15
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
      
      
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/order_by.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      mysql-test/r/func_str.result:
        merging
      mysql-test/r/sp.result:
        merging
      mysql-test/r/view.result:
        merging
      mysql-test/t/func_str.test:
        merging
      mysql-test/t/view.test:
        merging
      3d52be15
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · 12af6585
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
      
      
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/order_by.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      mysql-test/r/func_str.result:
        merging
      mysql-test/r/sp.result:
        merging
      mysql-test/r/view.result:
        merging
      mysql-test/t/func_str.test:
        merging
      mysql-test/t/view.test:
        merging
      12af6585
    • unknown's avatar
      The most recent push into mysql-5.1 from mysql-5.2 was a mistake. · f68891f8
      unknown authored
      This just reverses those changes.  I'm really sorry about that.
      
      configure.in, version.c:
        Reverse last push (from mysql-5.2 into mysql-5.1)
      
      
      configure.in:
        Reverse last push (from mysql-5.2 into mysql-5.1)
      storage/ndb/src/common/util/version.c:
        Reverse last push (from mysql-5.2 into mysql-5.1)
      f68891f8
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · 0fcd9c2b
      unknown authored
      into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt
      
      
      0fcd9c2b