1. 19 Mar, 2007 6 commits
    • unknown's avatar
      mysys.vcproj: · 46d02a2c
      unknown authored
        Removed accidently added my_winsem.c
      make_win_bin_dist:
        Corrected test for relwithdebinfo target
      mysql.sln:
        Specify that comp_err depends on zlib
      
      
      VC++Files/mysys/mysys.vcproj:
        Removed accidently added my_winsem.c
      VC++Files/mysql.sln:
        Specify that comp_err depends on zlib
      scripts/make_win_bin_dist:
        Corrected test for relwithdebinfo target
      46d02a2c
    • unknown's avatar
      make_win_bin_dist: · f5e1dad7
      unknown authored
        Restore accidently removed line
      
      
      scripts/make_win_bin_dist:
        Restore accidently removed line
      f5e1dad7
    • unknown's avatar
      Many files: · 3ff229b4
      unknown authored
        Major cleanup of old Visual Studio project files, aligning engines etc
      
      
      VC++Files/bdb/bdb.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/client/mysql.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/client/mysql_upgrade.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/client/mysqladmin.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/client/mysqlclient.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/client/mysqldump.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/client/mysqlimport.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/client/mysqlshow.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/client/mysqltest.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/comp_err/comp_err.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/dbug/dbug.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/heap/heap.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/innobase/innobase.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/libmysql/libmysql.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/libmysqld/examples/test_libmysqld.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/libmysqld/libmysqld.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/libmysqltest/myTest.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/my_print_defaults/my_print_defaults.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/myisam/myisam.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/myisamchk/myisamchk.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/myisamlog/myisamlog.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/myisammrg/myisammrg.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/myisampack/myisampack.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/mysql.sln:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/mysqlcheck/mysqlcheck.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/mysqldemb/mysqldemb.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/mysqlserver/mysqlserver.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/mysys/mysys.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/perror/perror.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/regex/regex.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/replace/replace.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/sql/gen_lex_hash.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/sql/mysqld.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/strings/strings.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/test1/test1.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/tests/mysql_client_test.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/thr_test/thr_test.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/vio/vio.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      VC++Files/zlib/zlib.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      extra/yassl/taocrypt/taocrypt.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      extra/yassl/yassl.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      scripts/make_win_bin_dist:
        Major cleanup of old Visual Studio project files, aligning engines etc
      server-tools/instance-manager/mysqlmanager.vcproj:
        Major cleanup of old Visual Studio project files, aligning engines etc
      3ff229b4
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release/ · 260e68eb
      unknown authored
      into  trift2.:/MySQL/M50/clone-5.0
      
      
      260e68eb
    • unknown's avatar
      netware/Makefile.am : "libmysql.imp" must survive a "make clean" for the NetWare builds. · 9357dae8
      unknown authored
      
      netware/Makefile.am:
        "libmysql.imp" must survive a "make clean" for the NetWare builds.
      9357dae8
    • unknown's avatar
      Merge dev:my/mysql-5.0-release · 08ec88f2
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-release
      
      
      scripts/make_win_bin_dist:
        Auto merged
      08ec88f2
  2. 18 Mar, 2007 1 commit
    • unknown's avatar
      make_win_bin_dist: · 6f4a4d8a
      unknown authored
        - Support both "release" and "relwithdebinfo" targets
        - Copy ".pdb" and ".pdb" files for the server and instance manager
        - Removed the examples directory, unsupported
        - Handle both old and new builds in the same script, "-debug" and "-nt"
          extensions, directory "data" and "share" in different location
      
      
      scripts/make_win_bin_dist:
        - Support both "release" and "relwithdebinfo" targets
        - Copy ".pdb" and ".pdb" files for the server and instance manager
        - Removed the examples directory, unsupported
        - Handle both old and new builds in the same script, "-debug" and "-nt"
          extensions, directory "data" and "share" in different location
      6f4a4d8a
  3. 17 Mar, 2007 1 commit
  4. 16 Mar, 2007 2 commits
    • unknown's avatar
      Bug#20166 mysql-test-run.pl does not test system privilege tables creation · 77fccd03
      unknown authored
       - Build sql files for netware from the mysql_system_tables*.sq files
       - Fix comments about mysql_create_system_tables.sh
       - Use mysql_install_db.sh to create system tables for mysql_test-run-shell
       - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files
      
      Changeset coded today by Magnus Svensson, just the application to 5.0.38 is by Joerg Bruehe.
      
      
      BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
        Delete: netware/init_db.sql
      BitKeeper/deleted/.del-test_db.sql:
        Delete: netware/test_db.sql
      BitKeeper/etc/ignore:
        Added netware/init_db.sql netware/test_db.sql to the ignore list
      mysql-test/install_test_db.sh:
        Use mysql_install_db from install_test_db(which is used by mysql-test-run-shell)
        to install the system tables
      mysql-test/mysql-test-run.pl:
        Look for the mysql_system_tables*.sql also in share/mysql
      netware/Makefile.am:
        Build netware/init_db.sql and netware/test_db.sql from
        the sources in scripts/msyql_system_tables*.sql
      scripts/make_binary_distribution.sh:
        netware/init_db.sql and netware/test_db.sql are now built by the Makefiles
        from the scripts/mysql_system_tables*.sql files
      sql/mysql_priv.h:
        Update comment remindging to update the MySQL system table definitions
        when adding a new SQL_MODE
      sql/sql_acl.h:
        Update comment reminding to update the MySQL System tables
        when changing the ACL defines
      77fccd03
    • unknown's avatar
      Fix bug#27212, test case "loaddata": Take the file to read from the binary package. · 92384c67
      unknown authored
      
      mysql-test/r/loaddata.result:
        Fix bug#27212:  Do not try to read a file which is not contained in a binary distribution,
        because it will be missing when the tests are run during release build or by a customer.
      mysql-test/t/loaddata.test:
        Fix bug#27212:  Do not try to read a file which is not contained in a binary distribution,
        because it will be missing when the tests are run during release build or by a customer.
      92384c67
  5. 15 Mar, 2007 6 commits
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines · 19ab799d
      unknown authored
      into  mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
      
      
      19ab799d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 39333ba7
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-4.1-merge
      
      
      39333ba7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6f47415f
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-merge
      
      
      6f47415f
    • unknown's avatar
      Merge mockturtle.local:/home/dlenev/src/mysql-4.1-bg25966 · 04e727c7
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg25966-2
      
      
      sql/mysqld.cc:
        Auto merged
      04e727c7
    • unknown's avatar
      Fix for bug #25966 "2MB per second endless memory consumption after LOCK · cdd2a2e4
      unknown authored
      TABLE ... WRITE".
      
      Memory and CPU hogging occured when connection which had to wait for table
      lock was serviced by thread which previously serviced connection that was
      killed (note that connections can reuse threads if thread cache is enabled).
      One possible scenario which exposed this problem was when thread which
      provided binlog dump to replication slave was implicitly/automatically
      killed when the same slave reconnected and started pulling data through
      different thread/connection.
      The problem also occured when one killed particular query in connection
      (using KILL QUERY) and later this connection had to wait for some table
      lock.
      
      This problem was caused by the fact that thread-specific mysys_var::abort
      variable, which indicates that waiting operations on mysys layer should
      be aborted (this includes waiting for table locks), was set by kill
      operation but was never reset back. So this value was "inherited" by the
      following statements or even other connections (which reused the same
      physical thread). Such discrepancy between this variable and THD::killed
      flag broke logic on SQL-layer and caused CPU and memory hogging.
      
      This patch tries to fix this problem by properly resetting this member.
      
      There is no test-case associated with this patch since it is hard to test
      for memory/CPU hogging conditions in our test-suite.
      
      
      sql/mysqld.cc:
        We should not forget to reset THD::mysys_var::abort after kill operation
        if we are going to use thread to which this operation was applied for
        handling of other connections.
      sql/sp_head.cc:
        We should not forget to reset THD::mysys_var::abort after kill operation
        if we are going to use thread to which this operation was applied for
        handling of further statements.
      sql/sql_parse.cc:
        We should not forget to reset THD::mysys_var::abort after kill operation
        if we are going to use thread to which this operation was applied for
        handling of further statements.
      cdd2a2e4
    • unknown's avatar
      Fix for bug #25966 "2MB per second endless memory consumption after LOCK · db1d2f64
      unknown authored
      TABLE ... WRITE".
      
      CPU hogging occured when connection which had to wait for table lock was
      serviced by thread which previously serviced connection that was killed
      (note that connections can reuse threads if thread cache is enabled).
      One possible scenario which exposed this problem was when thread which
      provided binlog dump to replication slave was implicitly/automatically
      killed when the same slave reconnected and started pulling data through
      different thread/connection.
      In 5.* versions memory hogging was added to CPU hogging. Moreover in
      those versions the problem also occured when one killed particular query
      in connection (using KILL QUERY) and later this connection had to wait for
      some table lock.
      
      This problem was caused by the fact that thread-specific mysys_var::abort
      variable, which indicates that waiting operations on mysys layer should
      be aborted (this includes waiting for table locks), was set by kill
      operation but was never reset back. So this value was "inherited" by the
      following statements or even other connections (which reused the same
      physical thread). Such discrepancy between this variable and THD::killed
      flag broke logic on SQL-layer and caused CPU and memory hogging.
      
      This patch tries to fix this problem by properly resetting this member.
      
      There is no test-case associated with this patch since it is hard to test
      for memory/CPU hogging conditions in our test-suite.
      
      
      sql/mysqld.cc:
        We should not forget to reset THD::mysys_var::abort after kill operation
        if we are going to use thread to which this operation was applied for
        handling of other connections.
      db1d2f64
  6. 14 Mar, 2007 8 commits
  7. 13 Mar, 2007 6 commits
    • unknown's avatar
      Removed tabs. · 8205e16c
      unknown authored
      8205e16c
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines · 968d1695
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
      
      
      myisam/mi_create.c:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/sql_parse.cc:
        Use local.
      mysql-test/r/merge.result:
        SCCS merged
      968d1695
    • unknown's avatar
      BUG#26881 - Large MERGE tables report incorrect specification when no · 969b7165
      unknown authored
                  differences in tables
      Certain merge tables were wrongly reported as having incorrect definition:
      - Some fields that are 1 byte long (e.g. TINYINT, CHAR(1)), might
        be internally casted (in certain cases) to a different type on a
        storage engine layer. (affects 4.1 and up)
      - If tables in a merge (and a MERGE table itself) had short VARCHAR column (less
        than 4 bytes) and at least one (but not all) tables were ALTER'ed (even to an
        identical table: ALTER TABLE xxx ENGINE=yyy), table definitions went ouf of
        sync. (affects 4.1 only)
      
      This is fixed by relaxing a check for underlying conformance and setting
      field type to FIELD_TYPE_STRING in case varchar is shorter than 4
      when a table is created.
      
      
      myisam/mi_create.c:
        Added a comment.
      mysql-test/r/merge.result:
        A test case for bug#26881.
      mysql-test/t/merge.test:
        A test case for bug#26881.
      sql/ha_myisam.cc:
        Relaxed some checks performed by check_definition():
        As comparing of fulltext keys (and key segments) is not yet implemented,
        only return an error in case one of keys is fulltext and other is not.
        Otherwise, if both keys are fulltext, accept them as is.
        
        As comparing of spatial keys (and key segments) is not yet implemented,
        only return an error in case one of keys is spatial and other is not.
        Otherwise, if both keys are spatial, accept them as is.
        
        A workaround to handle situation when field is casted from FIELD_SKIP_ZERO
        to FIELD_NORMAL. This could happen only in case field length is 1 and row
        format is fixed.
      sql/sql_parse.cc:
        When a table that has varchar field shorter than 4 is created, field type is
        set to FIELD_TYPE_VAR_STRING. Later, when a table is modified using alter
        table, field type is changed to FIELD_TYPE_STRING (see Field_string::type).
        That means HA_OPTION_PACK_RECORD flag might be lost and thus null_bit might
        be shifted by alter table, in other words alter table doesn't create 100%
        equal table definition.
        
        This is usually not a problem, since when a table is created/altered,
        definition on a storage engine layer is based on one that is passed from
        sql layer. But it is a problem for merge engine - null_bit is shifted when
        a table (merge or underlying) is altered.
        
        Set field type to FIELD_TYPE_STRING in case FIELD_TYPE_VAR_STRING is shorter
        than 4 when a table is created as it is done in Field::type.
      969b7165
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines · 063c95e6
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
      
      
      063c95e6
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · d496ab15
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
      
      
      myisam/rt_index.c:
        Auto merged
      sql/field.h:
        Auto merged
      d496ab15
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-4.1 · e266365c
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines
      
      
      e266365c
  8. 12 Mar, 2007 10 commits