1. 16 Mar, 2005 1 commit
    • unknown's avatar
      WL #2094 Federated Storage Handler. · 3258485e
      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
      3258485e
  2. 15 Mar, 2005 39 commits
    • unknown's avatar
      Many files: · 4939e9a6
      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
      4939e9a6
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 · 785f2bd5
      unknown authored
      into mdk10.(none):/home/reggie/bk/mysql-5.0
      
      785f2bd5
    • unknown's avatar
      Merge mdk10.(none):/home/reggie/bk/mysql-4.1 · c650c82a
      unknown authored
      into mdk10.(none):/home/reggie/bk/mysql-5.0
      
      
      sql/sql_show.cc:
        Auto merged
      c650c82a
    • unknown's avatar
      Bug #6660 mysqldump creates bad pathnames on Windows · 2a51460f
      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
      2a51460f
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5c78473a
      unknown authored
      into mysql.com:/home/cps/mysql/devel/im-fix-review
      
      5c78473a
    • unknown's avatar
      IM setup patch. Enable IM instead of mysqld_safe in start/stop script. · acdf2e50
      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
      acdf2e50
    • unknown's avatar
      mysql-test-run.sh: · 78d0af01
      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.
      78d0af01
    • unknown's avatar
    • unknown's avatar
      Merge mdk10.(none):/home/reggie/bk/mysql-4.1 · 21a5728a
      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
      21a5728a
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · 72e60a3b
      unknown authored
      into mdk10.(none):/home/reggie/bk/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      72e60a3b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · b908a219
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      b908a219
    • unknown's avatar
      Bug #6660 mysqldump creates bad pathnames on Windows · c209d112
      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
      c209d112
    • unknown's avatar
      include/my_global.h · c286b086
      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
      c286b086
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9f59bc80
      unknown authored
      into mysql.com:/usr/home/ram/work/5.0
      
      9f59bc80
    • unknown's avatar
      after merge fix · bfbebe16
      unknown authored
      bfbebe16
    • unknown's avatar
      merging · f88e388e
      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
      f88e388e
    • unknown's avatar
      Merged WL#2269 to mysql-5.0 · 2e3e05d0
      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
      2e3e05d0
    • unknown's avatar
      WL#2269 Enable query cache for NDB part 2 · 5329b3a6
      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
      5329b3a6
    • unknown's avatar
      Cleanup · a22df022
      unknown authored
      a22df022
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 67a9d9e7
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-4.1
      
      67a9d9e7
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7ab43133
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      7ab43133
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · bc62be2f
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-5.0
      
      bc62be2f
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · b3be7446
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      b3be7446
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 2741aa55
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      2741aa55
    • unknown's avatar
      A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end). · bcea7d60
      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.
      bcea7d60
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1-build · 63d0267e
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      support-files/mysql.server.sh:
        Auto merged
      63d0267e
    • unknown's avatar
      - Build fix for Do-solaris-pkg: fixed package name matching regex to be satisfied with · c469d57b
      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)
      c469d57b
    • unknown's avatar
      Applied some changes to the mysql.server init script that are already shipped... · ede1da2a
      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)
      ede1da2a
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · f724a489
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my50
      
      f724a489
    • unknown's avatar
      ndb - valgrind/compile fix Transporter.cpp: missing return · 8486e5f5
      unknown authored
      
      ndb/src/common/transporter/Transporter.cpp:
        missing return
      8486e5f5
    • unknown's avatar
      Avoid compilation error: On IRIX, identifiers with loop scope still need to be unique · bccd1dd3
      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.
      bccd1dd3
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4bf10eac
      unknown authored
      into mysql.com:/usr/home/ram/work/4.1.b8799
      
      4bf10eac
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 23d41a4c
      unknown authored
      into mysql.com:/M50/mysql-5.0
      
      23d41a4c
    • unknown's avatar
      dict0load.c: · 45ab7747
      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.
      45ab7747
    • unknown's avatar
      A fix (bug #8489: Strange auto_increment behaviour with HEAP table). · 185b10e1
      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.
      185b10e1
    • unknown's avatar
      After merge fixes · 60032843
      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
      60032843
    • unknown's avatar
      Merge hundin.mysql.fi:/home/marko/k/mysql-4.0 · 3915c964
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-4.1
      
      
      innobase/dict/dict0load.c:
        SCCS merged
      3915c964
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8d435091
      unknown authored
      into krsna.:/home/patg/test/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      8d435091
    • unknown's avatar
      This changeset contains changes approved in code review by · b45de257
      unknown authored
      Konstja and Georg, change sets 1.1806, 1.1805. These changes has been successfully 
      tested on both my own workstation (Suse 9.0) and production.mysql.com.
      
      
      mysql-test/r/federated.result:
        new test results for error handling tests.
      mysql-test/t/federated.test:
        new error handling tests
      sql/ha_federated.cc:
        - check_foreign_data source added
        - table names now enclosed in '`' to allow for '%' or other characters
        - better error handling
        - mysql_init now checked to see if it returns true/false, error out if false (Georg)
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      b45de257