1. 21 Jun, 2005 2 commits
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 472a2b51
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
      
      
      472a2b51
    • unknown's avatar
      group_by.result, group_by.test: · 7b1ec027
      unknown authored
        Added a test case for bug #11295.
      item_buff.cc:
        Fixed bug #11295.
        This a correction for the patch of bug #11088 that takes into
        account a possible NULL values of the BLOB column.
      
      
      sql/item_buff.cc:
        Fixed bug #11295.
        This a correction for the patch of bug #11088 that takes into
        account a possible NULL values of the BLOB column.
      mysql-test/t/group_by.test:
        Added a test case for bug #11295.
      mysql-test/r/group_by.result:
        Added a test case for bug #11295.
      7b1ec027
  2. 20 Jun, 2005 11 commits
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 36dcc209
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      36dcc209
    • unknown's avatar
      group_by.result: · 15b113e1
      unknown authored
        Added  a test case for bug #11385.
      group_by.test:
        Added  a test case for bug #11385.
      field.h:
        Fixed bug #11385.
        The bug was due to not defined method decimals for the class
        Field_datetime.
      
      
      sql/field.h:
        Fixed bug #11385.
        The bug was due to not defined method decimals for the class
        Field_datetime.
      mysql-test/t/group_by.test:
        Added  atest case for bug #11385.
      mysql-test/r/group_by.result:
        Added  a test case for bug #11385.
      15b113e1
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2c7095c8
      unknown authored
      into igor-inspiron.creware.com:/home/igor/mysql-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      2c7095c8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 79444fa5
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-bg11060
      
      
      79444fa5
    • unknown's avatar
      Fix for bug #11060 "Server crashes on re-execution of prepared · 78e6794b
      unknown authored
      INSERT ... SELECT with UNION" (reviewed version).
      
      Altough bug manifest itself only starting from 5.0 it is better to
      apply fix to 4.1 to keep some assumptions true and make code more
      future-proof.
      
      
      mysql-test/r/ps.result:
        Added test case for bug #11060 "Server crashes on re-execution of
        prepared INSERT ... SELECT with UNION".
      mysql-test/t/ps.test:
        Added test case for bug #11060 "Server crashes on re-execution of
        prepared INSERT ... SELECT with UNION".
      sql/sql_insert.cc:
        select_insert::prepare():
          Item::fix_fields() methods operate assuming that LEX::current_select
          points to the select to which current item belongs. Thus
          during check_insert_fields() routine execution LEX::current_select
          should point ot the first select in query since this is the
          select with which items in insert list is associated.
          But if we have INSERT SELECT UNION SELECT type of query
          LEX::current_select will point to the fake_select_lex instead
          since select_insert::prepare() is called during processing of JOIN
          which corresponds to this select_lex.
          So we have set LEX::current_select before calling check_insert_fields()
          and restore it afterwards.
      78e6794b
    • unknown's avatar
      Makefile.am: · c8714788
      unknown authored
        Use the Perl version of mysql-test-run
      
      
      Makefile.am:
        Use the Perl version of mysql-test-run
      c8714788
    • unknown's avatar
      mysql-test-run.pl: · 2aa1a04c
      unknown authored
        Corrected path to 'mysql_fix_privilege_tables'
      
      
      mysql-test/mysql-test-run.pl:
        Corrected path to 'mysql_fix_privilege_tables'
      2aa1a04c
    • unknown's avatar
      mysql-test-run.pl: · d0a7c124
      unknown authored
        Corrected path to 'mysql_fix_privilege_tables'
        Corrected dummy --manager-port to take integer argument
      
      
      mysql-test/mysql-test-run.pl:
        Corrected path to 'mysql_fix_privilege_tables'
      d0a7c124
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 34dc6ac3
      unknown authored
      into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
      
      
      34dc6ac3
    • unknown's avatar
      ha_ndbcluster.cc: · 1bc23847
      unknown authored
        remove typecheck in ndb handler not needed
      
      
      sql/ha_ndbcluster.cc:
        remove typecheck in ndb handler not needed
      1bc23847
    • unknown's avatar
      BUG#11377 Building cluster in 4.1 BK tree fails with GCC4.0 · 8d87d9bf
      unknown authored
      
      ndb/src/kernel/SimBlockList.cpp:
        GCC 4.0 build fix
      8d87d9bf
  3. 19 Jun, 2005 2 commits
    • unknown's avatar
      mysql-test-run.pl: · f35c177a
      unknown authored
        Added dummy --manager-port flag, for backward compatibility
        Back port from 5.0, correction of paths to SSL pem files
      mtr_cases.pl:
        Removed hard coded exclude list for embedded server
      mysql-test-run.pl:
        Set environment variable MYSQL_SHOW, to be used in test cases
      
      
      mysql-test/lib/mtr_cases.pl:
        Removed hard coded exclude list for embedded server
      mysql-test/mysql-test-run.pl:
        Added dummy --manager-port flag, for backward compatibility
        Back port from 5.0, correction of paths to SSL pem files
      f35c177a
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · fc390fe6
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      fc390fe6
  4. 18 Jun, 2005 2 commits
  5. 17 Jun, 2005 2 commits
  6. 16 Jun, 2005 9 commits
    • unknown's avatar
      Fix Bug#9334 "PS API queries in log file" and · c0484a30
      unknown authored
      Bug#8367 "low log doesn't gives complete information about prepared 
      statements"
      Implement status variables for prepared statements commands (a port of
      the patch by Andrey Hristov).
      See details in comments to the changed files.
      No test case as there is no way to test slow log/general log in 
      mysqltest.
      
      
      mysql-test/r/ps_grant.result:
        Now execute is logged with tag 'Execute' (changed result file).
      sql/mysql_priv.h:
        - remove obsolete macro.
        - add declarations for new status variables.
        - export function log_slow_statement, which now is used in sql_prepare.cc
      sql/mysqld.cc:
        Add status variables for prepared statements API: now we record
        mysql_stmt_close, mysql_stmt_reset, mysql_stmt_prepare, mysql_stmt_execute
        mysql_stmt_send_long_data, PREPARE, EXECUTE, DEALLOCATE.
      sql/sql_parse.cc:
        - account DEALLOCATE prepare as a Com_stmt_close command (close of a
        prepared statement).
      sql/sql_prepare.cc:
        - fix a bug in SQL syntax for prepared statements + logging:
          if we use --log and EXECUTE stmt USING @no_such_variable;, the
          server crashed because the old code assumed that the variable 
          returned by get_var_with_binlog is never NULL.
        - account statistics for 
          mysql_stmt_{prepare,execute,close,reset,send_long_data} in
          Com_stmt_{prepare,execute,close,reset,send_long_data} correspondingly.
        - log slow statements into the slow log early, when thd->query
          points to a valid (with expanded placeholder values) query.
          The previous version was logging it in sql_parse, when thd->query
          is empty. Prevent the server from logging the statement twice by 
          setting thd->enable_slow_log= FALSE.
        - now in case of EXECUTE stmt in SQL syntax for prepared statements the 
          general log gets two queries, e.g.
          Query    EXECUTE stmt USING @A, @b, @c
          Execute  INSERT INTO t1 VALUES (1, 2, 3)
          This makes the behavior consistent with PREPARE command, which
          also logs the statement twice.
      c0484a30
    • unknown's avatar
      A fix for Bug#9141 "4.1 does not log into slow log · 51cd70da
      unknown authored
      ALTER, OPTIMIZE and ANALYZE statements".
      In 4.1 we disabled logging of slow admin statements. The fix adds an 
      option to enable it back.
      No test case (slow log is not tested in the test suite), but tested
      manually.
      + post-review fixes (word police mainly).
      
      
      sql/mysql_priv.h:
        - declaration for a new option
      sql/mysqld.cc:
        Add server option '--log-slow-admin-statements' to log slow
        optimize/alter/etc statements to the slow log if it's enabled.
        Add warnings that this option works only if the slow log is open.
      sql/sql_class.h:
        Rename 'thd->slow_command' to thd->enable_slow_log (negates
        the meaning of this variable, and so resolves the need to negate
        value opt_log_slow_admin_statements when setting it).
      sql/sql_parse.cc:
        Implement optional logging of administrative statements in the slow log.
      51cd70da
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 25136336
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      25136336
    • unknown's avatar
      group_by.result, group_by.test: · 0812385d
      unknown authored
        Added a test case for bug #8614.
      sql_select.cc:
        Fixed bug #8614.
        SELECT DISTINCT ... GROUP BY 'const' must be equivalent to
        SELECT ... GROUP BY 'const'.
      
      
      sql/sql_select.cc:
        Fixed bug #8614.
        SELECT DISTINCT ... GROUP BY 'const' must be equivalent to
        SELECT ... GROUP BY 'const'.
      mysql-test/t/group_by.test:
        Added a test case for bug #8614.
      mysql-test/r/group_by.result:
        Added a test case for bug #8614.
      0812385d
    • unknown's avatar
      WL#2076: Added if(...) construct to mysqltest · b0d82705
      unknown authored
      Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
      
      
      client/mysqltest.c:
        WL#2067: Added if(...) construct to mysqltest
      mysql-test/include/rpl_stmt_seq.inc:
        Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
      mysql-test/r/rpl_ddl.result:
        Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
      mysql-test/t/rpl_ddl.test:
        Comment
      b0d82705
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · c23524c7
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      c23524c7
    • unknown's avatar
      for consictency, changed to use memcpy_fixed. · 17b55ca3
      unknown authored
      17b55ca3
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · 5e75abdb
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/4.1/bug11132
      
      
      5e75abdb
    • unknown's avatar
      fix test results - Bug #11328 · 20745721
      unknown authored
      
      mysql-test/r/bdb_cache.result:
        fix test results
      mysql-test/t/bdb_cache.test:
        fix test results
      20745721
  7. 15 Jun, 2005 3 commits
    • unknown's avatar
      cleanup for bug#11167. · 9fb9133f
      unknown authored
      portability alignment issues.
      
      
      9fb9133f
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · ee289349
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      ee289349
    • unknown's avatar
      BUG#11132 Connections stuck in CLOSE_WAIT · b7807263
      unknown authored
      In 4.1 (it is different in 5.0), we do not use the mgm connection after fetching the
      configuration (and if we did, we would have to have calls to check the connection and
      reconnect if needed - in case the mgm server had restarted) so we can disconnect after
      first use.
      
      This means we won't have connections stuck in CLOSE_WAIT when the mgm server shuts down.
      
      
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Disconnect from management server after configuration is fetched.
      b7807263
  8. 14 Jun, 2005 2 commits
  9. 13 Jun, 2005 7 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 91a7d4e7
      unknown authored
      into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
      
      
      91a7d4e7
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 02736082
      unknown authored
      into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      02736082
    • unknown's avatar
      func_if.result, func_if.test: · a4535bc8
      unknown authored
        Correction for test case of bug #11142.
      
      
      mysql-test/t/func_if.test:
        Correction for test case of bug #11142.
      mysql-test/r/func_if.result:
        Correction for test case of bug #11142.
      a4535bc8
    • unknown's avatar
      func_if.result, func_if.test: · 89906482
      unknown authored
        Added a test case for bug #11142.
      item_cmpfunc.cc:
        Fixed bug #11142.
        Implementation of Item_func_nullif::is_null was corrected.
      
      
      sql/item_cmpfunc.cc:
        Fixed bug #11142.
        Implementation of Item_func_nullif::is_null was corrected.
      mysql-test/t/func_if.test:
        Added a test case for bug #11142.
      mysql-test/r/func_if.result:
        Added a test case for bug #11142.
      89906482
    • unknown's avatar
      logging_ok: · 61962795
      unknown authored
        Logging to logging@openlogging.org accepted
      DbtcMain.cpp, testTimeout.cpp:
        Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
      
      
      ndb/test/ndbapi/testTimeout.cpp:
        Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      61962795
    • unknown's avatar
      Merge igor-inspiron.creware.com:/home/igor/mysql-4.1 · e802cd3b
      unknown authored
      into igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0
      
      
      e802cd3b
    • unknown's avatar
      ndb - valgrind fixes · a2c00c6b
      unknown authored
      
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        valgrind fixes
      ndb/test/ndbapi/testBlobs.cpp:
        valgrind fixes
      a2c00c6b