1. 06 Jan, 2005 14 commits
    • unknown's avatar
      merged · b74ac39f
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      include/my_pthread.h:
        Auto merged
      innobase/os/os0file.c:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql-common/client.c:
        merged manually
      b74ac39f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 52a756ce
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      52a756ce
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 18cb4bda
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      18cb4bda
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8ead56a3
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      8ead56a3
    • unknown's avatar
      removed unused label · f56768c9
      unknown authored
      f56768c9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d56940f2
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/sql_prepare.cc:
        Auto merged
      d56940f2
    • unknown's avatar
      Fixed a bug in prepared statements error handling · ea8f9651
      unknown authored
      After merge fixes
      
      
      libmysql/libmysql.c:
        Fixed a bug in prepared statements error handling introduced by me on a recent patch
      mysql-test/r/delayed.result:
        Updated results
      mysql-test/t/delayed.test:
        Bigger timeout needed when using --ps-protocol (don't understand why yet)
        Added output of not_flushed_dealyed_rows for easier debugging
      sql/sql_base.cc:
        USE tables_share fix for prepared statements
      sql/sql_prepare.cc:
        After merge fix
      ea8f9651
    • unknown's avatar
      - Manually merged two changes from 4.0 · fe2f100e
      unknown authored
      
      BUILD/compile-dist:
        - manual merge
      include/my_pthread.h:
        - manual merge
      fe2f100e
    • unknown's avatar
      Ensure that a 'bool' function really returns a value - was compiler error on... · 793e93f5
      unknown authored
      Ensure that a 'bool' function really returns a value - was compiler error on some problems causing build failure.
      
      
      793e93f5
    • unknown's avatar
      - enable "with-extra-charsets=complex" for the "compile-dist" distribution · 27106688
      unknown authored
         build (to make the test suite pass)
      
      
      BUILD/compile-dist:
        - enable "with-extra-charsets=complex" for the distribution build
          (to make the test suite pass)
      27106688
    • unknown's avatar
      ha_ndbcluster.m4: · e4d8d2bb
      unknown authored
        fixed ndb configure according to 4.1
      
      
      config/ac-macros/ha_ndbcluster.m4:
        fixed ndb configure according to 4.1
      e4d8d2bb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 42db27b9
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/item_func.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      42db27b9
    • 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
    • unknown's avatar
      os0file.c: · 4a2b3190
      unknown authored
        Use the fcntl() file flush method on OS X; Apple disabled fsync() for internal disk drives, which caused corruption in power outages; the patch was recommended by an Apple engineer
      
      
      innobase/os/os0file.c:
        Use the fcntl() file flush method on OS X; Apple disabled fsync() for internal disk drives, which caused corruption in power outages; the patch was recommended by an Apple engineer
      4a2b3190
  2. 05 Jan, 2005 18 commits
  3. 04 Jan, 2005 8 commits
    • unknown's avatar
    • unknown's avatar
      mysql_test_run_new.dsp: · 5ece36ee
      unknown authored
        Link mysql_test_run_new as console application
      my_manage.c:
        The type intptr_t isn't defined for VC 6.0
        Changed return type for CreateProcess() to bool
      mysql_test_run_new.c:
        The type intptr_t isn't defined for VC 6.0
      mysqltest.dsp:
        Added regex to additional build types for mysqltest
      mysqldump.dsp:
        Added mysys.lib for linking mysqldump
      
      
      VC++Files/client/mysqldump.dsp:
        Added mysys.lib for linking mysqldump
      VC++Files/client/mysqltest.dsp:
        Added regex to additional build types for mysqltest
      mysql-test/mysql_test_run_new.c:
        The type intptr_t isn't defined for VC 6.0
      mysql-test/my_manage.c:
        The type intptr_t isn't defined for VC 6.0
        Changed return type for CreateProcess() to bool
      VC++Files/mysql-test/mysql_test_run_new.dsp:
        Link mysql_test_run_new as console application
      5ece36ee
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7084d92c
      unknown authored
      into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
      
      7084d92c
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · c967af85
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      c967af85
    • unknown's avatar
      Added checking for my.cnf file from environment variable MYSQL_HOME · 652f1dd2
      unknown authored
      instead of DATADIR.
      
      
      include/config-win.h:
        Added checks for environment variable MYSQL_HOME
      libmysql/Makefile.shared:
        Added checks for environment variable MYSQL_HOME
      mysys/Makefile.am:
        Added checks for environment variable MYSQL_HOME
      mysys/default.c:
        Removed checks for my.cnf file in datadir, instead added checking
        if my.cnf exists in environment variable MYSQL_HOME
      scripts/mysqld_multi.sh:
        Added checks for my.cnf file in environment variable MYSQL_HOME,
        if exists.
      scripts/mysqld_safe.sh:
        Added checks for my.cnf file in environment variable MYSQL_HOME,
        if exists.
      652f1dd2
    • unknown's avatar
      Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 · d7062ca6
      unknown authored
      into mysql.com:/home/jwinstead2/mysql-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      d7062ca6
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · d6ccf6d5
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      d6ccf6d5
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · b75119d7
      unknown authored
      into mysql.com:/M50/mysql-5.0
      
      b75119d7