1. 18 May, 2008 4 commits
    • unknown's avatar
      Merge host.loc:/work/bk/5.0-bugteam · 41a0a2d7
      unknown authored
      into  host.loc:/work/bk/5.1-bugteam
      
      
      sql/sql_update.cc:
        Auto merged
      41a0a2d7
    • unknown's avatar
      Merge host.loc:/work/bugs/5.0-bugteam-36676 · fed90a01
      unknown authored
      into  host.loc:/work/bk/5.0-bugteam
      
      fed90a01
    • unknown's avatar
      Fixed bug#36676: multiupdate using LEFT JOIN updates only · 2a1015fe
      unknown authored
                       first row or fails with an error:
        ERROR 1022 (23000): Can't write; duplicate key in table ''
      
      The server uses intermediate temporary table to store updated
      row data.  The first column of this table contains rowid.
      Current server implementation doesn't reset NULL flag of that
      column even if the server fills a column with rowid.
      To keep each rowid unique, there is an unique index.
      An insertion into an unique index takes into account NULL
      flag of key value and ignores real data if NULL flag is set.
      So, insertion of actually different rowids may lead to two
      kind of problems.  Visible effect of each of these problems
      depends on an initial engine type of temporary table:
      
      1. If multiupdate initially creates temporary table as
      a MyISAM table (a table contains blob columns, and the
      create_tmp_table function assumes, that this table is
      large), it inserts only one single row and updates
      only rows with one corresponding rowid. Other rows are
      silently ignored. 
      
      2. If multiupdate initially creates MEMORY temporary
      table, fills it with data and reaches size limit for
      MEMORY tables (max_heap_table_size), multiupdate
      converts MEMORY table into MyISAM table and fails
      with an error:
        ERROR 1022 (23000): Can't write; duplicate key in table ''
      
      
      Multiupdate has been fixed to update the NULL flag of
      temporary table rowid columns.
      
      
      
      mysql-test/r/multi_update_tiny_hash.result:
        Added test case for bug#36676.
      mysql-test/t/multi_update_tiny_hash-master.opt:
        Added test case for bug#36676.
      mysql-test/t/multi_update_tiny_hash.test:
        Added test case for bug#36676.
      sql/sql_update.cc:
        Fixed bug#36676: multiupdate using LEFT JOIN updates only
                         first row or fails with an error:
          ERROR 1022 (23000): Can't write; duplicate key in table ''
        
        The multi_update::send_data method has been modified to reset null bits of
        fields containing rowids.
      2a1015fe
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-bugteam · 3f7da38d
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
      
      
      sql/handler.cc:
        Auto merged
      configure.in:
        merge 5.0-bugteam to 5.1-bugteam
      3f7da38d
  2. 17 May, 2008 1 commit
  3. 16 May, 2008 24 commits
  4. 15 May, 2008 11 commits
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570 · 131e845d
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
      
      
      BitKeeper/deleted/.del-binlog_innodb.result:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
        need to re-record.
      mysql-test/suite/rpl/r/rpl_sp.result:
        need to re-record.
      mysql-test/r/mysqlbinlog.result:
        manual merge.
      mysql-test/suite/rpl/t/rpl_sp.test:
        manual merge.
      sql/sp.cc:
        manual merge.
      sql/sp_head.h:
        manual merge.
      131e845d
    • unknown's avatar
      Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/clean/mysql-5.1-bugteam · 5beaa327
      unknown authored
      into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/test_fix/mysql-5.1-bugteam_35744
      
      5beaa327
    • unknown's avatar
      Bug#36570: Parse error of CREATE PROCEDURE stmt with comments on \ · 4a3c5ef3
      unknown authored
      	slave
      
      The stored-routine code took the contents of the (lowest) parser
      and copied it directly to the binlog, which causes problems if there
      is a special case of interpretation at the parser level -- which 
      there is, in the "/*!VER */" comments.  The trailing "*/" caused
      errors on the slave, naturally.
      
      Now, since by that point we have /properly/ created parse-tree (as 
      the rest of the server should do!) for the stored-routine CREATE, we
      can construct a perfect statement from that information, instead of
      writing uncertain information from an unknown parser state.  
      Fortunately, there's already a function nearby that does exactly 
      that.
      ---
      Update for Bug#36570.  Qualify routine names with db name when
      writing to the binlog ONLY if the source text is qualified.
      
      
      mysql-test/r/binlog_innodb.result:
        Offsets changed due to quoting.
        ---
        New offset to account for db-qualified names.
      mysql-test/r/ctype_cp932_binlog.result:
        Offsets changed due to quoting.
        ---
        Qualify routine names with DB.  Offsets change also.
      mysql-test/r/mysqlbinlog.result:
        Case changed in result due to interpretation of data instead of 
        literal recitation.
        ---
        Qualify procedure name with db.
      mysql-test/r/rpl_sp.result:
        Offsets changed due to quoting.  Added tests.
        ---
        Qualify routine names with DB if qualified in query.  Offsets change also.
      mysql-test/t/rpl_sp.test:
        Add version-limiting quotes to exercise bug#36570.  Test that 
        backtick-quoted identifiers and labels work also.
        ---
        Use different db to show qualification works.  Qualify routine names
        with DB if qualified in query.
      sql/sp.cc:
        In create_string, we may not have a sp_name parameter yet, so
        instead pass the char* and length of the only member we'd get out
        of it.
        
        Having done that, we can use the same function to write the 
        CREATE (FUNC|TRIG|PROC) statement to the binlog as we always used
        to display the statement to the user.
        ---
        Make the db name part of the CREATE string if it is specified.
        
        Specify it in part of writing to the binlog when creating a new
        routine.
      sql/sp_head.cc:
        Set the sp_head m_explicit_name member as the sp_name member is set.  
        We can not peek at this later, as the sp_name is gone by then.
      sql/sp_head.h:
        Add a member to track whether the name is qualified with the 
        database.
      4a3c5ef3
    • unknown's avatar
      Merge riska.(none):/home/sven/bkroot/5.1-bugteam · 8582bb44
      unknown authored
      into  riska.(none):/home/sven/bk/b36433-rpl_insert_id/5.1-bugteam
      
      8582bb44
    • unknown's avatar
      Merge mats-laptop.(none):/home/bkroot/mysql-5.1-bugteam · 5c9dd15b
      unknown authored
      into  mats-laptop.(none):/home/bk/b36197-mysql-5.1-bugteam
      
      5c9dd15b
    • unknown's avatar
      Merge five.local.lan:/work/merge/mysql-5.1-bugteam-newjp · 252187d6
      unknown authored
      into  five.local.lan:/work/trees/mysql-5.1-bugteam-src-clean
      
      252187d6
    • unknown's avatar
      Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/clean/mysql-5.1-bugteam · beb7b937
      unknown authored
      into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/test_fix/mysql-5.1-bugteam_35744
      
      beb7b937
    • unknown's avatar
      Fix for · 2c3ab6d1
      unknown authored
        Bug#28563 Test suite "jp" fails completely
      - The main goal of this fix is to make the "jp" suite runnable in general
        and to make it more robust for use in pushbuild under build team conditions.
      - It was decided to fix the remaining heavy issues within the
        architecture of this test later
        (-> WL 4327 Redesign the 'jp' testsuite for build team testing conditions)
        Only the test jp_trim_sjis got some significant improvements of its
        architecture (Just as proof of concept for the other tests).
      - Tests suffering from
           Bug 36597 Testsuite "jp": Suspicious results for some tests
                     (unexpected result sets)
        were disabled
      - *.opt files were used to avoid differences on OS (Windows) because of
        case sensitive tablenames within the tests  
      
      
      mysql-test/suite/jp/r/jp_alter_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_alter_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_alter_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_alter_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_charlength_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_charlength_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_charlength_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_charlength_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_charset_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_charset_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_charset_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_charset_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_convert_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_convert_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_convert_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_convert_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_create_db_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_create_db_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_create_db_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_create_db_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_create_tbl_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_create_tbl_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_create_tbl_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_create_tbl_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_enum_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_enum_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_enum_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_enum_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_insert_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_insert_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_insert_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_insert_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_instr_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_instr_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_instr_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_instr_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_join_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_join_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_join_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_join_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_left_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_left_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_left_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_left_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_length_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_length_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_length_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_length_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_like_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_like_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_like_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_like_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_locate_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_locate_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_locate_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_locate_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_lpad_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_lpad_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_lpad_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_lpad_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_ltrim_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_ltrim_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_ltrim_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_ltrim_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_ps_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_ps_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_replace_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_replace_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_replace_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_replace_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_reverse_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_reverse_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_reverse_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_reverse_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_right_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_right_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_right_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_right_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_rpad_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_rpad_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_rpad_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_rpad_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_rtrim_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_rtrim_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_rtrim_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_rtrim_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_select_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_select_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_select_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_select_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_subquery_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_subquery_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_subquery_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_subquery_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_substring_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_substring_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_substring_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_substring_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_trim_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_trim_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_trim_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_trim_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_union_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_update_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_update_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_update_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_update_utf8.result:
        Updated results
      mysql-test/suite/jp/r/jp_where_sjis.result:
        Updated results
      mysql-test/suite/jp/r/jp_where_ucs2.result:
        Updated results
      mysql-test/suite/jp/r/jp_where_ujis.result:
        Updated results
      mysql-test/suite/jp/r/jp_where_utf8.result:
        Updated results
      mysql-test/suite/jp/t/jp_alter_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_alter_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_alter_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_alter_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_charlength_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_charlength_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_charlength_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_charlength_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_charset_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_charset_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_charset_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_charset_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_convert_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_convert_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_convert_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_convert_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_create_db_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_create_db_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_create_tbl_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_create_tbl_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_create_tbl_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_create_tbl_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_enum_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_enum_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_enum_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_enum_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_insert_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_insert_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_insert_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_insert_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_instr_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_instr_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_instr_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_instr_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_join_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_join_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_join_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_join_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_left_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_left_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_left_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_left_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_length_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_length_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_length_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_length_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_like_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_like_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_like_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_like_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_locate_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_locate_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_locate_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_locate_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_lpad_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_lpad_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_lpad_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_lpad_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_ltrim_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_ltrim_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_ltrim_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_ltrim_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_ps_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_ps_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_replace_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_replace_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_replace_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_replace_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_reverse_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_reverse_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_reverse_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_reverse_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_right_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_right_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_right_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_right_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_rpad_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_rpad_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_rpad_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_rpad_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_rtrim_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_rtrim_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_rtrim_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_rtrim_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_select_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_select_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_select_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_select_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_subquery_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_subquery_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_subquery_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_subquery_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_substring_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_substring_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_substring_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_substring_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_trim_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_trim_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_trim_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_trim_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_union_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_update_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_update_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_update_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_update_utf8.test:
        Updated results
      mysql-test/suite/jp/t/jp_where_sjis.test:
        Updated results
      mysql-test/suite/jp/t/jp_where_ucs2.test:
        Updated results
      mysql-test/suite/jp/t/jp_where_ujis.test:
        Updated results
      mysql-test/suite/jp/t/jp_where_utf8.test:
        Updated results
      mysql-test/suite/jp/include/trim_sjis.inc:
        Auxiliary script
      mysql-test/suite/jp/t/disabled.def:
        Disable tests which suffer to an unacceptable extend
            from bug 36597 Testsuite "jp": Suspicious results for some tests
      2c3ab6d1
    • unknown's avatar
      BUG#36433: rpl_insert_id detects inconsistency on master · 9f8f7558
      unknown authored
      Problem: If INSERT is immediately followed by SELECT in another thread,
      the newly inserted rows may not be returned by the SELECT statement, if
      ENGINE=myisam and @@concurrent_insert=1. This caused sporadic errors in
      rpl_insert_id.
      Fix: The test now uses ENGINE=$engine_type when creating tables (so that
      innodb is used). It also turns off @@concurrent_insert around the critical
      place, so that it works if someone in the future writes a test that sets
      $engine_type=myisam before sourcing extra/rpl_tests/rpl_insert_id.test.
      It also adds ORDER BY to all SELECTs so that the result is deterministic.
      
      
      mysql-test/extra/rpl_tests/rpl_insert_id.test:
        - Use ENGINE=$engine_type when creating tables, since that's expected by
        suite/rpl/t/rpl_insert_id.test.
        - Use ORDER BY to avoid nondeterministic results from SELECT.
        - Set @@concurrent_insert=0 before doing SELECT after INSERT in another
        client.
      mysql-test/suite/rpl/r/rpl_insert_id.result:
        Update result file.
      9f8f7558
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570 · 8c1c06de
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
      
      
      BitKeeper/deleted/.del-binlog_innodb.result:
        Auto merged
      mysql-test/r/mysqlbinlog.result:
        need to record.
      mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
        need to record.
      mysql-test/suite/rpl/r/rpl_sp.result:
        need to record.
      mysql-test/suite/rpl/t/rpl_sp.test:
        manual merge.
      sql/sp.cc:
        Manual merge
      8c1c06de
    • unknown's avatar
      8cb5c40e