1. 05 Dec, 2004 1 commit
    • unknown's avatar
      Fix test results · 289d3b2e
      unknown authored
      
      mysql-test/r/index_merge_ror_cpk.result:
        Portability fix
      mysql-test/r/innodb.result:
        Update results
      mysql-test/t/index_merge_ror_cpk.test:
        Portability fix
      289d3b2e
  2. 04 Dec, 2004 2 commits
    • unknown's avatar
      Fixing problem with case insitive file systems. · 623c7338
      unknown authored
      Would you believe that I wrote all of this on a Mac? I just happen to be not using HFS for the partition I did this work on. Oops :)
      
      
      config/ac-macros/alloca.m4:
        mvdir
      config/ac-macros/character_sets.m4:
        mvdir
      config/ac-macros/check_cpu.m4:
        mvdir
      config/ac-macros/compiler_flag.m4:
        mvdir
      config/ac-macros/ha_archive.m4:
        mvdir
      config/ac-macros/ha_berkeley.m4:
        mvdir
      config/ac-macros/ha_example.m4:
        mvdir
      config/ac-macros/ha_innodb.m4:
        mvdir
      config/ac-macros/ha_isam.m4:
        mvdir
      config/ac-macros/ha_ndbcluster.m4:
        mvdir
      config/ac-macros/ha_tina.m4:
        mvdir
      config/ac-macros/large_file.m4:
        mvdir
      config/ac-macros/misc.m4:
        mvdir
      config/ac-macros/mysqlfs.m4:
        mvdir
      config/ac-macros/openssl.m4:
        mvdir
      config/ac-macros/readline.m4:
        mvdir
      config/ac-macros/sanity.m4:
        mvdir
      config/ac-macros/zlib.m4:
        mvdir
      configure.in:
        Fix silly little problem with case insensitive filesystems.
        
        Funny thing is that I wrote all this on a Mac, but I don't use HFS on that partition so I never noticed that it would be an issue.
        
        Oops :)
      623c7338
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0/ · 107ef617
      unknown authored
      into avenger.(none):/export/brian/mysql/acinclude-5.0
      
      
      107ef617
  3. 03 Dec, 2004 5 commits
    • unknown's avatar
      InnoDB: Fix ctype_utf8 test failure caused by the new record format. · f09c8b35
      unknown authored
      
      innobase/btr/btr0btr.c:
        Cache the value of dtype_get_fixed_size(type) in order to avoid
        repeated calls to an external function innobase_is_mb_cset()
      innobase/include/data0type.ic:
        Declare innobase_is_mb_cset().
        dtype_get_fixed_size(): Invoke innobase_is_mb_cset() for DATA_MYSQL.
      innobase/row/row0ins.c:
        Cache the value of dtype_get_fixed_size(type) in order to avoid
        repeated calls to an external function innobase_is_mb_cset()
      innobase/row/row0sel.c:
        row_search_for_mysql(): Added a missing rec_reget_offsets() call
        that caused an InnoDB debug assertion failure in ctype_utf8 test.
      sql/ha_innodb.cc:
        Define innobase_is_mb_cset().
      f09c8b35
    • unknown's avatar
      strings/decimal.c · 6865b71c
      unknown authored
          decimal_round(d, -N) bug fixed
      
      
      strings/decimal.c:
        decimal_round(d, -N) bug fixed
      6865b71c
    • unknown's avatar
      strings/decimal.c · 89c6cd73
      unknown authored
          fixed broken d2ll
          added checks for correct test results
      
      
      strings/decimal.c:
        fixed broken d2ll
        added checks for correct test results
      89c6cd73
    • unknown's avatar
      Resolving conflict. · ae9992ec
      unknown authored
      
      configure.in:
        Resolving conflict
      ae9992ec
    • unknown's avatar
      Syntax fix, plus an update for version. · 4fb9a5fb
      unknown authored
      
      build/ac-macros/check_cpu.m4:
        Syntax fix
      configure.in:
        Updated for version.
      4fb9a5fb
  4. 02 Dec, 2004 9 commits
    • unknown's avatar
      more decimail bugs fixed · f88e0d9c
      unknown authored
      f88e0d9c
    • unknown's avatar
      syntax error fixed · bdc4fa6e
      unknown authored
      bdc4fa6e
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2d3e0ac7
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0-clean
      
      
      2d3e0ac7
    • unknown's avatar
      Making FLUSH TABLES WITH READ LOCK killable while it's waiting for running... · 75fa4c00
      unknown authored
      Making FLUSH TABLES WITH READ LOCK killable while it's waiting for running commits to finish. Normally this step is not long but it's still nice to be killable
      (especially in case of bug like BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever").
      
      
      sql/lock.cc:
        making FLUSH TABLES WITH READ LOCK killable while it's waiting for running commits to finish
      sql/mysql_priv.h:
        prototype change
      sql/sql_parse.cc:
        now it's possible that make_global_read_lock_block_commit fails (killed)
      75fa4c00
    • unknown's avatar
      Undoing change for the moment. · 03af7092
      unknown authored
      
      BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
        Delete: acinclude.m4
      config.guess:
        Rename: build/config.guess -> config.guess
      config.sub:
        Rename: build/config.sub -> config.sub
      depcomp:
        Rename: build/depcomp -> depcomp
      install-sh:
        Rename: build/install-sh -> install-sh
      ltmain.sh:
        Rename: build/ltmain.sh -> ltmain.sh
      missing:
        Rename: build/missing -> missing
      03af7092
    • unknown's avatar
      Many files: · d2c4b545
      unknown authored
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      
      
      innobase/btr/btr0btr.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/btr/btr0cur.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/btr/btr0pcur.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/btr/btr0sea.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/data/data0data.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/data/data0type.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/dict/dict0boot.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/dict/dict0crea.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/dict/dict0dict.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/dict/dict0load.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/dict/dict0mem.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/fil/fil0fil.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/fsp/fsp0fsp.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/ibuf/ibuf0ibuf.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/btr0btr.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/btr0btr.ic:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/btr0cur.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/btr0cur.ic:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/btr0pcur.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/btr0sea.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/data0type.ic:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/dict0dict.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/dict0dict.ic:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/dict0mem.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/lock0lock.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/lock0lock.ic:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/mtr0log.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/mtr0mtr.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/page0cur.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/page0cur.ic:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/page0page.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/page0page.ic:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/rem0cmp.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/rem0cmp.ic:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/rem0rec.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/rem0rec.ic:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/row0row.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/row0row.ic:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/row0upd.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/row0upd.ic:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/row0vers.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/row0vers.ic:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/srv0srv.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/trx0rec.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/ut0byte.h:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/include/ut0byte.ic:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/lock/lock0lock.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/log/log0recv.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/mtr/mtr0log.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/page/page0cur.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/page/page0page.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/pars/pars0pars.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/rem/rem0cmp.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/rem/rem0rec.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/row/row0ins.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/row/row0mysql.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/row/row0purge.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/row/row0row.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/row/row0sel.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/row/row0umod.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/row/row0undo.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/row/row0upd.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/row/row0vers.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/srv/srv0srv.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/trx/trx0rec.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      innobase/trx/trx0undo.c:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      sql/ha_innodb.cc:
        Implement more compact InnoDB record format.
        Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
      d2c4b545
    • unknown's avatar
      trx0xa.h: · 4a9ef43a
      unknown authored
        Remove compiler errors from Jan's XA header by commenting the __P macros out
      
      
      innobase/include/trx0xa.h:
        Remove compiler errors from Jan's XA header by commenting the __P macros out
      4a9ef43a
    • unknown's avatar
      configure.in: · d967118f
      unknown authored
        Incremented for next version
      
      
      configure.in:
        Incremented for next version
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      d967118f
    • unknown's avatar
      First revision of changes to clean up acinclude and configure.in. Removed all... · 4b2cac56
      unknown authored
      First revision of changes to clean up acinclude and configure.in. Removed all AC_DEFUN out to separate m4 files, removed rule concerning building the website, and updated SANITY rule with the latest from 1.8.
      
      
      configure.in:
        Removed all defines, and added include files.
      4b2cac56
  5. 01 Dec, 2004 9 commits
    • unknown's avatar
      ps_7ndb.result: · 14bc43bd
      unknown authored
        fixed ps_7ndb test
      
      
      mysql-test/r/ps_7ndb.result:
        fixed ps_7ndb test
      14bc43bd
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5a13ed41
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      5a13ed41
    • unknown's avatar
      Remove unnecessary copyright header from trx0xa.h · 2a6a1cba
      unknown authored
      
      innobase/include/trx0xa.h:
        Remove unnecessary copyright header from trx0xa.h.
      2a6a1cba
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · e32f7a94
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      e32f7a94
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 10a80328
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Auto merged
      10a80328
    • unknown's avatar
      testcase for bug#6871, ndb, replace with collations · e4dbc32f
      unknown authored
      
      mysql-test/r/ndb_charset.result:
        testcase for bug#6871
      mysql-test/t/ndb_charset.test:
        testcase for bug#6871
      e4dbc32f
    • unknown's avatar
      bug#6871 - ndb · 62e7f1ca
      unknown authored
        replace with charsets
        check update of primary key wo/ normalizing
        
      
      
      ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Make sure tXfrmFlag is false when checking for update of primary key
      62e7f1ca
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 80d5488f
      unknown authored
      into hundin.mysql.fi:/home/jan/mysql-5.0
      
      
      sql/ha_innodb.cc:
        Auto merged
      80d5488f
    • unknown's avatar
      This is a code cleanup patch for X/Open XA. · 843f38fc
      unknown authored
      
      BitKeeper/deleted/.del-xa.h~4021d7e61ff515b:
        Delete: innobase/include/xa.h
      innobase/include/trx0trx.h:
        Change xa.h to trx0ha.h.
      innobase/include/trx0undo.h:
        Split TRX_UNDO_DICT_OPERATION field to two fiels: first contains
        TRX_UNDO_XID_EXISTS flag which is TRUE if log header contains
        X/Open XA XID and the second one contains TRX_UNDO_DICT_TRANS
        flag which is TRUE if the transaction is dictionary transaction.
      innobase/trx/trx0trx.c:
        Remove unnecessary and erroneus code from prepare. Add some 
        informative printouts of prepared transactions.
      innobase/trx/trx0undo.c:
        Split TRX_UNDO_DICT_OPERATION field to two fields: the first field
        is TRX_UNDO_XID_EXISTS flag which is true if the log header contains
        X/Open XA XID and the second field is TRX_UNDO_DICT_TRANS flag
        which is true if the transaction was a dictionary transaction.
      sql/ha_innodb.cc:
        Code cleanup.
      843f38fc
  6. 30 Nov, 2004 14 commits
    • unknown's avatar
      strict.result: · 6dd87671
      unknown authored
        Add warning line to result so that test passes
      
      
      mysql-test/r/strict.result:
        Add warning line to result so that test passes
      6dd87671
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1e1654fe
      unknown authored
      into avenger.(none):/export/brian/mysql/merge/5.0
      
      
      innobase/include/row0mysql.h:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      1e1654fe
    • unknown's avatar
      Merge avenger.(none):/export/brian/mysql/merge/4.1 · b5622875
      unknown authored
      into avenger.(none):/export/brian/mysql/merge/5.0
      
      
      sql/mysqld.cc:
        Auto merged
      b5622875
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 4579806f
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      4579806f
    • unknown's avatar
      fixed so that warning on missing support for engine only printed once even if... · ac207293
      unknown authored
      fixed so that warning on missing support for engine only printed once even if option given multiple times
      
      
      
      ac207293
    • unknown's avatar
      typo fixed · 928d2a8b
      unknown authored
      928d2a8b
    • unknown's avatar
      Merge for Matt for Innodb bug. · 9ada34b3
      unknown authored
      
      client/mysqldump.c:
        Auto merged
      innobase/include/row0mysql.h:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/row/row0mysql.c:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/r/ndb_index_unique.result:
        Auto merged
      mysql-test/r/rpl_start_stop_slave.result:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/ndb_grant.later:
        Auto merged
      mysql-test/t/ndb_index_unique.test:
        Auto merged
      ndb/include/ndbapi/NdbScanOperation.hpp:
        Auto merged
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      ndb/test/ndbapi/testScanPerf.cpp:
        Auto merged
      netware/comp_err.def:
        Auto merged
      netware/isamchk.def:
        Auto merged
      netware/isamlog.def:
        Auto merged
      netware/libmysql.def:
        Auto merged
      netware/my_print_defaults.def:
        Auto merged
      netware/myisam_ftdump.def:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_install.def:
        Auto merged
      netware/mysql_install_db.def:
        Auto merged
      netware/mysql_test_run.def:
        Auto merged
      netware/mysql_waitpid.def:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld.def:
        Auto merged
      netware/mysqld_safe.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/mysqlshow.def:
        Auto merged
      netware/mysqltest.def:
        Auto merged
      netware/pack_isam.def:
        Auto merged
      netware/perror.def:
        Auto merged
      netware/replace.def:
        Auto merged
      netware/resolve_stack_dump.def:
        Auto merged
      netware/resolveip.def:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      client/mysqladmin.cc:
        Merge for Netware changes. Indention fixes.
      sql/field.cc:
        Merge fixes, warnings added from 4.1 to 5.0
      sql/mysqld.cc:
        Merge fixes, just indention fixes.
      9ada34b3
    • unknown's avatar
      row0mysql.h, ha_innodb.cc: · f299ff85
      unknown authored
        Sergey Petrunia's ROR code fails to tell handlers that they should retrieve the primary key columns; let InnoDB ALWAYS retrieve them, to fix many bugs and potential bugs
      
      
      sql/ha_innodb.cc:
        Sergey Petrunia's ROR code fails to tell handlers that they should retrieve the primary key columns; let InnoDB ALWAYS retrieve them, to fix many bugs and potential bugs
      innobase/include/row0mysql.h:
        Sergey Petrunia's ROR code fails to tell handlers that they should retrieve the primary key columns; let InnoDB ALWAYS retrieve them, to fix many bugs and potential bugs
      f299ff85
    • unknown's avatar
      fixed error in test result · be733ad1
      unknown authored
          added extra calls to retrieve connectstring used
          reengineered connect somewhat to make retries etc explicit
      
      
      mysql-test/r/ndb_index_unique.result:
        fixed error in test result
      ndb/include/mgmapi/mgmapi.h:
        added extra calls to retrieve connectstring used
      ndb/include/mgmcommon/ConfigRetriever.hpp:
        added extra calls to retrieve connectstring used
      ndb/include/ndbapi/ndb_cluster_connection.hpp:
        added extra calls to retrieve connectstring used
        reengineered connect somewhat to make retries etc explicit
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        added extra calls to retrieve connectstring used
      ndb/src/mgmapi/mgmapi.cpp:
        added extra calls to retrieve connectstring used
      ndb/src/mgmclient/CommandInterpreter.cpp:
        moved parse of quit to avoid connect before
      ndb/src/ndbapi/Ndbinit.cpp:
        reengineered connect somewhat to make retries etc explicit
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        added extra calls to retrieve connectstring used
        reengineered connect somewhat to make retries etc explicit
      ndb/tools/listTables.cpp:
        reengineered connect somewhat to make retries etc explicit
      sql/ha_ndbcluster.cc:
        added extra calls to retrieve connectstring used
        reengineered connect somewhat to make retries etc explicit
      be733ad1
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 99e69f26
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      
      innobase/lock/lock0lock.c:
        Auto merged
      99e69f26
    • unknown's avatar
      lock0lock.c: · 93d5f62e
      unknown authored
        If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this
      
      
      innobase/lock/lock0lock.c:
        If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this
      93d5f62e
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 892cec85
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      
      892cec85
    • unknown's avatar
      row0sel.c: · 668d61b9
      unknown authored
        Remove compiler warning as I had forgotten an include file
      
      
      innobase/row/row0sel.c:
        Remove compiler warning as I had forgotten an include file
      668d61b9
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 795045d9
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.1
      
      
      795045d9