1. 21 Mar, 2007 1 commit
  2. 20 Mar, 2007 22 commits
  3. 19 Mar, 2007 9 commits
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 168515a1
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
      
      
      168515a1
    • unknown's avatar
      sql_insert.cc: · 3798a7d5
      unknown authored
        Removed wrong fix for the bug#27006.
        The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
      trigger.test, trigger.result:
        Corrected test case for the bug#27006.
      
      
      sql/sql_insert.cc:
        Removed wrong fix for the bug#27006.
        The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
      mysql-test/t/trigger.test:
        Corrected test case for the bug#27006.
      mysql-test/r/trigger.result:
        Corrected test case for the bug#27006.
      3798a7d5
    • 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
      Merge trift2.:/MySQL/M50/clone-5.0 · adf4f635
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      sql/mysql_priv.h:
        Auto merged
      adf4f635
    • 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
  4. 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
  5. 17 Mar, 2007 2 commits
  6. 16 Mar, 2007 5 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
    • unknown's avatar
      Fix for bug #23775 "Replicated event larger that max_allowed_packet infinitely re-transmits". · f7aa1930
      unknown authored
      Problem: to handle a situation when the size of event on the master is greater than max_allowed_packet on slave, we checked for the wrong constant (ER_NET_PACKET_TOO_LARGE instead of CR_NET_PACKET_TOO_LARGE).
      
      Solution: test for the client "packet too large" error code instead of the server one in slave I/O thread.
      
      
      mysql-test/r/rpl_packet.result:
        Added test case for bug #23775 "Replicated event larger that max_allowed_packet infinitely re-transmits"
      mysql-test/t/rpl_packet.test:
        Added test case for bug #23775 "Replicated event larger that max_allowed_packet infinitely re-transmits"
      sql/slave.cc:
        Test for the client "packet too large" error code instead of the server one in slave I/O thread.
      f7aa1930
    • unknown's avatar
      Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY · 6d93f150
      unknown authored
      UPDATE if the row wasn't actually changed.
      
      This bug was caused by fix for bug#19978. It causes AFTER UPDATE triggers
      not firing if a row wasn't actually changed by the update part of the
      INSERT .. ON DUPLICATE KEY UPDATE.
      
      Now triggers are always fired if a row is touched by the INSERT ... ON
      DUPLICATE KEY UPDATE.
      
      
      sql/sql_insert.cc:
        Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY
        UPDATE if the row wasn't actually changed.
        Now triggers are always fired if a row is touched by the INSERT ... ON
        DUPLICATE KEY UPDATE.
      mysql-test/r/trigger.result:
        Added a test case for the bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY
        UPDATE if the row wasn't actually changed.
      mysql-test/t/trigger.test:
        Added a test case for the bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY
        UPDATE if the row wasn't actually changed.
      6d93f150
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 43b9ff1b
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26261-5.0-opt
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      mysql-test/r/insert_update.result:
        SCCS merged
      mysql-test/t/insert_update.test:
        SCCS merged
      43b9ff1b