1. 06 Jan, 2005 1 commit
    • unknown's avatar
      First stage of table definition cache · ff6097bd
      unknown authored
      Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
      Created Field::make_field() and made Field_num::make_field() to call this
      Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
      Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
      Renamed TABLE_SHARE->real_name to table_name
      Renamed TABLE->table_name to alias
      Renamed TABLE_LIST->real_name to table_name
      
      
      include/myisam.h:
        Added const before names
      mysql-test/r/group_min_max.result:
        Make results repeatable
      mysql-test/t/group_min_max.test:
        Make results repeatable
      sql/field.cc:
        Created Field::make_field() and made Field_num::make_field() to call this
        Use TABLE_SHARE
        Use sql_strmake() instead of sql_memdup() to simplify code
      sql/field.h:
        Changed table_name to be pointer to table_name. This allows us to change alias for all fields by just changing one pointer.
        Use TABLE_SHARE
      sql/field_conv.cc:
        Use TABLE_SHARE
      sql/filesort.cc:
        Use TABLE_SHARE
      sql/ha_berkeley.cc:
        Use TABLE_SHARE
      sql/ha_heap.cc:
        Use TABLE_SHARE
      sql/ha_innodb.cc:
        Use TABLE_SHARE
      sql/ha_myisam.cc:
        Use TABLE_SHARE
      sql/ha_myisammrg.cc:
        Use TABLE_SHARE
        Change some pointer handling to use const char*
      sql/ha_ndbcluster.cc:
        Use TABLE_SHARE
      sql/handler.cc:
        Use TABLE_SHARE
      sql/item.cc:
        Use TABLE_SHARE
      sql/item_func.cc:
        Use TABLE_SHARE
      sql/item_subselect.cc:
        Use TABLE_SHARE
      sql/item_sum.cc:
        Use TABLE_SHARE
      sql/key.cc:
        Use TABLE_SHARE
      sql/lock.cc:
        Use TABLE_SHARE
      sql/log_event.cc:
        real_name -> table_name
      sql/mysql_priv.h:
        Use TABLE_SHARE
      sql/opt_range.cc:
        Use TABLE_SHARE
      sql/opt_sum.cc:
        Use TABLE_SHARE
      sql/records.cc:
        Use TABLE_SHARE
      sql/repl_failsafe.cc:
        real_name -> table_name
      sql/slave.cc:
        Use TABLE_SHARE
      sql/sp.cc:
        Use TABLE_SHARE
      sql/sp_head.cc:
        real_name -> table_name
      sql/sql_acl.cc:
        Use TABLE_SHARE
        removed unnecessary assert
        fixed indentation
        changed some char * -> const char*
      sql/sql_acl.h:
        changed some char* -> const char*
      sql/sql_base.cc:
        Use TABLE_SHARE
      sql/sql_cache.cc:
        Use TABLE_SHARE
      sql/sql_class.cc:
        Use TABLE_SHARE
      sql/sql_db.cc:
        real_name -> table_name
      sql/sql_delete.cc:
        Use TABLE_SHARE
      sql/sql_derived.cc:
        Use TABLE_SHARE
      sql/sql_handler.cc:
        Use TABLE_SHARE
      sql/sql_help.cc:
        Use TABLE_SHARE
      sql/sql_insert.cc:
        Use TABLE_SHARE
      sql/sql_load.cc:
        Use TABLE_SHARE
      sql/sql_parse.cc:
        Use TABLE_SHARE
      sql/sql_rename.cc:
        real_name -> table_name
      sql/sql_select.cc:
        Use TABLE_SHARE
        table->blob_fields now points to field offsets, not fields
        tmp_table->table_name now points to alias name
      sql/sql_show.cc:
        Use TABLE_SHARE
      sql/sql_table.cc:
        Use TABLE_SHARE
      sql/sql_test.cc:
        Use TABLE_SHARE
      sql/sql_trigger.cc:
        Use TABLE_SHARE
      sql/sql_udf.cc:
        Use TABLE_SHARE
      sql/sql_union.cc:
        real_name -> table_name
      sql/sql_update.cc:
        Use TABLE_SHARE
      sql/sql_view.cc:
        Use TABLE_SHARE
      sql/table.cc:
        Split TABLE to TABLE and TABLE_SHARE
        Changed blob_field to be field offsets instead of pointer to fields
        Only initialize table->s->default_values with default record (not all table->record[#])
        Some indentation changes
      sql/table.h:
        Split TABLE to TABLE and TABLE_SHARE
      sql/tztime.cc:
        real_name -> table_name
      sql/unireg.cc:
        Use TABLE_SHARE
      sql/unireg.h:
        Use TABLE_SHARE
      ff6097bd
  2. 04 Jan, 2005 2 commits
    • unknown's avatar
      After merge fixes · af8301ce
      unknown authored
      Add support for warnings for prepare of prepared statements
      Fixed test to work with --ps-protocol
      Fixed some test results
      
      
      libmysql/libmysql.c:
        Add support for warnings for prepare of prepared statements
      mysql-test/r/func_concat.result:
        After merge fixes
      mysql-test/r/select.result:
        Delete conflicting tables form previous tests
      mysql-test/r/view.result:
        New code from 4.1 fixed old error
      mysql-test/t/create.test:
        Ensure that --ps-protocol return same results as normal test
      mysql-test/t/func_group.test:
        Remove not needed --disable_ps_protocol
      mysql-test/t/func_time.test:
        Ensure that --ps-protocol return same results as normal test
      mysql-test/t/having.test:
        Ensure that --ps-protocol return same results as normal test
      mysql-test/t/insert_select.test:
        Remove not needed --disable_ps_protocol
      mysql-test/t/select.test:
        Ensure that --ps-protocol return same results as normal test
      mysql-test/t/sp.test:
        Fixed comment
      mysql-test/t/system_mysql_db_fix.test:
        Fix that results is same as from system_mysql_db.test
      mysql-test/t/trigger.test:
        Added comment
      mysql-test/t/type_blob.test:
        Remove not needed --disable_ps_protocol
      mysql-test/t/union.test:
        Run most of the test with --ps-protocol
      mysql-test/t/user_limits.test:
        Ensure that --ps-protocol return same results as normal test
      mysql-test/t/view.test:
        Removed --error as bug is now fixed
      mysql-test/t/warnings.test:
        Ensure that --ps-protocol return same results as normal test
      ndb/include/Makefile.am:
        Don't automaticly use SCCS files
      sql/ha_ndbcluster.cc:
        Removed compiler warning
      sql/log_event.cc:
        After merge fix
      sql/sql_class.h:
        After merge fix
      sql/sql_insert.cc:
        After merge fix
      sql/sql_load.cc:
        After merge fix
      sql/sql_prepare.cc:
        Add support for warnings for prepare of prepared statements
      sql/sql_update.cc:
        After merge fixes
      af8301ce
    • unknown's avatar
      Merge · 7b1fa996
      unknown authored
      
      mysql-test/t/multi_update.test:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      support-files/mysql.spec.sh:
        SCCS merged
      7b1fa996
  3. 03 Jan, 2005 37 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ee7aaf2d
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/sql_base.cc:
        Auto merged
      ee7aaf2d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8aa7a576
      unknown authored
      into mysql.com:/users/pchardin/mysql-5.0
      
      8aa7a576
    • unknown's avatar
      fixed .spec file after isam/merge purge, removed man pages for isamlog and isamchk · 5becc6f2
      unknown authored
      
      BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
        Delete: man/isamchk.1.in
      BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
        Delete: man/isamlog.1.in
      man/Makefile.am:
        man pages for isamchk and isamlog removed
      support-files/mysql.spec.sh:
        fix .spec file after isam/merge purge
      5becc6f2
    • unknown's avatar
      mysql-test/r/multi_update.result, mysql-test/t/multi_update.test · 7eb441e6
      unknown authored
          don't fail w/o bdb (or innodb)
      sql/sql_base.cc
          typo fixed.
          "mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)
      
      
      mysql-test/r/multi_update.result:
        don't fail w/o bdb (or innodb)
      mysql-test/t/multi_update.test:
        don't fail w/o bdb (or innodb)
      sql/sql_base.cc:
        typo fixed.
        "mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)
      7eb441e6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0464033e
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      0464033e
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 80d6b986
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      80d6b986
    • unknown's avatar
      merge error · 42ae1f1b
      unknown authored
      42ae1f1b
    • unknown's avatar
      Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY · 6006f3e6
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      Makefile.am:
        Auto merged
      client/mysqltest.c:
        Auto merged
      configure.in:
        Auto merged
      innobase/log/log0recv.c:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/drop.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/t/drop.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      ndb/include/ndb_global.h.in:
        Auto merged
      ndb/src/kernel/blocks/suma/Suma.cpp:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_repl.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/time.cc:
        Auto merged
      innobase/row/row0upd.c:
        Trivial merge
      mysql-test/t/func_concat.test:
        Keep local code
      mysql-test/t/multi_update.test:
        auto merge
      sql/ha_ndbcluster.cc:
        manual merge
      sql/item_timefunc.cc:
        manual merge
      sql/mysql_priv.h:
        manual merge
      sql/sql_class.h:
        manual merge
      sql/sql_delete.cc:
        manual merge
      sql/sql_insert.cc:
        manual merge
      sql/sql_lex.cc:
        manual merge
      sql/sql_lex.h:
        manual merge
      sql/sql_load.cc:
        manual merge
      sql/sql_parse.cc:
        manual merge
      sql/sql_table.cc:
        manual merge
      sql/sql_update.cc:
        manual merge
      6006f3e6
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · e30aef3b
      unknown authored
      into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
      
      e30aef3b
    • unknown's avatar
      sync0sync.h, sync0rw.h: · 821db2cb
      unknown authored
        Fix Bug#7624
      
      
      innobase/include/sync0rw.h:
        Fix Bug#7624
      innobase/include/sync0sync.h:
        Fix Bug#7624
      821db2cb
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 229046fa
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      229046fa
    • unknown's avatar
      fixed reporting error · aa5ae09b
      unknown authored
      aa5ae09b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 1ca88813
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      1ca88813
    • unknown's avatar
      added ndb/include/ndb_global.h ndb/include/ndb_version.h to ignore · b14bc2a4
      unknown authored
      
      BitKeeper/etc/ignore:
        added ndb/include/ndb_global.h ndb/include/ndb_version.h
      b14bc2a4
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · f3e78702
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      f3e78702
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 124a9225
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      mysql-test/t/multi_update.test:
        Auto merged
      124a9225
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · bd231995
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/include/ndb_global.h.in:
        Auto merged
      bd231995
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 252218e9
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/include/ndb_global.h.in:
        Auto merged
      ndb/include/ndb_types.h:
        Auto merged
      252218e9
    • unknown's avatar
      bug#7626 - post review version · dc1b538f
      unknown authored
      
      ndb/include/ndb_global.h.in:
        move types into ndb_global.h.in
        Check sizeof of Uint8, Uint32 & Uint64
      ndb/include/ndb_types.h:
        move types into ndb_global.h.in
      dc1b538f
    • unknown's avatar
      Better handling of ensuring that setup_tables() are not called twice · a1a4c2c6
      unknown authored
      This fixed a bug in prepared statements when used with outher joins
      Fixed a bug in SUM(DISTINCT) when used with prepared statements.
      Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests
      
      
      mysql-test/r/mysqldump.result:
        Safety fix if a previous test would fail
      mysql-test/r/show_check.result:
        Safety fix if a previous test would fail
      mysql-test/r/sp.result:
        Fix for --ps-protocol
      mysql-test/r/synchronization.result:
        Safety fix if a previous test would fail
      mysql-test/r/system_mysql_db.result:
        Safety fix if a previous test would fail
      mysql-test/t/mysqldump.test:
        Safety fix if a previous test would fail
      mysql-test/t/select.test:
        Safety fix if a previous test would fail
      mysql-test/t/show_check.test:
        Safety fix if a previous test would fail
      mysql-test/t/sp.test:
        fix for --ps-protocol
      mysql-test/t/strict.test:
        Fix for --ps-protocol
      mysql-test/t/synchronization.test:
        Safety fix if a previous test would fail
      mysql-test/t/system_mysql_db.test:
        Safety fix if a previous test would fail
      sql/item_sum.cc:
        Fix bug in SUM(DISTINCT...) when using with prepared statements
      sql/item_sum.h:
        Fix bug in SUM(DISTINCT...) when using with prepared statements
      sql/mysql_priv.h:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_base.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_insert.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_parse.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_prepare.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_select.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_union.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/sql_update.cc:
        Better handling of ensuring that setup_tables() are not called twice
      sql/table.h:
        Better handling of ensuring that setup_tables() are not called twice
      a1a4c2c6
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 0b444acb
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/include/ndb_types.h:
        Auto merged
      0b444acb
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 6d38792d
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      6d38792d
    • unknown's avatar
      bug#7626 - ndb UintPtr handling · 530389e6
      unknown authored
      
      ndb/include/ndb_types.h:
        redo UintPtr handling
      530389e6
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 08f1745d
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      08f1745d
    • unknown's avatar
      bug#7626 - ndb - non portable uint_ptr · 5468ac12
      unknown authored
      
      ndb/include/ndb_types.h:
        redo UintPtr handling using SIZEOF_CHARP
      ndb/test/tools/Makefile.am:
        remove unused defines
      5468ac12
    • unknown's avatar
      mtr_process.pl: · 4dd79c71
      unknown authored
        Added missing stop_reap_all() if returns early from function
      mysql-test-run.pl:
        Improved output from --script-debug
        Initial Cygwin support
        Improved mysqld process termination
      
      
      mysql-test/mysql-test-run.pl:
        Improved output from --script-debug
        Initial Cygwin support
        Improved mysqld process termination
      mysql-test/lib/mtr_process.pl:
        Added missing stop_reap_all() if returns early from function
      4dd79c71
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2175b1c0
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
      
      2175b1c0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e49723db
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      e49723db
    • unknown's avatar
      Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0 · ef574adb
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      ef574adb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3b2043c5
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      3b2043c5
    • unknown's avatar
      Merge mysql.com:/home/wax/mysql/mysql-4.1 · f00511c6
      unknown authored
      into mysql.com:/home/wax/mysql/mysql-4.1test2
      
      f00511c6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · cb5b1721
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      cb5b1721
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 · 53bc7272
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.7545
      
      53bc7272
    • unknown's avatar
      Fix for bug #7545 (Undefined symbols if --without-geometry) · 2c4ea572
      unknown authored
      
      myisam/mi_check.c:
        This code should be ifdefed in no HAVE_SPATIAL case
      2c4ea572
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6118eb0f
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      6118eb0f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b7b3275b
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      b7b3275b
    • unknown's avatar
      Remove clear_insert_values() because it was far from trivial to handle the cleanup in all cases · b76b2ba6
      unknown authored
      (Old code failed for INSERT ... ON DUPLICATE with prepared statements) 
      Instead, always reset table->insert_values on open.
      
      
      mysql-test/t/trigger.test:
        Fix test for --ps-protocol
      sql/sql_base.cc:
        Clear insert_values on open_table
      sql/sql_insert.cc:
        Remove clear_insert_values()
      sql/sql_parse.cc:
        Remove clear_insert_values()
      sql/sql_prepare.cc:
        Remove clear_insert_values()
      sql/table.cc:
        Remove clear_insert_values()
      sql/table.h:
        Remove clear_insert_values()
      b76b2ba6