1. 16 Oct, 2003 7 commits
  2. 15 Oct, 2003 15 commits
    • unknown's avatar
      Created small scripts to manage in-tree diffs for NetWare platform, so changes... · 27dc9ab9
      unknown authored
      Created small scripts to manage in-tree diffs for NetWare platform, so changes are visible in the tree but cannot affect other platforms
      
      
      27dc9ab9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 604457d0
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.1
      
      
      sql/item_strfunc.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      604457d0
    • unknown's avatar
      Portability fixes for windows · bfc24eaf
      unknown authored
      After merge fixes
      
      
      include/my_base.h:
        Fix comment syntax
      libmysql/client_settings.h:
        Portability fixes for windows
      libmysql/libmysql.c:
        Portability fixes for windows
      libmysql/libmysql.def:
        Portability fixes for windows
      mysql-test/r/variables.result:
        Fix result after merge
      sql-common/client.c:
        Portability fixes for windows
      sql/ha_berkeley.cc:
        Use defines instead of constants
      sql/item_strfunc.cc:
        Portability fixes for windows
      sql/mysql_priv.h:
        Use defines instead of defines
      sql/mysqld.cc:
        After merge fix
      sql/opt_range.h:
        After merge fix
      sql/set_var.h:
        Portability fixes for windows
      sql/sql_class.cc:
        Defines instead of constants
      sql/sql_help.cc:
        after merge fixes
        More OOM error checking
      sql/sql_prepare.cc:
        After merge fixes
      sql/sql_table.cc:
        Portability fixes for windows
      bfc24eaf
    • 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
      ctype-simple.c, ctype-mb.c: · 2e28ab24
      unknown authored
        Win compilation problem fix
      ctype-bin.c:
        Win compilation problem fix
        ,
        ,
      m_ctype.h:
        Win compilation problem fix
        ,
      
      
      include/m_ctype.h:
        Win compilation problem fix
        ,
      strings/ctype-bin.c:
        Win compilation problem fix
        ,
        ,
      strings/ctype-mb.c:
        Win compilation problem fix
      strings/ctype-simple.c:
        Win compilation problem fix
      2e28ab24
    • 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
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8759d030
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      8759d030
    • unknown's avatar
      WL#1106: Switch = --maxdb rather than --sapdb · 597bf238
      unknown authored
      597bf238
    • unknown's avatar
      Merge hfisk@bk-internal.mysql.com:/home/bk/mysql-4.1 · d72c4a53
      unknown authored
      into mysql.com:/usr/home/harry/mysqlstuff/mysql-4.1
      
      d72c4a53
    • unknown's avatar
      fil0fil.c: · 71f5f563
      unknown authored
        Visual C++ apparently does not know what -1LL (= -1 in longlong type) means
      
      
      innobase/fil/fil0fil.c:
        Visual C++ apparently does not know what -1LL (= -1 in longlong type) means
      71f5f563
    • unknown's avatar
      Add in bit_xor function (approved by Sergei) · d7127358
      unknown authored
      
      sql/item_sum.cc:
        Add in bit_xor class functions.
      sql/item_sum.h:
        Add bit_xor class.
      sql/lex.h:
        Add in bit_xor symbol.
      sql/sql_yacc.yy:
        Add in bit_xor function
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      d7127358
  3. 14 Oct, 2003 7 commits
    • unknown's avatar
      os0file.c: · 1fca48bd
      unknown authored
        Fix Visual C++ compilation errors reported by Miguel
      
      
      innobase/os/os0file.c:
        Fix Visual C++ compilation errors reported by Miguel
      1fca48bd
    • 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
      merge with 4.0 to get fix for SET enum_system_variable=NULL · bfbc492b
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/t/variables.test:
        Auto merged
      bfbc492b
    • 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
      row0purge.c, row0mysql.c, os0file.c, os0file.h, fil0fil.h, fil0fil.c: · 3e428dab
      unknown authored
        IMPORT TABLESPACE must reset lsns if they are too high
      ha_innodb.cc:
        DISCARD/IMPORT TABLESPACE must have a TL_WRITE lock on the table
      
      
      sql/ha_innodb.cc:
        DISCARD/IMPORT TABLESPACE must have a TL_WRITE lock on the table
      innobase/fil/fil0fil.c:
        IMPORT TABLESPACE must reset lsns if they are too high
      innobase/include/fil0fil.h:
        IMPORT TABLESPACE must reset lsns if they are too high
      innobase/include/os0file.h:
        IMPORT TABLESPACE must reset lsns if they are too high
      innobase/os/os0file.c:
        IMPORT TABLESPACE must reset lsns if they are too high
      innobase/row/row0mysql.c:
        IMPORT TABLESPACE must reset lsns if they are too high
      innobase/row/row0purge.c:
        IMPORT TABLESPACE must reset lsns if they are too high
      3e428dab
    • 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
    • unknown's avatar
  4. 13 Oct, 2003 6 commits
    • unknown's avatar
      sql_yacc.yy: · c8b950c0
      unknown authored
        Add DISCARD etc. in the keyword: rule of sql_yacc.yy
      sql_table.cc:
        Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE
      
      
      sql/sql_table.cc:
        Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE
      sql/sql_yacc.yy:
        Add DISCARD etc. in the keyword: rule of sql_yacc.yy
      c8b950c0
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · 9bdfdac5
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      
      sql/slave.cc:
        Auto merged
      9bdfdac5
    • unknown's avatar
      merge with 4.0 for more memory allocation variables. · d12c426a
      unknown authored
      
      configure.in:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_test.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      scripts/Makefile.am:
        merge
      sql/log_event.cc:
        merge
      sql/mysqld.cc:
        merge
      sql/opt_range.cc:
        merge
      sql/set_var.cc:
        merge
      sql/sql_class.h:
        merge
      sql/sql_delete.cc:
        merge
      sql/sql_parse.cc:
        merge
      d12c426a
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 492283fd
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-group_concat-4.1
      
      492283fd
    • unknown's avatar
      Many files: · 423747b5
      unknown authored
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
        Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
      
      
      sql/ha_innodb.cc:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      sql/sql_class.cc:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      sql/sql_parse.cc:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      sql/sql_table.cc:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      sql/ha_innodb.h:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      sql/handler.h:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      sql/lex.h:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      sql/mysql_priv.h:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      sql/sql_class.h:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      sql/sql_lex.h:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      sql/sql_yacc.yy:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      innobase/ha/ha0ha.c:
        Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
      innobase/ha/hash0hash.c:
        Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
      innobase/buf/buf0buf.c:
        Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
      innobase/buf/buf0flu.c:
        Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
      innobase/buf/buf0lru.c:
        Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
      innobase/buf/buf0rea.c:
        Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
      innobase/btr/btr0btr.c:
        Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
      innobase/btr/btr0sea.c:
        Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
      innobase/fil/fil0fil.c:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      innobase/include/buf0buf.h:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      innobase/include/ha0ha.h:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      innobase/include/hash0hash.h:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      innobase/include/row0mysql.h:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      innobase/include/buf0buf.ic:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      innobase/include/ha0ha.ic:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      innobase/include/ibuf0ibuf.ic:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      innobase/page/page0page.c:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      innobase/row/row0mysql.c:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      innobase/row/row0purge.c:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      innobase/row/row0uins.c:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      innobase/row/row0umod.c:
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      423747b5
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 47056bc5
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-group_concat-4.1
      
      47056bc5
  5. 12 Oct, 2003 2 commits
    • unknown's avatar
      wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed. · 963d7bab
      unknown authored
      typo in error message text corrected.
      new tests added
      
      
      mysql-test/r/func_compress.result:
        new tests added
      mysql-test/t/func_compress.test:
        new tests added
      sql/item_strfunc.cc:
        max size of uncompressed data is max_allowed_packet not 8K
      sql/share/czech/errmsg.txt:
        typo fixed
      sql/share/danish/errmsg.txt:
        typo fixed
      sql/share/dutch/errmsg.txt:
        typo fixed
      sql/share/english/errmsg.txt:
        typo fixed
      sql/share/estonian/errmsg.txt:
        typo fixed
      sql/share/french/errmsg.txt:
        typo fixed
      sql/share/german/errmsg.txt:
        typo fixed
      sql/share/greek/errmsg.txt:
        typo fixed
      sql/share/hungarian/errmsg.txt:
        typo fixed
      sql/share/italian/errmsg.txt:
        typo fixed
      sql/share/japanese/errmsg.txt:
        typo fixed
      sql/share/korean/errmsg.txt:
        typo fixed
      sql/share/norwegian-ny/errmsg.txt:
        typo fixed
      sql/share/norwegian/errmsg.txt:
        typo fixed
      sql/share/polish/errmsg.txt:
        typo fixed
      sql/share/portuguese/errmsg.txt:
        typo fixed
      sql/share/romanian/errmsg.txt:
        typo fixed
      sql/share/russian/errmsg.txt:
        typo fixed
      sql/share/serbian/errmsg.txt:
        typo fixed
      sql/share/slovak/errmsg.txt:
        typo fixed
      sql/share/spanish/errmsg.txt:
        typo fixed
      sql/share/swedish/errmsg.txt:
        typo fixed
      sql/share/ukrainian/errmsg.txt:
        typo fixed
      963d7bab
    • unknown's avatar
      fixed fix_fields() parameters for GROUP_CONCAT() ORDER BY clause · 489da70f
      unknown authored
      (BUG#1537)
      
      
      mysql-test/r/func_gconcat.result:
        test of BUG#1537
      mysql-test/t/func_gconcat.test:
        test of BUG#1537
      sql/item_sum.cc:
        passing correct address of pointer to item to fix_dields(), using that addres to get access to item after fix_fields
      489da70f
  6. 11 Oct, 2003 3 commits
    • unknown's avatar
      Add warnings for single line inserts. To do this I had to convert... · 9a5a5866
      unknown authored
      Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL)
      
      
      mysql-test/r/ctype_mb.result:
        update results after adding more warnings
      mysql-test/r/null.result:
        update results after adding more warnings
      mysql-test/r/select_found.result:
        update results after adding more warnings
      mysql-test/r/warnings.result:
        update results after adding more warnings
      mysql-test/t/ctype_mb.test:
        Add missing drop table
      mysql-test/t/myisam.test:
        Disable some warnings
      mysql-test/t/select_found.test:
        update results after adding more warnings
      sql/field_conv.cc:
        Add warnings for single line inserts
      sql/item_func.cc:
        Remove compile warnings
      sql/sql_class.cc:
        Add warnings for single line inserts
      sql/sql_class.h:
        Add warnings for single line inserts
      sql/sql_insert.cc:
        Add warnings for single line inserts
      sql/sql_load.cc:
        Add warnings for single line inserts
      sql/sql_select.cc:
        Add warnings for single line inserts
      sql/sql_table.cc:
        Add warnings for single line inserts
      sql/sql_update.cc:
        Add warnings for single line inserts
      9a5a5866
    • 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
    • unknown's avatar
      mysqld.cc: · 319029c4
      unknown authored
        Fix error in --show-slave-auth-info help string.
      
      
      sql/mysqld.cc:
        Fix error in --show-slave-auth-info help string.
      319029c4