1. 17 Aug, 2005 11 commits
  2. 16 Aug, 2005 18 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · ac21bbe6
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      ac21bbe6
    • 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
      Merge mysql.com:/home/alexi/mysql-5.0 · 19bec180
      unknown authored
      into  mysql.com:/home/alexi/dev/mysql-5.0-1
      
      19bec180
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · b01324d1
      unknown authored
      into  mysql.com:/home/alexi/mysql-5.0
      
      
      mysql-test/t/select.test:
        Auto merged
      b01324d1
    • unknown's avatar
      information_schema.test: · 9a8ea2f9
      unknown authored
        Added a comment line for a test case used for bug #12301.
      information_schema.result:
        Fixed some test cases results (bug #12301).
      sql_show.cc:
        Fixed bug #12301.
        The bug was due to a missing value setting for the NUMERIC_SCALE column
         in the get_schema_column_record() function (sql_show.cc).
      
      
      sql/sql_show.cc:
        Fixed bug #12301.
        The bug was due to a missing value setting for the NUMERIC_SCALE column
         in the get_schema_column_record() function (sql_show.cc).
      mysql-test/r/information_schema.result:
        Fixed some test cases results (bug #12301).
      mysql-test/t/information_schema.test:
        Added a comment line for a test case used for bug #12301.
      9a8ea2f9
    • unknown's avatar
      Merge lmy004.:/work/mysql-5.0-clean · ab0931d2
      unknown authored
      into lmy004.:/work/mysql-5.0-bug12595
      
      ab0931d2
    • unknown's avatar
      after review fix for bug #12595 · 26f7e36e
      unknown authored
      
      sql/item_cmpfunc.cc:
        remove a line with trailing spaces
      26f7e36e
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · e9fbf37d
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      ndb/tools/Makefile.am:
        Auto merged
      ndb/tools/ndb_config.cpp:
        Auto merged
      e9fbf37d
    • 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
      fix for bug #12595 (Escape character has to be exactly one) · 7c524e0d
      unknown authored
      
      mysql-test/r/select.result:
        results for test of bug 12595
      mysql-test/t/select.test:
        test for bug #12595
      sql/item_cmpfunc.cc:
        check whether the size of the escape string is exactly 1 (bug #12595)
      7c524e0d
    • unknown's avatar
      31a03634
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 67c4bf97
      unknown authored
      into  mysql.com:/home/alexi/mysql-5.0
      
      67c4bf97
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · f41bf600
      unknown authored
      into lmy004.wdf.sap.corp:/work/mysql-5.0-clean
      
      f41bf600
    • unknown's avatar
      fix for bug #12183 "SHOW OPEN TABLES behavior doesn't match grammar" · 881e2a50
      unknown authored
      (after review commit)
      
      
      mysql-test/r/show_check.result:
        test the extended functionality (so far not documented) of SHOW OPEN FILES
      mysql-test/t/show_check.test:
        test the extended functionality (so far not documented) of SHOW OPEN FILES
      sql/mysql_priv.h:
        pass the name of the database for checking
      sql/sql_base.cc:
        first check against the db if present (SHOW OPEN FILES FROM xxx)
        then do wild compare but only against the table name
      sql/sql_show.cc:
        pass the DB if specified
      881e2a50
    • unknown's avatar
      Manual merge · ec98f5a5
      unknown authored
      ec98f5a5
    • 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
  3. 15 Aug, 2005 11 commits