1. 29 Oct, 2004 8 commits
  2. 28 Oct, 2004 17 commits
  3. 27 Oct, 2004 11 commits
    • unknown's avatar
      Making the latest fix for Bug#6166 (key.test) work in prepared statements. · 8600baf3
      unknown authored
      
      sql/sql_prepare.cc:
        Catch another class of errors possible during yyparse:
        if thd->net.report_error is set, we need to send the message and 
        abort.
      8600baf3
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 0c8b05f7
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
      
      0c8b05f7
    • unknown's avatar
      Fix for bug#5385 ("Text files have unix line break"): · 769a0990
      unknown authored
      Windows style line end \r\n on README, license, and similar essential plaintext files.
      
      
      scripts/make_win_src_distribution.sh:
        Some plain text files (which a Windows user might view in any editor) should have 
        Windows style line end \r\n (bug#5385). The tool is changed to do a systematic pass 
        over all files, find all relevant ones (especially "README*", "ChangeLog", "INSTALL*", 
        license text), and adapt them.
        Included are two minor cleanups ("useless use of cat" avoided, variable setting 
        moved to more sensible place).
      769a0990
    • unknown's avatar
      A fix and test case for Bug#6096 "field.max_length is always zero for · 7c040432
      unknown authored
      numeric columns (stmt_resultset_metadata)"
      
      
      libmysql/libmysql.c:
        A fix for Bug#6096 "field.max_length is always zero for numeric columns
         (stmt_resultset_metadata)": set field->max_lenght for numeric
        columns when we set up skip_result functions. A minor drawback for this 
        approach is that field->max_length  can be not zero even if 
        STMT_ATTR_UPDATE_MAX_LENGTH is not set.
      sql-common/my_time.c:
        Fix valgrind warning.
      tests/client_test.c:
        A test case for Bug#6096 "field.max_length is always zero for numeric 
        columns (stmt_resultset_metadata)
      7c040432
    • unknown's avatar
      Fixed access to freed memory · f748b29f
      unknown authored
      
      innobase/srv/srv0srv.c:
        after merge fix
      sql/set_var.cc:
        after merge fix
      sql/sql_cache.cc:
        after merge fix
      f748b29f
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · faef7151
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
      
      faef7151
    • unknown's avatar
      removed incorrect error message about aggregate functions · 05a95f4d
      unknown authored
      improved mechanisn of detection posibility to be NULL for single row queries
      switched off substitution optimisation for single row subqueries in PS due to problem in resolving substituted expressions
      (changes to make subselects test working with PS protocol)
      
      
      mysql-test/r/subselect.result:
        removed incorrect error message about aggregate functions
        improved mechanisn of detection posibility to be NULL for single row queries
      mysql-test/t/subselect.test:
        removed incorrect error message about aggregate functions
      sql/item_subselect.cc:
        removed incorrect error message about aggregate functions
        switched off substitution optimisation for single row subqueries in PS due to problem in resolving substituted expressions
        improved mechanisn of detection posibility to be NULL for single row queries
      sql/item_subselect.h:
        new method to help in NULL ability detection
      05a95f4d
    • unknown's avatar
      Implemented fragmented signal from API · 6076fbb4
      unknown authored
      primarily to enable creation of tables with more attributes than 91 (up to 128)
      
      Intermediate push for testing
      CHUNK_SZ will be set higher in real implementation and API_TRACE added
      
      6076fbb4
    • unknown's avatar
      Merge with 4.0 · 16f98d68
      unknown authored
      
      BitKeeper/deleted/.del-innodb-lock-master.opt~f76a4a1999728f87:
        Auto merged
      innobase/include/trx0sys.h:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      innobase/trx/trx0purge.c:
        Auto merged
      innobase/trx/trx0rseg.c:
        Auto merged
      mysql-test/r/innodb-lock.result:
        Auto merged
      mysql-test/t/innodb-lock.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/mysqld.cc:
        Use local version during merge
      16f98d68
    • unknown's avatar
      Fix when compiling without InnoDB · 89dce2fb
      unknown authored
      
      BitKeeper/deleted/.del-innodb-lock-master.opt~f76a4a1999728f87:
        Delete: mysql-test/t/innodb-lock-master.opt
      89dce2fb
    • unknown's avatar
      Backport innodb_max_purge_lag from 4.1 · 2d4bea72
      unknown authored
      
      innobase/include/srv0srv.h:
        Add configuration parameter srv_max_purge_lag.
        Add global variable srv_dml_needed_delay.
      innobase/include/trx0sys.h:
        Add trx_sys->rseg_history_len
      innobase/row/row0mysql.c:
        Add row_mysql_delay_if_needed() for delaying INSERTs, UPDATEs and
        DELETEs for srv_dml_needed_delay microseconds.
      innobase/srv/srv0srv.c:
        Define global variable srv_dml_needed_delay.
        Define configuration parameter srv_max_purge_lag.
      innobase/trx/trx0purge.c:
        Update trx_sys->rseg_history_len.
        trx_purge(): Compute srv_dml_needed_delay from srv_max_purge_lag
        and trx_sys->rseg_history_len.
      innobase/trx/trx0rseg.c:
        Initialize trx_sys->rseg_history_len at InnoDB start-up.
      sql/ha_innodb.h:
        Add configuration parameter srv_max_purge_lag.
      sql/mysqld.cc:
        Add startup option innodb_max_purge_lag,
        with default value 0 (meaning infinite, disabling the feature).
      sql/set_var.cc:
        Add global variable innodb_max_purge_lag.
      2d4bea72
  4. 26 Oct, 2004 4 commits