1. 21 Mar, 2005 21 commits
    • unknown's avatar
      Merge hundin.mysql.fi:/home/heikki/mysql-4.1 · 72d9203a
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/config-netware.h:
        Auto merged
      innobase/include/trx0trx.h:
        Auto merged
      innobase/trx/trx0trx.c:
        Auto merged
      72d9203a
    • unknown's avatar
      trx0trx.c: · 51e76a5e
      unknown authored
        If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
      
      
      innobase/trx/trx0trx.c:
        If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
      51e76a5e
    • unknown's avatar
      Merge · 4adbc670
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      innobase/include/trx0trx.h:
        Auto merged
      innobase/trx/trx0trx.c:
        SCCS merged
      4adbc670
    • unknown's avatar
      trx0trx.c, trx0trx.h: · a422f163
      unknown authored
        If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
      
      
      innobase/include/trx0trx.h:
        If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
      innobase/trx/trx0trx.c:
        If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
      a422f163
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build · e581ffc9
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
      
      
      configure.in:
        Auto merged
      e581ffc9
    • unknown's avatar
      configure.in: · 8c73bbcd
      unknown authored
        5.0.3 is a beta
      
      
      configure.in:
        5.0.3 is a beta
      8c73bbcd
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build · ab901d18
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
      
      ab901d18
    • unknown's avatar
      A fix for Netware. · f6ad3d72
      unknown authored
      f6ad3d72
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build · 201cc596
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
      
      201cc596
    • unknown's avatar
      Merge mysql.com:/M50/build-5.0.3 into mysql.com:/M50/push-5.0 · ec7bfea5
      unknown authored
      
      sql/item_sum.cc:
        Auto merged
      ec7bfea5
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-build · 78fde20b
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
      
      78fde20b
    • unknown's avatar
      init_db.sql: · d02e1a77
      unknown authored
        Added 'proc' and 'procs_priv' tables, updated others
      
      
      mysql-test/lib/init_db.sql:
        Added 'proc' and 'procs_priv' tables, updated others
      d02e1a77
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build · 86021822
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      86021822
    • unknown's avatar
      Code cleanup: should use 'element_count' here, see include/my_tree.h · 2de206f4
      unknown authored
      (Change done by Ramil and sent via IRC)
      
      2de206f4
    • unknown's avatar
      mtr_report.pl: · 77633821
      unknown authored
        Made --timer work
      mtr_cases.pl:
        Added option --reorder to get less server restarts
      mysql-test-run.pl:
        Added option --reorder to get less server restarts
        Moved do_before_start_master() not to remove binlog files unless restarted
        Made --timer work
        Slave was incorrectly writing log to error log
      
      
      mysql-test/mysql-test-run.pl:
        Added option --reorder to get less server restarts
        Moved do_before_start_master() not to remove binlog files unless restarted
        Made --timer work
        Slave was incorrectly writing log to error log
      mysql-test/lib/mtr_cases.pl:
        Added option --reorder to get less server restarts
      mysql-test/lib/mtr_report.pl:
        Made --timer work
      77633821
    • unknown's avatar
      7fd8b9b3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · bc1003e3
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-merges
      
      bc1003e3
    • unknown's avatar
      Fix a valgrind warning in decimal.c:sanity() · d80bac3d
      unknown authored
      
      sql/my_decimal.h:
        Refixing the valgrind warning in decimal.c:sanity() in a different way
        (as requested by Monty): we want to let valgrind see uninitialized
        memory whenever it's possible.
      strings/decimal.c:
        Fix sanity() to not look into possibly uninitialized memory if
        HAVE_purify.
      d80bac3d
    • unknown's avatar
      Manual merge of csets from -build tree into main 5.0 tree. · 47e4ce28
      unknown authored
      
      innobase/include/data0type.ic:
        Auto merged
      mysql-test/r/endspace.result:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Manual merge.
      47e4ce28
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-build · 8d669c55
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-build
      
      8d669c55
    • unknown's avatar
      Federated Storage Handler - test and result fix. · 471173ce
      unknown authored
      
      mysql-test/r/federated.result:
        made sure result has SLAVE_PORT!
      mysql-test/t/federated.test:
        added --replace_result to a table creation that I forgot to add before
      471173ce
  2. 20 Mar, 2005 3 commits
    • unknown's avatar
      Fix for spurious failures of sp.test on many platforms (aka Bug #9161 · f472e0fd
      unknown authored
      "Warnings on 'drop procedure' platform-specific").
      
      In mysqltest we should not issue "SHOW WARNINGS" until we have not 
      read results from all statements in multi-statement.
      
      Otherwise such "SHOW WARNINGS" will either cause "Packets out of order"
      error and thus will ruin current connection (but we may not notice this as
      it happened in sp.test because we ignore errors from such auxilary
      SHOW WARNINGS and use auto-reconnecting connections) or will
      succeed but consume first packet from next statement in multi-statement
      sequence (this happens if "SHOW WARNINGS" is issued when this packet
      is already received by client. Packet is thrown away by net_clear()
      call which is issued when "SHOW WARNINGS" is sent to server).
      
      In our case sp.test failed because usually we had first situation
      but sometimes second situation occured causing warning to pop-up.
      
      
      client/mysqltest.c:
        We should not issue "SHOW WARNINGS" if we have not processed all 
        results from multi-statement.
      f472e0fd
    • unknown's avatar
      e33182eb
    • unknown's avatar
      func_group.test, func_group.result: · b450786c
      unknown authored
        Added a test case for bug #9210.
      sql_select.cc:
        Fixed bug #9210.
        The function calc_group_buffer did not cover the case
        when the GROUP BY expression was decimal.
        Slightly optimized the other code.
      
      
      sql/sql_select.cc:
        Fixed bug #9210.
        The function calc_group_buffer did not cover the case
        when the GROUP by expression was decimal.
        Slightly optimized the other code.
      mysql-test/t/func_group.test:
        Added a test case for bug #9210.
      b450786c
  3. 19 Mar, 2005 7 commits
    • unknown's avatar
      Clean up the warning inside sanity():decimal.c in valgrind-max builds. · 3a8fbde2
      unknown authored
      
      sql/my_decimal.h:
        HAVE_purify is defined in valgrind-max build as well: one possible 
        solution is to disable the sanity check in decimal.c in the valgrind-max
        build, but it's better to have more checks than less, for
        valgrind-max builds are not always used in conjunction with valgrind.
      3a8fbde2
    • unknown's avatar
      Cleanup, remove some -ansi -pedancit warnings (mysql_client_test.c) · b864c19b
      unknown authored
      
      tests/mysql_client_test.c:
        Cleanup, remove some -ansi -pedancit warnings.
      b864c19b
    • unknown's avatar
      Manually import InnoDB fix into build tree. · d5be75f6
      unknown authored
      
      innobase/include/data0type.ic:
        Fix for sorting of innodb TEXT columns.
      d5be75f6
    • unknown's avatar
      Fix 'kill' test to actually test that the connection has · 488da795
      unknown authored
      been killed.
      
      
      mysql-test/r/kill.result:
        Update results
      mysql-test/t/kill.test:
        Fix 'ping' to be '--ping' and make test that this is a new
        connection actually test that.
      488da795
    • unknown's avatar
      Fix Windows compile errors. · 56083273
      unknown authored
      
      sql/item_sum.cc:
        Remove C_MODE_START/END around function, add cast
      56083273
    • unknown's avatar
      Removed MyISAM RAID from the Linux "Max" RPMs · d300b592
      unknown authored
      (patch from lenz, reapplied by jimw)
      
      
      support-files/mysql.spec.sh:
        removed MyISAM RAID from the Linux "Max" RPMs
      d300b592
    • unknown's avatar
      Eliminate warnings noticed by VC7. This includes fixing my_mmap() on · 22234f31
      unknown authored
      Windows to call CreateFileMapping() with correct arguments, and
      propogating the introduction of query_id_t to everywhere query ids are
      passed around. (Bug #8826)
      
      
      libmysql/libmysql.c:
        Make implicit cast explicit
      myisam/mi_open.c:
        Make cast of value to smaller data size explicit
      myisam/mi_packrec.c:
        Cast file size (my_off_t) to size_t for mmap
      mysys/my_mmap.c:
        Fix Windows version of my_mmap() to use the right parameters
        for call to CreateFileMapping()
      sql/field.cc:
        Use temporary value of correct type
      sql/field.h:
        Use query_id_t for query_id value
      sql/ha_berkeley.cc:
        Fix flag check
      sql/ha_innodb.h:
        Use query_id_t for query_id value
      sql/handler.cc:
        Explain opt_using_transactions calculation, and add cast
      sql/handler.h:
        Fix forward declaration of COND
      sql/item.cc:
        Fix val_bool() tests of val_int() to avoid implicit cast
      sql/item_cmpfunc.cc:
        Fix typo in switch label
      sql/item_func.cc:
        Make implicit cast explicit
      sql/item_strfunc.cc:
        Now that query_id is a query_id_t, need to cast it to a ulong here
      sql/item_subselect.cc:
        Fix test of value
      sql/log.cc:
        Cast my_off_t used for file size to size_t for memory allocation
        Also cast my_off_t when using it to calculate the number of pages for TC log
        Cast total_ha_2pc to uchar when saving it
      sql/mysql_priv.h:
        Move up query_id definition so it can be used more widely
      sql/opt_range.cc:
        Add unused delete operator to prevent compiler warning
      sql/set_var.cc:
        Cast value for max_user_connections
      sql/sql_cache.cc:
        Remove unused label
      sql/sql_class.h:
        Fix query id values to be of type query_id_t
      sql/sql_db.cc:
        Move variable only used inside #ifdef within the #ifdef
      sql/sql_help.cc:
        Remove unused label
      sql/sql_insert.cc:
        Use query_id_t for query id values
      sql/sql_lex.h:
        Add unused delete operator to prevent compiler warning
      sql/sql_select.cc:
        Remove unused variable
        Make cast of value explicit
      sql/sql_select.h:
        Use query_id_t for query id values
      sql/sql_table.cc:
        Make comparison to function pointer explicit
      sql/sql_update.cc:
        Use query_id_t for query id values
      sql/table.h:
        Use query_id_t for query id values
      strings/ctype-simple.c:
        Add cast of long value to (char) in expression
      strings/ctype-ucs2.c:
        Add cast of long value to (char) in expression
      strings/ctype-utf8.c:
        Make cast to smaller size explicit
      22234f31
  4. 18 Mar, 2005 9 commits
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 · 892d7580
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-5.0
      
      892d7580
    • unknown's avatar
      data0type.h: · 3f6d8ca8
      unknown authored
        The missing DATA_BINARY_TYPE in BLOBs created with < 4.0.14 does not cause any harm, because there were no indexes on such BLOBs
      
      
      innobase/include/data0type.h:
        The missing DATA_BINARY_TYPE in BLOBs created with < 4.0.14 does not cause any harm, because there were no indexes on such BLOBs
      3f6d8ca8
    • unknown's avatar
      data0type.ic: · ba3da184
      unknown authored
        Change the sorting order of TEXT columns in InnoDB: pad with spaces at the end in comparisons; we MUST UPDATE the MySQL MANUAL to warn about the need to rebuild tables (also MyISAM) in certain cases in an upgrade to 5.0.3; TODO: study what complications the missing DATA_BINARY_TYPE flag in InnoDB < 4.0.14 causes: we would compare then also BLOBs with space padding, not just TEXT
      
      
      innobase/include/data0type.ic:
        Change the sorting order of TEXT columns in InnoDB: pad with spaces at the end in comparisons; we MUST UPDATE the MySQL MANUAL to warn about the need to rebuild tables (also MyISAM) in certain cases in an upgrade to 5.0.3; TODO: study what complications the missing DATA_BINARY_TYPE flag in InnoDB < 4.0.14 causes: we would compare then also BLOBs with space padding, not just TEXT
      ba3da184
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · f857f147
      unknown authored
      into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      f857f147
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 · dbc39ac3
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-5.0
      
      dbc39ac3
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6fdc7b55
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      Build-tools/Do-compile:
        Auto merged
      6fdc7b55
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-5.0-build · 8efae531
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      Build-tools/Do-compile:
        Auto merged
      8efae531
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · b3a958d6
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
      
      b3a958d6
    • unknown's avatar
      - removed MyISAM RAID from the Linux "Max" RPMs · cd04f43f
      unknown authored
      cd04f43f