1. 18 Nov, 2004 8 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ed3f5245
      unknown authored
      into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
      
      
      ed3f5245
    • unknown's avatar
      - added sql_trigger.cpp to the mysqld and libmysqld project files · 40148d5c
      unknown authored
      
      VC++Files/libmysqld/libmysqld.dsp:
        - added sql_trigger.cpp to the project
      VC++Files/sql/mysqld.dsp:
        - added sql_trigger.cpp to the project
      40148d5c
    • unknown's avatar
      Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 · 17582bc0
      unknown authored
      into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
      
      
      17582bc0
    • unknown's avatar
      Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 · e1f5b3f9
      unknown authored
      into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
      
      
      sql/ha_innodb.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/structs.h:
        Auto merged
      e1f5b3f9
    • unknown's avatar
      WL 2059 Engine-specific status variables framework and WL 1922 · 4dac69eb
      unknown authored
      InnoDB status variables
      
      
      innobase/buf/buf0buf.c:
        Added function to get the number of latched pages
      innobase/buf/buf0flu.c:
        Added support for dblwr_pages_written, dblwr_writes and
        buffer_pool_pages_flushed status variables
      innobase/buf/buf0lru.c:
        Added support for _buffer_pool_wait_free status variable
      innobase/buf/buf0rea.c:
        Added support for buffer_pool_read_ahead_rnd, buffer_pool_read_ahead_seq
        and srv_buf_pool_reads status variables
      innobase/fil/fil0fil.c:
        Added support for os_log_fsyncs, data_read, and data_written
      innobase/include/buf0buf.h:
        Functions and variables needed for new status variables declared
      innobase/include/buf0flu.ic:
        Added support for buffer_pool_write_requests status variable
      innobase/include/fil0fil.h:
        Variable declared
      innobase/include/os0file.h:
        Declared several variabled
      innobase/include/srv0srv.h:
        Declared all new variables needed for InnoDB status variables
      innobase/log/log0log.c:
        Added support for various log-related status variables
      innobase/os/os0file.c:
        Added support for pending_writes, pending_reads status variables
      innobase/srv/srv0srv.c:
        Added internal counters and function to accumulate information for
        InnoDB status variables
      mysql-test/r/innodb.result:
        result fot the test
      mysql-test/t/innodb.test:
        We have tests only for few variables, as we cannot predict value for
        most of the added variables. It depends on the system load, OS, HDD
        e.t.c Thus, we cannot test them with mysql-test.
      sql/ha_innodb.cc:
        Added an array for InnoDB status variables. This is part of the
        WL2059 Engine-specific status variables framework
      sql/ha_innodb.h:
        Declared status variables array and the function to refresh statistics
      sql/handler.cc:
        Added function to get statistics
      sql/handler.h:
        Declared function to update handlers statistics
      sql/mysql_priv.h:
        declared opt_innodb to see it from handlers
      sql/mysqld.cc:
        Don't include Innodb_*  status variables into "show status" if we
        are compiling without InnoDB
      sql/sql_show.cc:
        mysqld_show modified and split into two parts to support enclosed
        arrays in the show_var_st structure. This is a part of
        WL2059 Engine-specific status variables framework.
      sql/structs.h:
        Added new value to mark enclosed array in the status variables array
      4dac69eb
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 703c498f
      unknown authored
      into mysql.com:/home/timka/mysql/src/5.0-grind
      
      
      703c498f
    • unknown's avatar
      Fixed one warning and two errors reported by VC 6.0. · 7d8f33ea
      unknown authored
      
      BitKeeper/etc/ignore:
        Added ndb/tools/ndb_restore to the ignore list
      sql/item.cc:
        Fixed VC 6.0 warning:
        mysql-5.0.2-alpha\sql\item.cpp(1729) : warning C4715: 'resolve_ref_in_select_and_group' : not all control paths return a value
      sql/opt_range.cc:
        Fixed VC 6.0 errors:
        ERROR # 4: mysql-5.0.2-alpha\sql\opt_range.cpp(8070) : error C2664: 'key_cmp' : cannot convert parameter 2 from 'char *' to 'const unsigned char *'
                Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast
        
        ERROR # 5: mysql-5.0.2-alpha\sql\opt_range.cpp(8196) : error C2664: 'key_cmp' : cannot convert parameter 2 from 'char *' to 'const unsigned char *'
                Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast
      7d8f33ea
    • unknown's avatar
      remove unused parts of code · cd2edd17
      unknown authored
      fix for 'show create schema_table'
      fix for usage schema tables in subselect
      'wrong schema table charset' fix
      
      
      mysql-test/r/information_schema.result:
        'wrong schema table charset' fix
      mysql-test/t/information_schema.test:
        'wrong schema table charset' fix
      sql/mysql_priv.h:
        fix for 'show create schema_table'
      sql/sql_class.cc:
        'wrong schema table charset' fix
      sql/sql_class.h:
        'wrong schema table charset' fix
      sql/sql_parse.cc:
        fix for 'show create schema_table'
      sql/sql_select.cc:
        'wrong schema table charset' fix
      sql/sql_show.cc:
        remove unused parts of code
        fix for 'show create schema_table'
        fix for usage schema tables in subselect
      sql/table.h:
        remove unused parts of coed
      tests/client_test.c:
        'wrong schema table charset' fix
      cd2edd17
  2. 17 Nov, 2004 19 commits
    • unknown's avatar
      merged · 2836164f
      unknown authored
      2836164f
    • unknown's avatar
      merged · 4f641309
      unknown authored
      
      client/Makefile.am:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/r/heap.result:
        Auto merged
      mysql-test/r/heap_hash.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysql-test/t/user_var.test:
        Auto merged
      ndb/src/mgmsrv/main.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/structs.h:
        Auto merged
      4f641309
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 6ce9ed78
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      6ce9ed78
    • unknown's avatar
      time independent test · d1e4a1f1
      unknown authored
      
      mysql-test/r/ctype_ucs.result:
        result update
      mysql-test/t/ctype_ucs.test:
        time independent
      d1e4a1f1
    • unknown's avatar
      7f5be1b6
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · ae4c3d22
      unknown authored
      into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/wl638.3
      
      
      ae4c3d22
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · ebf110f9
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
      
      
      ebf110f9
    • unknown's avatar
      WL#638 - Fix precedence for parsing NOT ... LIKE expression s · 191fa299
      unknown authored
        Rework parser expression rules
        Rework handling for "||" concat/or
        Eliminate some shift/reduce conflicts
        Add support for "xxx IS [ NOT ] truth_value"
      
      
      mysql-test/r/ansi.result:
        Fix test for new BROKEN_NOT mode bit
      mysql-test/r/bool.result:
        WL#638
          New test for BROKEN_NOT mode
          New test for "expr IS [NOT] truth_value" syntax
      mysql-test/r/sql_mode.result:
        Fix test for new BROKEN_NOT mode bit
      mysql-test/t/bool.test:
        WL#638
          New test for BROKEN_NOT mode
          New test for "expr IS [NOT] truth_value" syntax
      sql/lex.h:
        WL#638
          "&&" and "AND" return different tokens,
          NOT token changed to NOT_SYM
          OR_OR_CONCAT token changed to OR_OR_SYM
          New token "UNKNOWN"
      sql/mysql_priv.h:
        WL#638
          New mode: BROKEN_NOT
      sql/mysqld.cc:
        WL#638
          New mode: BROKEN_NOT
      sql/set_var.cc:
        WL#638
          New mode: BROKEN_NOT
          BROKEN_NOT is set in MYSQL323 and MYSQL40 modes
      sql/sql_lex.cc:
        Bug#638
          Alter tokens returned by lexer depending upon sql_mode:
          Return NOT2_SYM token instead of NOT_SYM when in BROKEN_NOT mode
          Return OR2_SYM token instead of OR_OR_SYM when not in PIPES_AS_CONCAT mode
      sql/sql_yacc.yy:
        WL#638
          Change grammar to respect proper SQL syntax for NOT
          Clean up grammar, eliminate >100 shift/reduce conflicts
          New support for "expr IS [NOT] truth_value" SQL syntax
          Remove or_or_concat() support func. New support func is_truth_value()
      191fa299
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1dad6550
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.1
      
      
      1dad6550
    • unknown's avatar
      Fix for Auto_increment filed value in 'show table status' · 173722db
      unknown authored
      code cleanup
      
      
      mysql-test/r/information_schema.result:
        Fix for Auto_increment filed value in 'show table status'
      mysql-test/t/information_schema.test:
        Fix for Auto_increment filed value in 'show table status'
      173722db
    • unknown's avatar
      Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code. · ab51882b
      unknown authored
      Moving the part of user_var.test using UCS2 to ctype_ucs.test
      
      
      mysql-test/r/ctype_ucs.result:
        result update
      mysql-test/r/user_var.result:
        result update
      mysql-test/t/ctype_ucs.test:
        importing test piece from user_var.test
      mysql-test/t/user_var.test:
        using UCS2 in this test fails on non-USC2-capable binaries, so let's move this piece to ctype_ucs.test.
      sql/slave.cc:
        changing arg type to uint32* (as what is used in this arg is &thd->db_length which is uint32*)
      sql/slave.h:
        changing arg type to uint32*
      sql/sql_parse.cc:
        changing arg types to uint32, as what is used in these args is a create_field::length which is uint32.
      ab51882b
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 090a843f
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
      
      
      090a843f
    • unknown's avatar
      merged · 71da21b2
      unknown authored
      
      sql/ha_innodb.cc:
        Auto merged
      71da21b2
    • unknown's avatar
      #warning removed · 7fc70c7f
      unknown authored
      AC_FUNC_MMAP changes to AC_CHECK_FUNCS(mmap)
      
      
      configure.in:
        don't use AC_FUNC_MMAP - it checks for "private fixed mapping of
        already-mapped memory" - and we don't care about it.
        use regular AC_CHECK_FUNCS(mmap) instead
        (blame autoconf for misleading macro name - should've been
        AC_MMAP_CAN_DO_PRIVATE_FIXING_MAPPING_OF_ALREADY_MAPPED_MEMORY :)
      include/my_pthread.h:
        not all cpp's understand #warning :-[]
      7fc70c7f
    • unknown's avatar
      test for bug#5528 · 835e0159
      unknown authored
      835e0159
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 968dbbcd
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
      
      
      sql/item_func.cc:
        Auto merged
      sql/table.h:
        Auto merged
      968dbbcd
    • unknown's avatar
      fixing compiler warnings · 6eb81bbb
      unknown authored
      
      sql/item_func.cc:
        fixed type
      sql/sql_base.cc:
        keep kompiller happy about unused lable in libmysqld
      sql/sql_view.cc:
        keep kompiller happy about unused variable in libmysqld
      sql/table.h:
        correct type casting
      6eb81bbb
    • unknown's avatar
      don't fail if dbug manual cannot be built · c0114674
      unknown authored
      c0114674
    • unknown's avatar
      Fix warnings and compilation failures (Windows). · 7cd9cc1b
      unknown authored
      
      sql/field.cc:
        Fix warning.
      sql/item_func.cc:
        Fix Windows compilation failure.
      sql/opt_range.cc:
        Fix warnings and errors (Windows)
      sql/sp_pcontext.h:
        Fix warning (Windows).
      sql/table.h:
        Fix warning (Windows).
      7cd9cc1b
  3. 16 Nov, 2004 13 commits
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3a301ac1
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      3a301ac1
    • unknown's avatar
      portability fix · 163d8b27
      unknown authored
      
      server-tools/instance-manager/mysqlmanager.cc:
        removed non-portable sys_siglist
      163d8b27
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · d7729a85
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
      
      
      d7729a85
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 0033fa4b
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      0033fa4b
    • unknown's avatar
      key_cache.result, key_cache.test: · 2094d80b
      unknown authored
        Added a test case for bug #6447.
      mf_keycache.c:
        Fixed bug #6447. Erronious code in the key_cache_read function
        caused problems when reading key blocks with offset>0 into
        key cache. The code of key_cache_insert and key_cache_write
        was modified similarly.
      
      
      mysys/mf_keycache.c:
        Fixed bug #6447. Erronious code in the key_cache_read function
        caused problems when reading key blocks with offset>0 into
        key cache. The code of key_cache_insert and key_cache_write
        was modified similarly.
      mysql-test/t/key_cache.test:
        Added a test case for bug #6447.
      mysql-test/r/key_cache.result:
        Added a test case for bug #6447.
      2094d80b
    • unknown's avatar
      8c2ae720
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 · 190227dc
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      
      190227dc
    • unknown's avatar
      ha_innodb.cc: · d711df11
      unknown authored
        Anthony's http://lists.mysql.com/internals/18505 patch for DROP DATABASE broke caused it to return errno if .ibd files were present (bas_ext() was obsolete in ha_innodb.cc); fix this
      
      
      sql/ha_innodb.cc:
        Anthony's http://lists.mysql.com/internals/18505 patch for DROP DATABASE broke caused it to return errno if .ibd files were present (bas_ext() was obsolete in ha_innodb.cc); fix this
      d711df11
    • unknown's avatar
      Fix comment. · a710ebb4
      unknown authored
      
      sql/item_func.cc:
        Fix comment (used_table_cache is completely different from 
        used_tables_cache :)
      a710ebb4
    • unknown's avatar
      ha_innodb.cc: · 7d074100
      unknown authored
      Manually ported this bug fix from 4.0: 
       Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
      
      
      sql/ha_innodb.cc:
        Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
      7d074100
    • unknown's avatar
      ha_innodb.cc: · 16d735ad
      unknown authored
        Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
      
      
      sql/ha_innodb.cc:
        Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
      16d735ad
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · f2db7d57
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
      
      
      heap/hp_hash.c:
        Auto merged
      mysql-test/r/heap.result:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      f2db7d57
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0 · cb39ddfb
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/petica
      
      
      cb39ddfb