1. 16 May, 2008 9 commits
  2. 15 May, 2008 8 commits
    • unknown's avatar
      Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/clean/mysql-5.1-bugteam · 8eaa55fb
      unknown authored
      into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/test_fix/mysql-5.1-bugteam_35744
      
      
      8eaa55fb
    • unknown's avatar
      Merge riska.(none):/home/sven/bkroot/5.1-bugteam · 19e1bc76
      unknown authored
      into  riska.(none):/home/sven/bk/b36433-rpl_insert_id/5.1-bugteam
      
      
      19e1bc76
    • unknown's avatar
      Merge mats-laptop.(none):/home/bkroot/mysql-5.1-bugteam · 439cbe54
      unknown authored
      into  mats-laptop.(none):/home/bk/b36197-mysql-5.1-bugteam
      
      
      439cbe54
    • unknown's avatar
      Merge five.local.lan:/work/merge/mysql-5.1-bugteam-newjp · 6a6ec902
      unknown authored
      into  five.local.lan:/work/trees/mysql-5.1-bugteam-src-clean
      
      
      6a6ec902
    • unknown's avatar
      Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/clean/mysql-5.1-bugteam · 341f9ab2
      unknown authored
      into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/test_fix/mysql-5.1-bugteam_35744
      
      
      341f9ab2
    • unknown's avatar
      Fix for · 7ab1c8dc
      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
      7ab1c8dc
    • unknown's avatar
      BUG#36433: rpl_insert_id detects inconsistency on master · c25bd6fc
      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.
      c25bd6fc
    • unknown's avatar
      4f706f33
  3. 14 May, 2008 10 commits
    • unknown's avatar
      Bug #32966: status still fails : disabling · e346232b
      unknown authored
      e346232b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-bugteam · 7b3f0677
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
      
      
      7b3f0677
    • unknown's avatar
      Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam · 74282b57
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam
      
      
      mysql-test/t/disabled.def:
        Auto merged
      74282b57
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam · cd81c92f
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
      
      
      cd81c92f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1 · 92aba175
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
      
      
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_views.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
        Auto merged
      mysql-test/suite/funcs_1/views/views_master.inc:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_views.result:
        merge of 5.1 to 5.1-bugteam
      92aba175
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 21c07eb7
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
      
      
      21c07eb7
    • unknown's avatar
      Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam · 2a47b78d
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam
      
      
      mysql-test/t/disabled.def:
        Auto merged
      2a47b78d
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam · 744a6436
      unknown authored
      into  noir.wlan.koehntopp.de:/misc/mysql/3/51-3
      
      
      mysql-test/r/mix2_myisam.result:
        Auto merged
      mysql-test/t/disabled.def:
        manual merge
      744a6436
    • unknown's avatar
      Bug#36522: Some tests of system variables have diffs on 64bit platorms · 19e550ba
      unknown authored
      temporary mass-disable of affected tests
      
      
      mysql-test/t/disabled.def:
        temporary mass-disable of problematic tests
      19e550ba
    • unknown's avatar
      revert the following CS on grounds of "right patch, wrong time": · 2c91699e
      unknown authored
        
       "Apply InnoDB snapshot innodb-5.1-ss2438.
      
        Addresses the following bugs:
      
        Change the fix for Bug#32440 to show bytes instead of kilobytes in
        INFORMATION_SCHEMA.TABLES.DATA_FREE.
      
        branches/5.1: Fix bug#29507 TRUNCATE shows to many rows effected
        In InnoDB, the row count is only a rough estimate used by SQL
        optimization. InnoDB is now return row count 0 for TRUNCATE operation.
      
        branches/5.1: Fix bug#35537 - Innodb doesn't increment handler_update
        and handler_delete
        Add the calls to ha_statistic_increment() in ha_innobase::delete_row()
        and ha_innobase::update_row().
      
        Fix Bug#36169 create innodb compressed table with too large row size crash
        Sometimes it is possible that
        row_drop_table_for_mysql(index->table_name, trx, FALSE); is invoked in
        row_create_index_for_mysql() when the index object is freed so copy the
        table name to a safe place beforehand and use the copy.
      
        Fix Bug#36434 ha_innodb.so is installed in the wrong directory
        Change pkglib_LTLIBRARIES with pkgplugin_LTLIBRARIES which has been
        forgotten in this commit: http://lists.mysql.com/commits/40206"
      
      
      mysql-test/r/innodb.result:
        revert InnoDB snapshot innodb-5.1-ss2438
      mysql-test/r/mix2_myisam.result:
        merge-fixes: undoing previous unspecified post-merge fixes
        by kaa a/o 2008/2/13 (1.7)
      mysql-test/t/innodb.test:
        revert InnoDB snapshot innodb-5.1-ss2438
      storage/innobase/Makefile.am:
        revert InnoDB snapshot innodb-5.1-ss2438
      storage/innobase/handler/ha_innodb.cc:
        revert InnoDB snapshot innodb-5.1-ss2438
      storage/innobase/plug.in:
        revert InnoDB snapshot innodb-5.1-ss2438
      storage/innobase/row/row0mysql.c:
        revert InnoDB snapshot innodb-5.1-ss2438
      storage/innobase/row/row0sel.c:
        revert InnoDB snapshot innodb-5.1-ss2438
      2c91699e
  4. 13 May, 2008 13 commits
    • unknown's avatar
      Bug#35744 - Test 'partition_alter1_innodb' times out on multiple platforms. · e3817397
      unknown authored
      Split the test into 3 smaller parts, reducing single test run time.
      
      NDB variant still disabled. The runtime for a single test is greater than the runtime
      for the Innodb variant that was timing out.  The test works, but disabled for Build systems.
      
      
      BitKeeper/deleted/.del-partition_alter1_innodb.test:
        ***MISSING TEXT***
      BitKeeper/deleted/.del-partition_alter1_myisam.test:
        ***MISSING TEXT***
      BitKeeper/deleted/.del-partition_alter1_ndb.test:
        ***MISSING TEXT***
      BitKeeper/deleted/.del-partition_alter1_myisam.result:
        ***MISSING TEXT***
      BitKeeper/deleted/.del-partition_alter1_innodb.result:
        ***MISSING TEXT***
      BitKeeper/deleted/.del-partition_alter1.inc:
        ***MISSING TEXT***
      mysql-test/suite/parts/t/disabled.def:
        ***MISSING TEXT***
      mysql-test/suite/parts/inc/partition_alter1_1.inc:
        ***MISSING WEAVE***
      mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test:
        ***MISSING WEAVE***
      mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test:
        ***MISSING WEAVE***
      mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test:
        ***MISSING WEAVE***
      mysql-test/suite/parts/t/partition_alter1_1_innodb.test:
        ***MISSING WEAVE***
      mysql-test/suite/parts/t/partition_alter1_1_myisam.test:
        ***MISSING WEAVE***
      mysql-test/suite/parts/t/partition_alter1_1_ndb.test:
        ***MISSING WEAVE***
      mysql-test/suite/parts/t/partition_alter1_2_innodb.test:
        ***MISSING WEAVE***
      mysql-test/suite/parts/t/partition_alter1_2_myisam.test:
        ***MISSING WEAVE***
      mysql-test/suite/parts/t/partition_alter1_2_ndb.test:
        ***MISSING WEAVE***
      BitKeeper/etc/ignore:
        ***MISSING TEXT***
      mysql-test/suite/parts/inc/partition_alter1_1_2.inc:
        ***MISSING WEAVE***
      mysql-test/suite/parts/inc/partition_alter1_2.inc:
        ***MISSING WEAVE***
      mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result:
        ***MISSING WEAVE***
      mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result:
        ***MISSING WEAVE***
      mysql-test/suite/parts/r/partition_alter1_1_2_ndb.result:
        ***MISSING WEAVE***
      mysql-test/suite/parts/r/partition_alter1_1_innodb.result:
        ***MISSING WEAVE***
      mysql-test/suite/parts/r/partition_alter1_1_myisam.result:
        ***MISSING WEAVE***
      mysql-test/suite/parts/r/partition_alter1_1_ndb.result:
        ***MISSING WEAVE***
      mysql-test/suite/parts/r/partition_alter1_2_innodb.result:
        ***MISSING WEAVE***
      mysql-test/suite/parts/r/partition_alter1_2_myisam.result:
        ***MISSING WEAVE***
      mysql-test/suite/parts/r/partition_alter1_2_ndb.result:
        ***MISSING WEAVE***
      e3817397
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-bugteam · 4e0c2660
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/win64-warn-5.1-bugteam
      
      
      4e0c2660
    • unknown's avatar
      Fixed bug #36488: regexp returns false matches, concatenating · 66367aee
      unknown authored
                        with previous rows.
      
      The WHERE clause containing expression:
        CONCAT(empty_field1, empty_field2, ..., 'literal constant', ...)
          REGEXP 'regular expression'
      may return wrong matches.
      
      Optimization of the CONCAT function has been fixed.
      
      
      
      mysql-test/r/func_concat.result:
        Added test case for bug #36488.
      mysql-test/t/func_concat.test:
        Added test case for bug #36488.
      sql/item_strfunc.cc:
        Fixed bug #36488.
        The Item_func_concat::val_str method is optimized to
        use first non-empty argument of the CONCAT function for in-place
        result accumulation. This optimization is acceptable if that
        first argument is not a constant.
        However, current implementation checks this condition only for
        the first actual argument of the CONCAT function.
        So, the Item_func_concat::val_str method can corrupt values
        of, for example, literal strings by appending random data.
        
        The Item_func_concat::val_str method has been modified to take
        into account the ability to be modified in-place for the first
        non-empty argument.
      66367aee
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam · 03dfe204
      unknown authored
      into  host.loc:/work/bk/5.1-bugteam
      
      
      03dfe204
    • unknown's avatar
      disabled.def: · 216ed805
      unknown authored
        max_heap_table_size_basic_32, query_cache_size_basic_32 and 
        tmp_table_size_basic_32 tests have been disabled according to
        bug #36522.
      
      
      mysql-test/t/disabled.def:
        max_heap_table_size_basic_32, query_cache_size_basic_32 and 
        tmp_table_size_basic_32 tests have been disabled according to
        bug #36522.
      216ed805
    • unknown's avatar
      Bug #32858: Erro: "Incorrect usage of UNION and INTO" does not take · 2cc7999b
      unknown authored
      subselects into account
        
      It is forbidden to use the SELECT INTO construction inside UNION statements
      unless on the last SELECT of the union. The parser records whether it 
      has seen INTO or not when parsing a UNION statement. But if the INTO was
      legally used in an outer query, an error is thrown if UNION is seen in a
      subquery. Fixed in 5.0 by remembering the nesting level of INTO tokens and 
      mitigate the error unless it collides with the UNION.
      
      
      mysql-test/r/union.result:
        Bug#32858: Test result
      mysql-test/t/union.test:
        Bug#32858: Test case
      sql/sql_class.cc:
        Bug#32858: Initializing new member
      sql/sql_class.h:
        Bug#32858: Added property nest_level to select_result class.
      sql/sql_yacc.yy:
        Bug#32858: The fix.
      2cc7999b
    • unknown's avatar
      mix2_myisam.result: · 295d15f4
      unknown authored
        Post-push test case update (bug #30059).
      
      
      mysql-test/r/mix2_myisam.result:
        Post-push test case update (bug #30059).
      295d15f4
    • unknown's avatar
      Bug#32966 main.status fails · e17706ee
      unknown authored
      FLUSH STATUS doesn't clear the values of the global status variables.
      The test case is reduced to testing session local Com-variables until
      FLUSH GLOBAL STATUS is implemented.
      
      
      mysql-test/r/status.result:
        Reduce test to testing session status until 'FLUSH GLOBAL STATUS' is
        implemented.
      mysql-test/t/disabled.def:
        Enable main.status.test.
      mysql-test/t/status.test:
        Reduce test to testing session status until 'FLUSH GLOBAL STATUS' is
        implemented.
      e17706ee
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/mysql-5.0-release-merge · 6009980f
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.1
      
      
      BUILD/Makefile.am:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/std_data/funcs_1/innodb_tb1.txt:
        Auto merged
      mysql-test/std_data/funcs_1/innodb_tb2.txt:
        Auto merged
      mysql-test/std_data/funcs_1/innodb_tb3.txt:
        Auto merged
      mysql-test/std_data/funcs_1/innodb_tb4.txt:
        Auto merged
      mysql-test/std_data/funcs_1/memory_tb1.txt:
        Auto merged
      mysql-test/std_data/funcs_1/memory_tb2.txt:
        Auto merged
      mysql-test/std_data/funcs_1/memory_tb3.txt:
        Auto merged
      mysql-test/std_data/funcs_1/memory_tb4.txt:
        Auto merged
      mysql-test/std_data/funcs_1/myisam_tb1.txt:
        Auto merged
      mysql-test/std_data/funcs_1/myisam_tb2.txt:
        Auto merged
      mysql-test/std_data/funcs_1/myisam_tb3.txt:
        Auto merged
      mysql-test/std_data/funcs_1/myisam_tb4.txt:
        Auto merged
      mysql-test/std_data/funcs_1/t3.txt:
        Auto merged
      mysql-test/std_data/funcs_1/t4.txt:
        Auto merged
      mysql-test/std_data/funcs_1/t7.txt:
        Auto merged
      mysql-test/std_data/funcs_1/t9.txt:
        Auto merged
      mysql-test/suite/funcs_1/README.txt:
        Auto merged
      mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
        Auto merged
      mysql-test/suite/funcs_1/datadict/datadict_load.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/innodb_tb1.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/innodb_tb2.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/innodb_tb3.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/innodb_tb4.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/memory_tb1.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/memory_tb2.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/memory_tb3.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/memory_tb4.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/myisam_tb1.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/myisam_tb2.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/myisam_tb3.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/myisam_tb4.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/sp_tb.inc:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_09.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_columns_innodb.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_columns_memory.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_columns_myisam.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_tables_ndb.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_0102.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_0407.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_09.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_views.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_09.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
        Auto merged
      mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
        Auto merged
      mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_03.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_08.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_09.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
        Auto merged
      mysql-test/suite/funcs_1/views/func_view.inc:
        Auto merged
      mysql-test/suite/funcs_1/views/views_master.inc:
        Auto merged
      6009980f
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 54998d61
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.0-release-merge
      
      
      BUILD/Makefile.am:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/std_data/funcs_1/innodb_tb1.txt:
        Auto merged
      mysql-test/std_data/funcs_1/innodb_tb2.txt:
        Auto merged
      mysql-test/std_data/funcs_1/innodb_tb3.txt:
        Auto merged
      mysql-test/std_data/funcs_1/innodb_tb4.txt:
        Auto merged
      mysql-test/std_data/funcs_1/memory_tb1.txt:
        Auto merged
      mysql-test/std_data/funcs_1/memory_tb2.txt:
        Auto merged
      mysql-test/std_data/funcs_1/memory_tb3.txt:
        Auto merged
      mysql-test/std_data/funcs_1/memory_tb4.txt:
        Auto merged
      mysql-test/std_data/funcs_1/myisam_tb1.txt:
        Auto merged
      mysql-test/std_data/funcs_1/myisam_tb2.txt:
        Auto merged
      mysql-test/std_data/funcs_1/myisam_tb3.txt:
        Auto merged
      mysql-test/std_data/funcs_1/myisam_tb4.txt:
        Auto merged
      mysql-test/std_data/funcs_1/t3.txt:
        Auto merged
      mysql-test/std_data/funcs_1/t4.txt:
        Auto merged
      mysql-test/std_data/funcs_1/t7.txt:
        Auto merged
      mysql-test/std_data/funcs_1/t9.txt:
        Auto merged
      mysql-test/suite/funcs_1/README.txt:
        Auto merged
      mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
        Auto merged
      mysql-test/suite/funcs_1/datadict/datadict_load.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/innodb_tb1.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/innodb_tb2.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/innodb_tb3.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/innodb_tb4.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/memory_tb1.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/memory_tb2.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/memory_tb3.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/memory_tb4.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/myisam_tb1.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/myisam_tb2.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/myisam_tb3.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/myisam_tb4.inc:
        Auto merged
      mysql-test/suite/funcs_1/include/sp_tb.inc:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_func_view.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_09.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_columns_innodb.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_columns_memory.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_columns_myisam.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_columns_ndb.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_tables_innodb.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_tables_memory.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_tables_myisam.result:
        Auto merged
      mysql-test/suite/funcs_1/r/is_tables_ndb.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_func_view.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_0102.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_0407.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_09.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory_views.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_func_view.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_03.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_08.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_09.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam_views.result:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
        Auto merged
      mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
        Auto merged
      mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
        Auto merged
      mysql-test/suite/funcs_1/t/is_basics_mixed.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
        Auto merged
      mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
        Auto merged
      mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
        Auto merged
      mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_03.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_08.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_09.inc:
        Auto merged
      mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
        Auto merged
      mysql-test/suite/funcs_1/views/func_view.inc:
        Auto merged
      mysql-test/suite/funcs_1/views/views_master.inc:
        Auto merged
      BitKeeper/deleted/.del-load_file.txt:
        Delete: mysql-test/std_data/funcs_1/load_file.txt
      54998d61
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-bugteam · b6fdf4d9
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/win64-warn-5.1-bugteam
      
      
      b6fdf4d9
    • unknown's avatar
      fixed the win64 build failure · 534a4593
      unknown authored
      534a4593
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam · f5fda859
      unknown authored
      into  host.loc:/work/bk/5.1-bugteam
      
      
      f5fda859