1. 17 Oct, 2003 1 commit
  2. 16 Oct, 2003 7 commits
  3. 15 Oct, 2003 7 commits
    • unknown's avatar
      Created small scripts to manage in-tree diffs for · 4a0c572d
      unknown authored
      NetWare platform, so changes are visible in the tree 
      but cannot affect other platforms.
      
      4a0c572d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 74b13743
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.0
      
      74b13743
    • unknown's avatar
      Better fix for CREATE TABLE IF NOT EXISTS ... SELECT · 1522a612
      unknown authored
      Fixed chsize() problem on windows
      Extend default timeout on windows clients to 1 year (to avoid timeout problems)
      
      
      include/mysql.h:
        Added client timeouts (for TCP/IP)
      libmysql/libmysql.c:
        Added client timeouts (for TCP/IP)
      mysql-test/r/create.result:
        More tests for CREATE TABLE IF NOT EXISTS ... SELECT
      mysql-test/t/create.test:
        More tests for CREATE TABLE IF NOT EXISTS ... SELECT
      mysys/my_chsize.c:
        Fix for windows
      sql/handler.h:
        Remove not used field 'if_not_exists'
        Ordered fields to be more optimized for new CPU's
        Added field 'table_existed'
      sql/slave.cc:
        Cleanup temporary tables when slave ends
      sql/sql_class.h:
        Remove not used 'do_not_drop' field
      sql/sql_insert.cc:
        Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
      sql/sql_table.cc:
        Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
      1522a612
    • unknown's avatar
      dummy resize_thr_alarm for Netware · 5310d561
      unknown authored
      5310d561
    • unknown's avatar
      Updated comments · cfc20dd5
      unknown authored
      
      mysys/queues.c:
        Comments for new functions (no code change)
      mysys/thr_alarm.c:
        Updated comment
      cfc20dd5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 17d526b7
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.0
      
      
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      17d526b7
    • unknown's avatar
      Add more information about memory usage to debug log · 314bf7c0
      unknown authored
      
      sql/sql_test.cc:
        Add more information about memory usage
      314bf7c0
  4. 14 Oct, 2003 3 commits
    • unknown's avatar
      Identical mysql.ico and MYSQL.ICO · 7a9ec9f9
      unknown authored
      existed, causing problems on non-case-sensitive OSes.
      Deleted conflicting file.
      
      
      BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1:
        Delete: VC++Files/mysqlshutdown/MYSQL.ICO
      7a9ec9f9
    • 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
    • unknown's avatar
      make LOCK TABLES to work when Lock_tables_priv is granted on the DB level and... · 7e01e7ed
      unknown authored
      make LOCK TABLES to work when Lock_tables_priv is granted on the DB level and Select_priv is granted on the table level.
      
      
      7e01e7ed
  5. 13 Oct, 2003 1 commit
  6. 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
  7. 10 Oct, 2003 1 commit
  8. 09 Oct, 2003 2 commits
  9. 08 Oct, 2003 5 commits
  10. 07 Oct, 2003 7 commits
  11. 06 Oct, 2003 5 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
      results updated · 67056e05
      unknown authored
      67056e05
    • unknown's avatar
      bug #1434 (and related issues) · 543f5b9f
      unknown authored
      543f5b9f
    • unknown's avatar
      Portability fix · c4301352
      unknown authored
      c4301352