1. 21 Jan, 2007 1 commit
    • unknown's avatar
      1) New dirty state for files (need this for longterm fast recovery) · ea7584d2
      unknown authored
      2) We now store shortest and longest row information.
      3) archive_reader can now check and backup files (even if they are hot)
      4) We now record longest and shortest row information for stats. 
      
      
      storage/archive/archive_reader.c:
        Added options for:
        1) Online backup for tables
        2) Check table option.
      storage/archive/archive_test.c:
        Additional test, format is now the same as an actual table.
      storage/archive/azio.c:
        Fixed issue closing files multiple times.
        Added option for recording longest and shortest rows. 
        Additional "dirty" state added.
      storage/archive/azlib.h:
        Added additional space for longest and shortest row information.
      storage/archive/ha_archive.cc:
        Cleaned up warming and removed unneeded close.
      ea7584d2
  2. 14 Jan, 2007 4 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 3cd46e74
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      3cd46e74
    • unknown's avatar
      Updates to archive_reader. · 4c03b303
      unknown authored
      
      storage/archive/archive_reader.c:
        Skeleton for future work.
      storage/archive/ha_archive.cc:
        Set unpack for Windows
      4c03b303
    • unknown's avatar
      More windows warnings cleanup · c1e90929
      unknown authored
      
      storage/archive/ha_archive.cc:
        More windows warnings clean up.
      storage/archive/ha_archive.h:
        Change in prototype to clear windows warning.
      c1e90929
    • unknown's avatar
      REAL_PATH was rewritten for DATA DIRECTORY (doesn't get calculated for each... · 88fb9737
      unknown authored
      REAL_PATH was rewritten for DATA DIRECTORY (doesn't get calculated for each table open, and won't be calculted more then once now).
      Windows warnings cleanup.
      
      I am still get a weird warning about file descriptors closed multiple times.
      
      
      storage/archive/ha_archive.cc:
        Cleanup from Windows warnings.
        REAL_PATH has been rewritten.
      storage/archive/ha_archive.h:
        real_path holds the full path of the non-symlinked version
      88fb9737
  3. 13 Jan, 2007 2 commits
  4. 12 Jan, 2007 9 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · ff928c40
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/t/csv.test:
        Auto merged
      server-tools/instance-manager/guardian.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      ff928c40
    • unknown's avatar
      Fixed windows build break · 4b6b274c
      unknown authored
      
      sql/CMakeLists.txt:
        Fixed windows build break, file item_uniq.cc has been removed.
      4b6b274c
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 8e9c245a
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-22687
      
      
      libmysqld/Makefile.am:
        Auto merged
      sql/Makefile.am:
        Auto merged
      BitKeeper/deleted/.del-item_uniq.cc:
        Auto merged
      BitKeeper/deleted/.del-item_uniq.h:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      8e9c245a
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · df17609c
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      sql/mysqld.cc:
        Auto merged
      df17609c
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 39d39734
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/t/order_by.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      mysql-test/r/join.result:
        manual merge
      mysql-test/t/join.test:
        manual merge
      39d39734
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 32d6754e
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      sql/mysqld.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      32d6754e
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 7ecd5479
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0
      
      7ecd5479
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · af9f9778
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      sql/mysqld.cc:
        Auto merged
      af9f9778
    • unknown's avatar
      Function mysql_rm_tmp_tables(): · 91cfbda7
      unknown authored
      fixed valgrind error
      fixed indentation
      
      91cfbda7
  5. 11 Jan, 2007 17 commits
    • unknown's avatar
      Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 799f1aba
      unknown authored
      into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      mysql-test/install_test_db.sh:
        Auto merged
      BitKeeper/deleted/.del-CMakeLists.txt~3:
        Auto merged
      BitKeeper/deleted/.del-configure.js:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      799f1aba
    • unknown's avatar
      Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS) · 6bc93745
      unknown authored
      According to some internal communication, these two functions are place
      holders for future enhancements. Because they use a variable number of
      parameters, the implementation defined a reserved keyword for them in the
      parser grammar.
      
      Unfortunately, doing so creates a bug similar to Bug 21114 reported for the
      function FORMAT.
      
      In the 5.1 code base, due to improvements in the code implemented with bug
      21114, having a reserved keyword for functions with a variable number of
      arguments is not needed any more by the implementation.
      
      As a result, this fix removes the place-holder implementation, and removes
      the unnecessary reserved keywords. Should the functions UNIQUE_USERS and
      GROUP_UNIQUE_USERS be finally implemented in a later release, the
      implementation should sub class Create_native_func in sql/item_create.cc.
      For example, see the class Create_func_concat.
      
      
      BitKeeper/deleted/.del-item_uniq.cc:
        Rename: sql/item_uniq.cc -> BitKeeper/deleted/.del-item_uniq.cc
      BitKeeper/deleted/.del-item_uniq.h:
        Rename: sql/item_uniq.h -> BitKeeper/deleted/.del-item_uniq.h
      libmysqld/Makefile.am:
        Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
      mysql-test/r/parser.result:
        Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
      mysql-test/t/parser.test:
        Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
      sql/Makefile.am:
        Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
      sql/item.h:
        Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
      sql/item_sum.h:
        Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
      sql/lex.h:
        Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
      sql/mysql_priv.h:
        Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
      sql/sql_yacc.yy:
        Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
      6bc93745
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build · ea72c946
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build
      
      
      BitKeeper/deleted/.del-CMakeLists.txt~3:
        Auto merged
      BitKeeper/deleted/.del-README~1:
        Auto merged
      BitKeeper/deleted/.del-configure.js:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      configure.in:
        Manual merge
      mysql-test/install_test_db.sh:
        Manual merge
      sql/mysqld.cc:
        Manual merge
      ea72c946
    • unknown's avatar
      Merge trift2.:/MySQL/M50/tmp-5.0 · 32a5f7d0
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      mysys/my_read.c:
        Auto merged
      BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
        Auto merged
      BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
        Null merge.
      BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
        Null merge.
      BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
        Null merge.
      BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
        Null merge.
      BitKeeper/deleted/.del-mysqlserver.dsp~d99cfb2d291e3785:
        Null merge.
      scripts/make_binary_distribution.sh:
        Null merge, this change is already suppressed in 4.1.
      support-files/MySQL-shared-compat.spec.sh:
        Null merge, this change is already suppressed in 4.1.
      32a5f7d0
    • unknown's avatar
      Merge trift2.:/MySQL/M50/tmp1-5.0 · 9dc14298
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      9dc14298
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 3d904a85
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/t/trigger.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      mysql-test/r/csv.result:
        Manual merge.
      mysql-test/t/csv.test:
        Manual merge.
      3d904a85
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 0eb0c6e8
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      0eb0c6e8
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 054be5a0
      unknown authored
      into  rakia.gmz:/home/kgeorge/mysql/autopush/B25106-5.0-opt
      
      
      sql/sql_base.cc:
        Auto merged
      054be5a0
    • unknown's avatar
      BUG#25106: A USING clause in combination with a VIEW results in column · ba013b9d
      unknown authored
                 aliases ignored
      When a column reference to a column in JOIN USING is resolved and a new 
      Item is created for this column the user defined name was lost.
      This fix preserves the alias by setting the name of the new Item to the
      original alias.
      
      
      mysql-test/r/join.result:
        BUG#25106: A USING clause in combination with a VIEW results in column
                   aliases ignored
         - test case
      mysql-test/t/join.test:
        BUG#25106: A USING clause in combination with a VIEW results in column
                   aliases ignored
         - test case
      sql/sql_base.cc:
        BUG#25106: A USING clause in combination with a VIEW results in column
                   aliases ignored
         - take the alias of the Item to be replaced and set it into the newly
           allocated Item.
      ba013b9d
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 19678b2f
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25183
      
      
      sql/set_var.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      19678b2f
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 77760784
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      77760784
    • unknown's avatar
      after merge fix · 110639c2
      unknown authored
      110639c2
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-opt · f4bad3ce
      unknown authored
      into  mysql.com:/d2/hf/mr10/my51-mr10
      
      
      mysql-test/t/csv.test:
        Auto merged
      f4bad3ce
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · a8e42cdb
      unknown authored
      into  mysql.com:/d2/hf/mr10/my50-mr10
      
      
      sql/mysqld.cc:
        Auto merged
      a8e42cdb
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · 05afd15f
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-format-5.1
      
      
      storage/archive/Makefile.am:
        Auto merged
      storage/archive/archive_test.c:
        Auto merged
      storage/archive/azio.c:
        Auto merged
      storage/archive/ha_archive.h:
        Auto merged
      storage/archive/ha_archive.cc:
        Merge
      05afd15f
    • unknown's avatar
      Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage · 64dcf6f3
      unknown authored
      into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
      
      
      configure.in:
        Auto merged
      mysql-test/install_test_db.sh:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/CMakeLists.txt:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      win/configure.js:
        Auto merged
      64dcf6f3
    • unknown's avatar
      New azio which keeps meta data in its own header. · 65673d3d
      unknown authored
      
      storage/archive/Makefile.am:
        Added archive reader
      storage/archive/archive_test.c:
        Extended archive test
      storage/archive/azio.c:
        Rewrite of azio to include support for more meta data in header
      storage/archive/azlib.h:
        Extended information.
      storage/archive/ha_archive.cc:
        Rewrite to handle new azio
      storage/archive/ha_archive.h:
        Rewrite to handle new azio.
      storage/archive/archive_reader.c:
        New BitKeeper file ``storage/archive/archive_reader.c''
      65673d3d
  6. 10 Jan, 2007 7 commits