1. 14 Oct, 2003 1 commit
    • unknown's avatar
      Fixed bug in SET enum_system_variable=NULL · f487e515
      unknown authored
      
      BitKeeper/etc/ignore:
        added scripts/make_sharedlib_distribution
      mysql-test/r/variables.result:
        Add test for enum_system_variable=NULL
      mysql-test/t/variables.test:
        Add test for enum_system_variable=NULL
      sql/set_var.cc:
        Fixed bug in SET enum_system_variable=NULL
        Moved some array elements to get result sorted
      f487e515
  2. 11 Oct, 2003 1 commit
    • unknown's avatar
      Add new user variables for tuning memory usage: · 3b8f34a5
      unknown authored
      query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
      Add more checks for "out of memory" detection in range optimization
      
      
      configure.in:
        Added detection of mallinfo
      mysql-test/r/variables.result:
        Test of new variables
      mysql-test/t/variables.test:
        Test of new variables
      sql/ha_berkeley.cc:
        Use init_sql_alloc instead of init_alloc_root for better OOM detection
      sql/log_event.cc:
        Add new user variables for tuning memory usage
      sql/mysql_priv.h:
        Add new user variables for tuning memory usage
      sql/mysqld.cc:
        Add new user variables for tuning memory usage
      sql/opt_ft.cc:
        Add new user variables for tuning memory usage
      sql/opt_ft.h:
        Add new user variables for tuning memory usage
      sql/opt_range.cc:
        Add new user variables for tuning memory usage
        Add more checks for out of memory conditions
      sql/opt_range.h:
        Add new user variables for tuning memory usage
      sql/set_var.cc:
        Add new user variables for tuning memory usage
      sql/sql_acl.cc:
        Add new user variables for tuning memory usage
      sql/sql_class.h:
        Add new user variables for tuning memory usage
      sql/sql_delete.cc:
        Add new user variables for tuning memory usage
      sql/sql_parse.cc:
        Add new user variables for tuning memory usage
      sql/sql_select.cc:
        Add new user variables for tuning memory usage
      sql/sql_test.cc:
        Add information about memory useage if system supports mallinfo()
      sql/sql_udf.cc:
        Add new user variables for tuning memory usage
      sql/sql_update.cc:
        Add new user variables for tuning memory usage
      sql/table.cc:
        Add new user variables for tuning memory usage
      3b8f34a5
  3. 08 Oct, 2003 4 commits
  4. 07 Oct, 2003 6 commits
  5. 06 Oct, 2003 6 commits
    • unknown's avatar
      After merge fixes · 62fbda21
      unknown authored
      
      extra/resolveip.c:
        After merge fix
      mysql-test/mysql-test-run.sh:
        Fixed comment
      mysql-test/r/rpl_trunc_binlog.result:
        Updated results
      sql/log_event.cc:
        Better (shorter) error message
      62fbda21
    • unknown's avatar
      Merge with 3.23.58 · 1b750acf
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      mytest-old.c:
        Merge rename: VC++Files/libmysqltest/mytest.c -> mytest-old.c
      BitKeeper/deleted/.del-mysqlshutdown.c:
        Delete: VC++Files/mysqlshutdown/mysqlshutdown.c
      BitKeeper/deleted/.del-mysqlshutdown.rc:
        Delete: VC++Files/mysqlshutdown/mysqlshutdown.rc
      BitKeeper/deleted/.del-mysqlwatch.c:
        Delete: VC++Files/mysqlwatch/mysqlwatch.c
      BitKeeper/deleted/.del-thr_test.c:
        Delete: VC++Files/thr_test/thr_test.c
      BitKeeper/deleted/.del-make_win_src_distribution.sh:
        Delete: scripts/make_win_src_distribution.sh
      BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d:
        Auto merged
      BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74:
        Auto merged
      BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365:
        Auto merged
      BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e:
        Auto merged
      BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477:
        Auto merged
      BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131:
        Auto merged
      BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4:
        Auto merged
      BitKeeper/deleted/.del-Default.rge~2218627c2a901409:
        Auto merged
      BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9:
        Auto merged
      BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28:
        Auto merged
      BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81:
        Auto merged
      BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90:
        Auto merged
      BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e:
        Auto merged
      BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903:
        Auto merged
      BitKeeper/deleted/.del-Servers.fgl~36147accb82f759:
        Auto merged
      BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34:
        Auto merged
      BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722:
        Auto merged
      BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e:
        Auto merged
      BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6:
        Auto merged
      BitKeeper/deleted/.del-Setup.rul~14510a994d515f19:
        Auto merged
      BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a:
        Auto merged
      BitKeeper/deleted/.del-infolist.txt~58b203247936d266:
        Auto merged
      BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97:
        Auto merged
      BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d:
        Auto merged
      BitKeeper/deleted/.del-value.shl~98c2851db96b919e:
        Auto merged
      BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d:
        Auto merged
      configure.in:
        Merge with 3.23.58 (Keep old code)
      sql/slave.cc:
        Merge with 3.23.58 (Keep old code)
      sql/sql_parse.cc:
        Merge with 3.23.58 (Keep old code)
      1b750acf
    • unknown's avatar
      Portability fix · c4301352
      unknown authored
      c4301352
    • unknown's avatar
    • unknown's avatar
      row0mysql.c: · 44adffaa
      unknown authored
        Remove unintentional changes in previous push
      
      
      innobase/row/row0mysql.c:
        Remove unintentional changes in previous push
      44adffaa
    • unknown's avatar
      row0mysql.c: · 180ee6e6
      unknown authored
        Fix bug: if one used the rename trick of ibman section 15.1 to recover a temp table, InnoDB asserted because it tried to lock the data dictionary twice
      
      
      innobase/row/row0mysql.c:
        Fix bug: if one used the rename trick of ibman section 15.1 to recover a temp table, InnoDB asserted because it tried to lock the data dictionary twice
      180ee6e6
  6. 04 Oct, 2003 2 commits
  7. 03 Oct, 2003 6 commits
  8. 02 Oct, 2003 3 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 071b228c
      unknown authored
      into mishka.mysql.fi:/home/my/mysql-4.0
      
      071b228c
    • unknown's avatar
      Optimized code for setting user variables with := and fixed some bugs in old code (Bug #1194) · d7f5e818
      unknown authored
      Use forced close of socket to make mysqld shutdown faster when used under valgrind
      
      
      mysql-test/mysql-test-run.sh:
        Added --skip-bdb for valgrind
      mysql-test/r/user_var.result:
        Extended test for user variables
      mysql-test/t/user_var.test:
        Extended test for user variables
      sql/item_func.cc:
        Optimized code for setting user variables with := and fixed some bugs in old code
      sql/item_func.h:
        Optimized code for setting user variables
      sql/log.cc:
        Fixed comments
      sql/mysqld.cc:
        Use forced close of socket to make mysqld shutdown faster when used under valgrind
      sql/sql_class.h:
        Optimized code for setting user variables
      d7f5e818
    • unknown's avatar
      Reverting changeset 1.1590 · d9bfab66
      unknown authored
      
      sql/slave.h:
        Reverting changeset 1.1590.
      d9bfab66
  9. 01 Oct, 2003 5 commits
  10. 30 Sep, 2003 1 commit
  11. 29 Sep, 2003 5 commits
    • unknown's avatar
      A note that Valgrind does not give a good stacktrace when the problem · aa25e2cd
      unknown authored
      is involving an assembly function.
      Testcase was BUG#1194
      SELECT @A:=1; SELECT @A, @A:=1;
      
      
      BUILD/compile-pentium-valgrind-max:
        a warning note about Valgrind&assembly.
      aa25e2cd
    • unknown's avatar
      fix for a random test failure on hpux/ia64 · a4a93c55
      unknown authored
      (a missing synchronization in the test)
      
      
      mysql-test/r/drop_temp_table.result:
        result update
      mysql-test/t/drop_temp_table.test:
        synchronize to be sure that the ending connection has finished binlogging.
      a4a93c55
    • unknown's avatar
      Added resetting of replace_result patterns after --exec command in mysqltest... · 96c95cb3
      unknown authored
      Added resetting of replace_result patterns after --exec command in mysqltest (in order to be consistent with ordinary query execution).
      
      
      client/mysqltest.c:
        Now resetting replace_result patterns after --exec command (in order to be consistent with ordinary query execution).
      mysql-test/t/mysqlbinlog.test:
        Added additional replaces potentially needed after adding reset of replace conditions for exec
      96c95cb3
    • unknown's avatar
      - enable changing the number of table bits for JOINs to be increased · a0e7e6e0
      unknown authored
         from ulong to ulonglong by defining -DBIG_JOINS
      
      
      sql/mysql_priv.h:
         - enable changing the number of table bits for JOINs to be increased
           from ulong to ulonglong by defining BIG_JOINS
      a0e7e6e0
    • unknown's avatar
      Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog) · d7ab813d
      unknown authored
      Add quoting for use `database` for mysqlbinlog
      Removed test ins0000001
      Add support for --replace for exec in mysqltest
      Don't refer to install dir in mysqlbinlog.result
      
      
      BitKeeper/deleted/.del-ins000001.result~f45c599efdf8352b:
        Delete: mysql-test/r/ins000001.result
      BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483:
        Delete: mysql-test/t/ins000001.test
      client/mysqlbinlog.cc:
        Removed random chars after filename for LOAD DATA INFILE
      client/mysqltest.c:
        Add support for --replace for 'exec'
      mysql-test/r/drop_temp_table.result:
        Updated results after quoting change
      mysql-test/r/fulltext_multi.result:
        Updated results after quoting change
      mysql-test/r/fulltext_order_by.result:
        Updated results after quoting change
      mysql-test/r/insert.result:
        New tests
      mysql-test/r/insert_select.result:
        Updated results after quoting change
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Updated results after quoting change
      mysql-test/r/mysqlbinlog.result:
        Updated results after quoting change
      mysql-test/r/rpl_log.result:
        Updated results after quoting change
      mysql-test/t/fulltext_multi.test:
        Remove 'use'
      mysql-test/t/fulltext_order_by.test:
        Remove 'use'
      mysql-test/t/insert.test:
        Merge test with ins0000001.test
      mysql-test/t/mysqlbinlog.test:
        Don't refer to install dir in result
      sql/log_event.cc:
        Add quoting for use `database` for mysqlbinlog
      support-files/mysql.server.sh:
        Move pid_file test after arguments have been parsed
      d7ab813d