1. 02 Nov, 2007 6 commits
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/bug25205/mysql-5.0-build · aa382266
      unknown authored
      into  mysql.com:/home/kent/bk/bug25205/mysql-5.1-build
      
      
      BitKeeper/deleted/.del-generate-text-files.pl:
        Auto merged
      aa382266
    • unknown's avatar
      Makefile.am: · c8a757db
      unknown authored
        Added manual.chm to EXTRA_DIST
        Removed install of INSTALL-BINARY, handled
        by install scripts.
      ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
        Updated links to version 5.0 of the manual
      
      
      Docs/INSTALL-BINARY:
        Updated links to version 5.0 of the manual
      INSTALL-SOURCE:
        Updated links to version 5.0 of the manual
      INSTALL-WIN-SOURCE:
        Updated links to version 5.0 of the manual
      support-files/MacOSX/ReadMe.txt:
        Updated links to version 5.0 of the manual
      Docs/Makefile.am:
        Added manual.chm to EXTRA_DIST
        Removed install of INSTALL-BINARY, handled
        by install scripts.
      c8a757db
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/bug25205/mysql-4.1-build · 9dc02827
      unknown authored
      into  mysql.com:/home/kent/bk/bug25205/mysql-5.0-build
      
      
      BitKeeper/deleted/.del-generate-text-files.pl:
        SCCS merged
      Docs/Makefile.am:
        SCCS merged
      9dc02827
    • unknown's avatar
      INSTALL-WIN-SOURCE: · 8f040941
      unknown authored
        BitKeeper file /home/kent/bk/bug25205/mysql-4.1-build/INSTALL-WIN-SOURCE
      
      
      INSTALL-WIN-SOURCE:
        BitKeeper file /home/kent/bk/bug25205/mysql-4.1-build/INSTALL-WIN-SOURCE
      8f040941
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/bug25205/mysql-4.0 · acea5f18
      unknown authored
      into  mysql.com:/home/kent/bk/bug25205/mysql-4.1-build
      
      
      acea5f18
    • unknown's avatar
      mysql.info, INSTALL-BINARY, INSTALL-SOURCE, ReadMe.txt, Docs/Makefile.am: · 5ee36c1d
      unknown authored
        Let place holders for real documentation have text that
        makes sense to the user (Bug#25205)
      
      
      BitKeeper/deleted/.del-generate-text-files.pl:
        Delete: Docs/Support/generate-text-files.pl
      Docs/INSTALL-BINARY:
        BitKeeper file /home/kent/bk/bug25205/mysql-4.0/Docs/INSTALL-BINARY
      INSTALL-SOURCE:
        BitKeeper file /home/kent/bk/bug25205/mysql-4.0/INSTALL-SOURCE
      support-files/MacOSX/ReadMe.txt:
        BitKeeper file /home/kent/bk/bug25205/mysql-4.0/support-files/MacOSX/ReadMe.txt
      Docs/mysql.info:
        More of a end-user text
      Docs/Makefile.am:
        Don't generate text files from the documentation
      5ee36c1d
  2. 31 Oct, 2007 1 commit
  3. 30 Oct, 2007 8 commits
  4. 29 Oct, 2007 12 commits
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · bd00ccb7
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      bd00ccb7
    • unknown's avatar
      autorun.sh: · 7752cee4
      unknown authored
        After review changes
      
      
      BUILD/autorun.sh:
        After review changes
      7752cee4
    • unknown's avatar
      autorun.sh: · 1b261d3d
      unknown authored
        Removed innobase from compile-dist, and let it use autorun.sh to avoid
        code duplication. Also corrected a problem when searching for one of
        "libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)
      
      
      BUILD/autorun.sh:
        Removed innobase from compile-dist, and let it use autorun.sh to avoid
        code duplication. Also corrected a problem when searching for one of
        "libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)
      1b261d3d
    • unknown's avatar
      5.1 has been promoted to "rc" status. · 16c621d3
      unknown authored
      16c621d3
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · ede89c64
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      mysql-test/r/derived.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
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/type_date.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/suite/ndb/r/ps_7ndb.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/type_date.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_cache.cc:
        Null merge of a 5.0 patch, by order of the original author via IRC.
      ede89c64
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · a861c70d
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      mysql-test/suite/funcs_1/r/innodb__datadict.result:
        Auto merged
      mysql-test/suite/funcs_1/r/memory__datadict.result:
        Auto merged
      mysql-test/suite/funcs_1/r/myisam__datadict.result:
        Auto merged
      mysql-test/r/partition.result:
        Ensure test for bug number 27816 is in the merged tree.
      mysql-test/t/partition.test:
        Ensure test for bug number 27816 is in the merged tree.
      a861c70d
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · a2f5911b
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      a2f5911b
    • unknown's avatar
      Merge trift2.:/MySQL/M50/clone-5.0 · b63ae73d
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      mysql-test/r/derived.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/sp.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/t/derived.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      mysql-test/r/type_date.result:
        Null-merge 5.0.50 build clone:
        The test for bug#31221 is already in the receiving tree.
      mysql-test/t/type_date.test:
        Null-merge 5.0.50 build clone:
        The test for bug#31221 is already in the receiving tree.
      b63ae73d
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 93265192
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      93265192
    • unknown's avatar
      Merge trift2.:/MySQL/M41/mysql-4.1 · afa5d5a6
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      
      afa5d5a6
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · 7d9c59b7
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      7d9c59b7
    • unknown's avatar
      Fix for · dfdcaf5f
      unknown authored
        Bug#31857 funcs_1: a_processlist_priv_no_prot and b_processlist_priv_ps fail
        
      Reason for the changes is:
        WL4007 Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> UPGRADE
      
      
      mysql-test/suite/funcs_1/datadict/datadict_priv.inc:
        1. Adjustment to new server response (ER_PARSE_ERROR instead of ER_DBACCESS_DENIED_ERROR)
        2. Add missing subtest with ALTER DATABASE ... UPGRADE ...
      mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result:
        Updated results
      mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result:
        Updated results
      dfdcaf5f
  5. 26 Oct, 2007 1 commit
    • unknown's avatar
      Fix for · 9d4e4249
      unknown authored
         Bug#31408 funcs_1: <engine>_trig_03e test fail
      Modification:
         The TRIGGER PRIVILEGE is now needed for getting informations about TRIGGERs.
         Therefore after REVOKE TRIGGER privilege the 
         - SHOW TRIGGERS
         - SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
         result sets are now empty.
      
      
      mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_trig_03e.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
        Updated results
      9d4e4249
  6. 25 Oct, 2007 4 commits
  7. 24 Oct, 2007 1 commit
  8. 23 Oct, 2007 7 commits
    • unknown's avatar
      result fix · b987945d
      unknown authored
      b987945d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · e085211d
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/type_datetime.test:
        Auto merged
      mysql-test/t/type_decimal.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/type_datetime.result:
        after merge fix
      e085211d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · fa0e1d6b
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      fa0e1d6b
    • unknown's avatar
      after merge fix · 985e4a64
      unknown authored
      985e4a64
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 95a8bb20
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      client/client_priv.h:
        Auto merged
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/query_cache.result:
        manual merge
      mysql-test/include/mix1.inc:
        manual merge
      mysql-test/r/innodb_mysql.result:
        manual merge
      mysql-test/r/type_datetime.result:
        manual merge
      mysql-test/r/type_decimal.result:
        manual merge
      mysql-test/t/query_cache.test:
        manual merge
      mysql-test/t/type_datetime.test:
        manual merge
      mysql-test/t/type_decimal.test:
        manual merge
      sql/item.cc:
        manual merge
      95a8bb20
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 8479eb1d
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      myisam/sort.c:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/type_datetime.result:
        manual merge
      mysql-test/r/type_decimal.result:
        manual merge
      mysql-test/t/type_datetime.test:
        manual merge
      mysql-test/t/type_decimal.test:
        manual merge
      sql/item.cc:
        manual merge
      8479eb1d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 6e8919b0
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      6e8919b0