1. 22 Aug, 2005 1 commit
  2. 21 Aug, 2005 1 commit
  3. 20 Aug, 2005 2 commits
  4. 19 Aug, 2005 8 commits
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 6681d0bd
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      6681d0bd
    • unknown's avatar
      Fix ctype_cp932 test to be deterministic on different machines. · fa4f5414
      unknown authored
      
      mysql-test/r/ctype_cp932.result:
        Update results to make them deterministic
      mysql-test/t/ctype_cp932.test:
        Updated test to be deterministic on all machines
      fa4f5414
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 843b7f65
      unknown authored
      into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean
      
      
      sql/mysqld.cc:
        Auto merged
      843b7f65
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 24aeee42
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      24aeee42
    • unknown's avatar
      Bug#11338 Fixes from review (identical functionality). · 7eecc2d6
      unknown authored
      
      include/my_sys.h:
        Fixes from review (use version in log_event.cc instead)
      mysql-test/r/ctype_cp932.result:
        Updated test for bug#11338 (logging of prepared statement w/ blob type)
      mysql-test/t/ctype_cp932.test:
        udpated test for bug#11338 (logging of prepared statement w/ blob type)
      mysys/charset.c:
        Fixes from review (use version in log_event.cc instead)
      sql/item.cc:
        Fixes from review (store character_set_client differently so that
        fix can be merged forward to 5.0)
      sql/item.h:
        Fixes from review
      sql/log_event.cc:
        Fixes from review, str_to_hex is now used by item.cc
      sql/log_event.h:
        Added prototype for str_to_hex (now used by item.cc)
      sql/sql_prepare.cc:
        Fixes from review, store character_set_client differently so that 
        Item_param::query_val_str can use it.
      7eecc2d6
    • unknown's avatar
      distinct.test, distinct.result: · 87190222
      unknown authored
        Added test cases for bug #12625.
      sql_select.cc:
        Fixed bug #12625.
        Fixed invalid removal of constant items from the DISTINCT
        list in the function create_distinct_group.
      
      
      sql/sql_select.cc:
        Fixed bug #12625.
      mysql-test/r/distinct.result:
        Added test cases for bug #12625.
      mysql-test/t/distinct.test:
        Added test cases for bug #12625.
      87190222
    • unknown's avatar
      BUG #12498 Fixed mispelling · af5633ee
      unknown authored
      
      sql/mysqld.cc:
        BUG #12498 Fixed Mispelled 'type'
      af5633ee
    • unknown's avatar
      updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication). · f4186eae
      unknown authored
      We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's 
      suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and 
      logging now is done in batches - new batch is started if the buffer becomes full.
      Reduced memory usage by reusing the table list instead of accumulating a list of 
      dropped table names. Also fixed the problem if the table was not actually dropped, eg
      due to permissions. Extended the test case to make sure batched query 
      logging does work.  
      
      
      mysql-test/r/rpl_drop_db.result:
        test for query buffer overrun
      mysql-test/t/rpl_drop_db.test:
        test for query buffer overrun
      sql/mysql_priv.h:
        updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
      BitKeeper/etc/ignore:
        Added support-files/MacOSX/postflight support-files/MacOSX/preflight to the ignore list
      sql/sql_db.cc:
        updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
      sql/sql_table.cc:
        updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
      sql/table.h:
        updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
      f4186eae
  5. 18 Aug, 2005 4 commits
  6. 17 Aug, 2005 7 commits
    • unknown's avatar
      Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 36f88a95
      unknown authored
      into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
      
      
      sql/mysql_priv.h:
        Auto merged
      36f88a95
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5ea5fab4
      unknown authored
      into  linux.site:/home/reggie/bk/mysql-4.1
      
      5ea5fab4
    • unknown's avatar
    • unknown's avatar
      mysql-test-run.pl, mtr_misc.pl: · 1991b55c
      unknown authored
        Bug#12615: Host name might not resolve, use short host name
      
      
      mysql-test/lib/mtr_misc.pl:
        Bug#12615: Host name might not resolve, use short host name
      mysql-test/mysql-test-run.pl:
        Bug#12615: Host name might not resolve, use short host name
      1991b55c
    • unknown's avatar
      Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 · c0dc1f98
      unknown authored
      into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug11338
      
      
      sql/item.h:
        Auto merged
      c0dc1f98
    • unknown's avatar
      BUG#11338 (logging of prepared statement w/ blob type) · 48fa74fd
      unknown authored
      In cp932, '\' character can be the second byte in a 
      multi-byte character stream. This makes it difficult to use
      mysql_escape_string. Added flag to indicate which languages allow
      '\' as second byte of multibyte sequence so that when putting a prepared
      statement into the binlog we can decide at runtime whether hex encoding
      is really needed.
      
      
      include/m_ctype.h:
        Added bool to indicate character sets which allow '\' as the second
        byte of a multibyte character set (currently only cp932). For these
        character sets, escaping with '\' is dangerous and leads to corruption
        in replication.
      include/my_sys.h:
        Add function to enocde a string as hex with no prefix (bare)
      mysys/charset.c:
        Add function to encode string as hex with no prefix (bare).
      sql/item.cc:
        Check the connection character set to see if escape_string_for_mysql
        is safe, or if character set requires unambiguous (hex) encoding
      sql/item.h:
        Pass thd to query_val_str for access to charset()
      sql/sql_prepare.cc:
        Pass thd to query_val_str.
      strings/ctype-big5.c:
        Add escape_with_backslash_is_dangerous flag.
      strings/ctype-bin.c:
        Add escape_with_backslash_is_dangerous flag
      strings/ctype-cp932.c:
        Add escape_with_backslash_is_dangerous flag.
      strings/ctype-czech.c:
        Add escape_with_backslash_is_dangerous flag.
      strings/ctype-euc_kr.c:
        Add escape_with_backslash_is_dangerous flag.
      strings/ctype-extra.c:
        Add escape_with_backslash_is_dangerous flag.
      strings/ctype-gb2312.c:
        Add escape_with_backslash_is_dangerous flag.
      strings/ctype-gbk.c:
        Added escape_with_backslash_is_dangerous flag.
      strings/ctype-latin1.c:
        Added escape_with_backslash_is_dangerous flag.
      strings/ctype-sjis.c:
        Added escape_with_backslash_is_dangerous flag.
      strings/ctype-tis620.c:
        Added esacpe_with_backslash_character_is_dangerous flag.
      strings/ctype-uca.c:
        Added escape_with_backslash_is_dangerous flag.
      strings/ctype-ucs2.c:
        Added escape_with_backslash_is_dangerous.
      strings/ctype-ujis.c:
        Added escape_with_backslash_is_dangerous flag.
      strings/ctype-utf8.c:
        Added escape_with_backslash_is_dangerous.
      strings/ctype-win1250ch.c:
        Added escape_with_backslash_is_dangerous.
      48fa74fd
    • unknown's avatar
      mysql-test-run.pl: · c1084942
      unknown authored
        Bug#11884: Corrected --start-and-exit, start the server
        as if the default/specified test case would have been run
      
      
      mysql-test/mysql-test-run.pl:
        Bug#11884: Corrected --start-and-exit, start the server
        as if the default/specified test case would have been run
      c1084942
  7. 16 Aug, 2005 6 commits
    • unknown's avatar
      mtr_process.pl: · 4c2c6e9d
      unknown authored
        Bug#11792: Check all of status code, to catch a crash as a failure
      mtr_cases.pl:
        Code cleanup for skipped/disabled handling
      mtr_process.pl:
        In debug mode, report if mysqladmin did not at least
        make the server stop listening to the port.
        Increased the time waiting for terminating to 20 seconds,
        to wait for really slow slave shutdown.
        Added call to start_reap_all(), to avoid zombies.
      mtr_report.pl:
        Removed prototype for unused function mtr_report_test_disabled()
      
      
      mysql-test/lib/mtr_report.pl:
        Removed prototype for unused function mtr_report_test_disabled()
      mysql-test/lib/mtr_cases.pl:
        Code cleanup for skipped/disabled handling
      mysql-test/lib/mtr_process.pl:
        Bug#11792: Check all of status code, to catch a crash as a failure
      4c2c6e9d
    • unknown's avatar
      mtr_process.pl: · be030cb2
      unknown authored
        Bug#12094: Let sleep_until_file_created() return the pid as intended
      
      
      mysql-test/lib/mtr_process.pl:
        Bug#12094: Let sleep_until_file_created() return the pid as intended
      be030cb2
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · a86df355
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      a86df355
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · 0f339449
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11538
      
      
      acinclude.m4:
        Auto merged
      0f339449
    • unknown's avatar
      subselect.result: · 2a1af62e
      unknown authored
        Added missing drop statement
      subselect.test:
        Added missing drop statement.
      
      
      mysql-test/t/subselect.test:
        Added missing dro statement.
      mysql-test/r/subselect.result:
        Added missing drop statement
      2a1af62e
    • unknown's avatar
      sql_select.cc: · 37a8584f
      unknown authored
        Fixed bug #11479.
        The JOIN::reinit method cannot call setup_tables
        after the optimization phase since this function
        removes some optimization settings for joined
        tables. E.g. it resets values of the null_row flag to 0.
      subselect.result, subselect.test:
        Added a test case for bug #11479.
      
      
      mysql-test/t/subselect.test:
        Added a test case for bug #11479.
      mysql-test/r/subselect.result:
        Added a test case for bug #11479.
      sql/sql_select.cc:
        Fixed bug #11479.
        The JOIN::reinit method cannot call setup_tables
        after the optimization phase since this function
        removes some optimization settings for joined
        tables. E.g. it resets values of the null_row flag to 0.
      37a8584f
  8. 15 Aug, 2005 5 commits
  9. 13 Aug, 2005 4 commits
    • unknown's avatar
      Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 · dca1e4b6
      unknown authored
      into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
      
      dca1e4b6
    • unknown's avatar
      Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 · 27ff98c3
      unknown authored
      into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
      
      27ff98c3
    • unknown's avatar
      fixed convertion and handling IN subqueries with rows (BUG#11867) · cc28684b
      unknown authored
      
      mysql-test/r/subselect.result:
        testst of IN subqueries with row
      mysql-test/t/subselect.test:
        tests of ion subqueries with row
      sql/item.h:
        add method to prevent of removing Item_ref_null_helper from HAVING
      sql/item_cmpfunc.h:
        Prevented removing of Item_test_isnotnull from HAVING
      sql/item_subselect.cc:
        fixed converting row IN subqueries
      sql/sql_select.cc:
        fixed debug print
      cc28684b
    • unknown's avatar
      sql_parse.cc: · 07633828
      unknown authored
        Don't skip SET command even if --replicate-wild* says to.
        E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)
      
      
      sql/sql_parse.cc:
        Don't skip SET command even if --replicate-wild* says to.
        E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)
      07633828
  10. 12 Aug, 2005 2 commits