1. 16 Mar, 2005 2 commits
    • unknown's avatar
      WL #2094 Federated Storage Engine · 24dc8331
      unknown authored
      Changes to a test with a update to a table with 1001 columns, the last being a blob. 
      On HP, the test worked properly, but on other OSs, there's a problem with using the 
      blob column in an update where clause. The field method val_string(String *, char *) 
      should work, but doesn't seem to deal with blobd, and for some reason, cannot get
      the correct value of the blob column from the byte pointer in update_row, "*old_data"
      which is a byte pointer to the row in mysql format, that will be replaced with 
      "*new_data" (which conveniently has a field pointer to use to get values from).
      
      Will document this.
      
      
      mysql-test/r/federated.result:
        New test results. These results have been tested on production and hpita2 successfully.
      mysql-test/t/federated.test:
        Changed blob column in this test due to some issues with HPUX handling it correctly
        and other OSs not. Will document this (blobs in update where clause)
      24dc8331
    • unknown's avatar
      WL #2094 Federated Storage Handler. · 977784d8
      unknown authored
      Edits to ha_federated.cc per Monty, cleanup
      
      
      sql/ha_federated.cc:
        - changed all debug prints to 'info' from method name per Monty
        - cleanup
      977784d8
  2. 15 Mar, 2005 38 commits
    • unknown's avatar
      Many files: · 7955fe52
      unknown authored
        InnoDB true VARCHAR
      
      
      sql/ha_innodb.h:
        InnoDB true VARCHAR
      sql/ha_innodb.cc:
        InnoDB true VARCHAR
      innobase/include/data0type.h:
        InnoDB true VARCHAR
      innobase/include/que0que.h:
        InnoDB true VARCHAR
      innobase/include/row0mysql.h:
        InnoDB true VARCHAR
      innobase/include/data0type.ic:
        InnoDB true VARCHAR
      innobase/include/row0mysql.ic:
        InnoDB true VARCHAR
      innobase/row/row0ins.c:
        InnoDB true VARCHAR
      innobase/row/row0mysql.c:
        InnoDB true VARCHAR
      innobase/row/row0sel.c:
        InnoDB true VARCHAR
      innobase/trx/trx0trx.c:
        InnoDB true VARCHAR
      7955fe52
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4db638f3
      unknown authored
      into mdk10.(none):/home/reggie/bk/mysql-5.0
      
      
      4db638f3
    • unknown's avatar
      Merge mdk10.(none):/home/reggie/bk/mysql-4.1 · 799e4522
      unknown authored
      into mdk10.(none):/home/reggie/bk/mysql-5.0
      
      
      sql/sql_show.cc:
        Auto merged
      799e4522
    • unknown's avatar
      Bug #6660 mysqldump creates bad pathnames on Windows · 32e027ea
      unknown authored
      sql_show.cc:
        changed strdup to thd->memdup per Serg's advice
      
      
      sql/sql_show.cc:
        changed strdup to thd->memdup per Serg's advice
      32e027ea
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4421c4a5
      unknown authored
      into mysql.com:/home/cps/mysql/devel/im-fix-review
      
      
      4421c4a5
    • unknown's avatar
      IM setup patch. Enable IM instead of mysqld_safe in start/stop script. · 21c83834
      unknown authored
      Alter RPM to include mysqlmanger binary and config files.
      
      
      support-files/mysql.server.sh:
        mysql start/stop script altered to use mysqlmanager instead of mysqld_safe, novel 'reload' option
        was temporarily removed
      support-files/mysql.spec.sh:
        correct RPM to include mysqlmanager
      21c83834
    • unknown's avatar
      mysql-test-run.sh: · 6272f6f2
      unknown authored
        Added feature to disable tests from a list in a file "disabled.def"
        Moved down the code that disables, so that --do-test and --start-from
        don't list the disabled tests not in range.
      disabled.def:
        List of test cases to temporarely disable
      
      
      mysql-test/t/disabled.def:
        List of test cases to temporarely disable
      mysql-test/mysql-test-run.sh:
        Added feature to disable tests from a list in a file "disabled.def"
        Moved down the code that disables, so that --do-test and --start-from
        don't list the disabled tests not in range.
      6272f6f2
    • unknown's avatar
    • unknown's avatar
      Merge mdk10.(none):/home/reggie/bk/mysql-4.1 · 4a49d3f3
      unknown authored
      into mdk10.(none):/home/reggie/bk/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      client/mysqldump.c:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      4a49d3f3
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · 822a46d5
      unknown authored
      into mdk10.(none):/home/reggie/bk/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      822a46d5
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · b2cabf32
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      b2cabf32
    • unknown's avatar
      Bug #6660 mysqldump creates bad pathnames on Windows · ccfd1746
      unknown authored
      This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem.  With this patch, data directory and index directory will use only forward slashes (/) when on Windows.
      
      mysqldump.c:
        Removed fixPaths routine.  Was improper fix for bug #6660
      sql_show.cc:
        Changed append_directory to convert backslashes to foward slashes when on Windows.
      
      
      sql/sql_show.cc:
        Changed append_directory to convert backslashes to foward slashes when on Windows.
      client/mysqldump.c:
        Removed fixPaths routine.  Was improper fix for bug #6660
      ccfd1746
    • unknown's avatar
      include/my_global.h · b975a872
      unknown authored
          define _XOPEN_SOURCE=500 for solaris
      include/my_sys.h
          remove a cast
      
      
      include/my_global.h:
        define _XOPEN_SOURCE=500 for solaris
      include/my_sys.h:
        remove a cast
      b975a872
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 268a3ecc
      unknown authored
      into mysql.com:/usr/home/ram/work/5.0
      
      
      268a3ecc
    • unknown's avatar
      after merge fix · 7e743721
      unknown authored
      7e743721
    • unknown's avatar
      merging · 3c42daa9
      unknown authored
      
      heap/hp_create.c:
        Auto merged
      sql/filesort.cc:
        Auto merged
      mysql-test/r/heap.result:
        manual merging
      mysql-test/t/heap.test:
        manual merging
      sql/ha_heap.cc:
        manual merging
      3c42daa9
    • unknown's avatar
      Merged WL#2269 to mysql-5.0 · ef2ca978
      unknown authored
      
      sql/ha_ndbcluster.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        Manual merge
      ef2ca978
    • unknown's avatar
      WL#2269 Enable query cache for NDB part 2 · aa5dba42
      unknown authored
      -This is mostly fixes for correct behaviour when using query cache + transactions + the thread that
      fetches commit count from NDB at regular intervals. The major fix is to add a
      list in thd_ndb, that keeps a list of NDB_SHARE's that were modified by
      transaction and then "clearing" them in ndbcluster_commit.
      
      
      mysql-test/r/ndb_cache2.result:
        Updated test cases for the ndb_util thread, more simultaneous tables and more tesst
      mysql-test/t/ndb_cache2.test:
        Updated test cases for the ndb_util thread, more simultaneous tables and more advanced tesst
      sql/ha_ndbcluster.cc:
        Add table changed during transaction to list of changed tables in Thd_ndb, this list is then used in ndbcluster_commit to invalidate the cached commit_count in share
        Fix so that ndb_util_thread uses milliseconds "sleeps"
        Changed so that ndb_commit_count uses the commit_count from share if available
      sql/ha_ndbcluster.h:
        Add commit_count_lock to NBD_SHARE, use for detecting simultaneous attempts to update commit_count
        Add list of tables changed by transaction to Thd_ndb
        Change check_ndb_connection to take thd as argument, use current_thd as default
        Added m_rows_changed variable to keep track of if this handler has modified any records within the transaction
      sql/set_var.cc:
        Change format of code
        Sort sys__ variables in aplha order
      aa5dba42
    • unknown's avatar
      Cleanup · 9af776c8
      unknown authored
      9af776c8
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · e656fba7
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-4.1
      
      
      e656fba7
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · be26b499
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      be26b499
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6c82fa80
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-5.0
      
      
      6c82fa80
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 33e3c6dc
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      33e3c6dc
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 0d0c6ba6
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      0d0c6ba6
    • unknown's avatar
      A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end). · 0ba3164e
      unknown authored
      
      sql/filesort.cc:
        A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end).              
        Should call ha_rnd_end() only if ha_rnd_init() was called.
      0ba3164e
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1-build · 7031cea4
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      support-files/mysql.server.sh:
        Auto merged
      7031cea4
    • unknown's avatar
      - Build fix for Do-solaris-pkg: fixed package name matching regex to be satisfied with · 8418e31f
      unknown authored
        "mysql-pro-gpl-cert" packages as well (thanks to Kent for the suggestion)
      
      
      Build-tools/Do-solaris-pkg:
        - fixed package name matching regex to be satisfied with "mysql-pro-gpl-cert" packages as well
          (thanks to Kent for the suggestion)
      8418e31f
    • unknown's avatar
      Applied some changes to the mysql.server init script that are already shipped... · 39005884
      unknown authored
      Applied some changes to the mysql.server init script that are already shipped as an additional patch
      in the 4.1.10a RPMs for SLES9/RHEL3:
      
      - small improvement: use LSB functions to display startup success and failure, if available.
        Fall back to more primitive builtin functions otherwise.
      - joined two pieces of code performing the same functionality into one "wait_for_pid" function
      - added a "reload" function (LSB requirement)
      
      
      support-files/mysql.server.sh:
        - small improvement: use LSB functions to display startup success and failure, if available.
          Fall back to builtin functions otherwise.
        - joined two pieces of code performing the same functionality into one "wait_for_pid" function
        - added a "reload" function (LSB requirement)
      39005884
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 409b294b
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my50
      
      
      409b294b
    • unknown's avatar
      ndb - valgrind/compile fix Transporter.cpp: missing return · 487d8670
      unknown authored
      
      ndb/src/common/transporter/Transporter.cpp:
        missing return
      487d8670
    • unknown's avatar
      Avoid compilation error: On IRIX, identifiers with loop scope still need to be unique · b0b08e6c
      unknown authored
      at function level.
      
      
      ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        Avoid compilation error: On IRIX, variables declared within a loop control statement
        seem to have function scope. Either use different identifiers, or declare them
        at function level.
      b0b08e6c
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 23d48b7d
      unknown authored
      into mysql.com:/usr/home/ram/work/4.1.b8799
      
      
      23d48b7d
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 18bc8734
      unknown authored
      into mysql.com:/M50/mysql-5.0
      
      
      18bc8734
    • unknown's avatar
      dict0load.c: · 7d638314
      unknown authored
        dict_load_table(): Remove unused label that was accidentally introduced
        in a 4.0->4.1->5.0 merge.
      
      
      innobase/dict/dict0load.c:
        dict_load_table(): Remove unused label that was accidentally introduced
        in a 4.0->4.1->5.0 merge.
      7d638314
    • unknown's avatar
      A fix (bug #8489: Strange auto_increment behaviour with HEAP table). · 9c04a77e
      unknown authored
      
      heap/hp_create.c:
        A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
        Handle autoincrement keys MyISAM-way.
      include/heap.h:
        A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
        Handle autoincrement keys MyISAM-way.
      sql/ha_heap.cc:
        A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
        Handle autoincrement keys MyISAM-way.
      9c04a77e
    • unknown's avatar
      After merge fixes · 50a6be7d
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      innobase/buf/buf0flu.c:
        Manual merge
      innobase/dict/dict0load.c:
        Manual merge: do not refuse to open ROW_FORMAT=COMPACT tables
      50a6be7d
    • unknown's avatar
      Merge hundin.mysql.fi:/home/marko/k/mysql-4.0 · bcabdc22
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-4.1
      
      
      innobase/dict/dict0load.c:
        SCCS merged
      bcabdc22
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 01df5a15
      unknown authored
      into krsna.:/home/patg/test/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      01df5a15