1. 26 May, 2004 14 commits
    • unknown's avatar
      After merge fixes · 4375cf06
      unknown authored
      
      Docs/manual_toc.html:
        Rename: BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41 -> Docs/manual_toc.html
      libmysqld/lib_sql.cc:
        Fixed type of new variables
      libmysqld/libmysqld.c:
        Removed duplicate function (allready in libmysql.c)
      4375cf06
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 7ae8270c
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      7ae8270c
    • unknown's avatar
      merge with 4.0 to get windows fixes · a5717a95
      unknown authored
      
      VC++Files/client/mysqlclient.dsp:
        Auto merged
      VC++Files/innobase/innobase.dsp:
        Auto merged
      include/mysql.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      innobase/include/log0log.h:
        Auto merged
      innobase/include/log0log.ic:
        Auto merged
      innobase/include/mtr0mtr.h:
        Auto merged
      innobase/log/log0log.c:
        Auto merged
      innobase/log/log0recv.c:
        Auto merged
      innobase/que/que0que.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysql_r/Makefile.am:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      tools/mysqlmanager.c:
        Auto merged
      a5717a95
    • unknown's avatar
      logging_ok: · bdd1f207
      unknown authored
        Logging to logging@openlogging.org accepted
      compile-pentium-max:
        changed --with-ndbcluster to --without-ndbcluster because it fails on 4.1 builds
      
      
      BUILD/compile-pentium-max:
        changed --with-ndbcluster to --without-ndbcluster because it fails on 4.1 builds
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      bdd1f207
    • unknown's avatar
      VC++ portability fix · 00d5816b
      unknown authored
      
      VC++Files/client/mysqlclient.dsp:
        Added missing /D MYSQL_CLIENT
      VC++Files/innobase/innobase.dsp:
        Remove not existing file
      sql/mysqld.cc:
        Fixed comment
      00d5816b
    • unknown's avatar
      Fixed test to not crash when ndb is not in use · 1369e543
      unknown authored
      1369e543
    • unknown's avatar
      InnoDB fixup: remove debug assertion that causes compile error · ffd7db4c
      unknown authored
      when UNIV_DEBUG is defined (introduced in ChangeSet@1.1850)
      
      
      innobase/que/que0que.c:
        Remove ut_ad() reference to removed parameter next_thr
      ffd7db4c
    • unknown's avatar
      Fix to make Windows compilation smoother · 8fd378d6
      unknown authored
      
      VC++Files/innobase/innobase.dsp:
        non-existent file removed
      client/mysql.cc:
        local opt_max_allowed_packet and opt_net_buffer_length introduced
      client/mysqldump.c:
        local opt_max_allowed_packet and opt_net_buffer_length introduced
      include/mysql.h:
        mysql_get_parameters() interface added
        #define max_allowed_packet added
      include/mysql_com.h:
        these should not be exported
      libmysql/libmysql.c:
        mysql_get_parameters implementations
      libmysql/libmysql.def:
        interface changed
      libmysql_r/Makefile.am:
        MYSQL_CLIENT define added
      libmysqld/lib_sql.cc:
        line moved to be above the '#include "mysql.cc"'
      libmysqld/libmysqld.c:
        mysql_get_parameters implementation (embedded)
      libmysqld/libmysqld.def:
        interface changed
      sql/log_event.cc:
        should be like that in this case
      tools/mysqlmanager.c:
        compiler warns on this line
      8fd378d6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 78758d14
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      78758d14
    • unknown's avatar
      Changed prototype of killed_ptr() to make it more portable · abcd9171
      unknown authored
      Applied patches for Netware
      
      
      innobase/include/os0thread.h:
        Applied patches for Netware
      innobase/os/os0thread.c:
        Applied patches for Netware
      libmysql/libmysql.c:
        Applied patches for Netware
      libmysql/libmysql.def:
        Applied patches for Netware
      myisam/myisamchk.c:
        Applied patches for Netware
        Changed prototype of killed_ptr() to make it more portable
      myisam/myisamdef.h:
        Applied patches for Netware
        Changed prototype of killed_ptr() to make it more portable
      mysql-test/t/rpl_relayspace-slave.opt:
        Applied patches for Netware
      mysys/my_pthread.c:
        Applied patches for Netware
      mysys/my_static.h:
        Portability fix
      netware/BUILD/compile-linux-tools:
        Applied patches for Netware
        Changed prototype of killed_ptr() to make it more portable
      netware/BUILD/mwenv:
        Applied patches for Netware
        Changed prototype of killed_ptr() to make it more portable
      netware/BUILD/nwbootstrap:
        Applied patches for Netware
        Changed prototype of killed_ptr() to make it more portable
      netware/my_manage.c:
        Applied patches for Netware
        Changed prototype of killed_ptr() to make it more portable
      netware/mysql_fix_privilege_tables.pl:
        Applied patches for Netware
        Changed prototype of killed_ptr() to make it more portable
      netware/mysql_test_run.c:
        Applied patches for Netware
        Changed prototype of killed_ptr() to make it more portable
      netware/static_init_db.sql:
        Applied patches for Netware
        Changed prototype of killed_ptr() to make it more portable
      scripts/make_binary_distribution.sh:
        Applied patches for Netware
        Changed prototype of killed_ptr() to make it more portable
      sql/filesort.cc:
        Changed prototype of killed_ptr() to make it more portable
      sql/ha_myisam.cc:
        Changed prototype of killed_ptr() to make it more portable
      sql/mysqld.cc:
        Fixed some typos for Netware
      sql/sql_bitmap.h:
        Applied patches for Netware
      sql/sql_class.h:
        Changed prototype of killed_ptr() to make it more portable
      sql/sql_insert.cc:
        safety fix
      strings/my_strtoll10.c:
        Added comment
      abcd9171
    • unknown's avatar
      Small fix, addin order by to get predicatble output from select · b381b7c9
      unknown authored
      
      mysql-test/r/ndb_autodiscover.result:
        Added yet another order by to test.
      mysql-test/t/ndb_autodiscover.test:
        Added yet another order by to test.
      b381b7c9
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 · e4985ee1
      unknown authored
      into neptunus.(none):/home/magnus/mysql-4.1
      
      e4985ee1
    • unknown's avatar
      Fix after running on a 4-node system. · ff334243
      unknown authored
      
      mysql-test/r/ndb_autodiscover.result:
        Removed one test that needs manual interaction
        Added order by in some places
      mysql-test/t/ndb_autodiscover.test:
        Removed one test that needs manual interaction
        Added order by in some places
      sql/ha_ndbcluster.cc:
        Using HA_WRONG_ASCII_ORDER to activate filesort on a not "sorted" ordered index.
      ff334243
    • unknown's avatar
      InnoDB cleanup: Remove unused code for online backup · 64fee753
      unknown authored
      
      innobase/include/log0log.h:
        Remove references to online backup
      innobase/include/log0log.ic:
        Remove references to online backup
      innobase/include/mtr0mtr.h:
        Remove references to MLOG_FULL_PAGE
      innobase/log/log0log.c:
        Remove references to online backup
      innobase/log/log0recv.c:
        Remove references to MLOG_FULL_PAGE
      innobase/mtr/mtr0mtr.c:
        Remove references to MLOG_FULL_PAGE
        Remove references to online backup
      64fee753
  2. 25 May, 2004 26 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6deb606a
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      6deb606a
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 · b14a068e
      unknown authored
      
      include/Makefile.am:
        Auto merged
      b14a068e
    • unknown's avatar
      Added new header files · 0bd9f32b
      unknown authored
      0bd9f32b
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 72136530
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      72136530
    • unknown's avatar
      Bug#3882 · a4a2a415
      unknown authored
      a4a2a415
    • unknown's avatar
      merge with 4.0 to get Netware patches and fixes for libmysqld.dll · d4594eb7
      unknown authored
      
      configure.in:
        Auto merged
      Build-tools/Do-compile:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqladmin.c:
        Auto merged
      client/mysqlcheck.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqlimport.c:
        Auto merged
      client/mysqlshow.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/my_global.h:
        Auto merged
      include/thr_alarm.h:
        Auto merged
      innobase/include/trx0roll.h:
        Auto merged
      innobase/include/trx0trx.h:
        Auto merged
      innobase/que/que0que.c:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      innobase/trx/trx0purge.c:
        Auto merged
      innobase/trx/trx0roll.c:
        Auto merged
      innobase/trx/trx0trx.c:
        Auto merged
      innobase/usr/usr0sess.c:
        Auto merged
      isam/isamchk.c:
        Auto merged
      myisam/myisam_ftdump.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/my_getopt.c:
        Auto merged
      mysys/my_init.c:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      netware/Makefile.am:
        Auto merged
      netware/init_db.sql:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      tools/mysqlmanager.c:
        Auto merged
      VC++Files/dbug/dbug.dsp:
        Auto merged
      VC++Files/heap/heap.dsp:
        Auto merged
      VC++Files/isam/isam.dsp:
        Auto merged
      VC++Files/libmysql/libmysql.dsp:
        Auto merged
      VC++Files/myisam/myisam.dsp:
        Auto merged
      VC++Files/myisammrg/myisammrg.dsp:
        Auto merged
      VC++Files/mysys/mysys.dsp:
        Auto merged
      VC++Files/libmysqld/libmysqld.dsp:
        merge
      client/mysqlbinlog.cc:
        merge
      extra/perror.c:
        merge
      include/mysql_com.h:
        merge
      libmysqld/Makefile.am:
        merge
      netware/BUILD/mwenv:
        merge
      sql/mysqld.cc:
        merge
      d4594eb7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · bc60ead2
      unknown authored
      into mysql.com:/tmp/skr99/mysql-4.0
      
      bc60ead2
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 · 4d181927
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.0
      
      4d181927
    • unknown's avatar
      Proposed fix for bug #3818 (libmysqld.dll leads to program's crash) · f85e1443
      unknown authored
      configurations added to build the libraries with USE_TLS flag to be
      used for libmysqld
      
      
      VC++Files/dbug/dbug.dsp:
        TLS_DEBUG configuration added
      VC++Files/heap/heap.dsp:
        TLS and TLS_DEBUG configurations added
      VC++Files/isam/isam.dsp:
        TLS and TLS_DEBUG configurations added
      VC++Files/libmysql/libmysql.dsp:
        MYSQL_CLIENT define enabled
      VC++Files/libmysqld/libmysqld.dsp:
        using of _tls libraries added
      VC++Files/myisam/myisam.dsp:
        TLS and TLS_DEBUG configurations added
      VC++Files/myisammrg/myisammrg.dsp:
        TLS and TLS_DEBUG configurations added
      VC++Files/mysys/mysys.dsp:
        TLS and TLS_DEBUG configurations added
      include/mysql_com.h:
        __declspec(dllimport) seems to be necessary when one uses .dll
        on Windows
      f85e1443
    • unknown's avatar
      Remove not needed sql_olap.cc from Makefile.am · 2b06f51b
      unknown authored
      
      VC++Files/comp_err/comp_err.dsp:
        removed not needed library
      libmysqld/Makefile.am:
        Remove not needed sql_olap.cc
      2b06f51b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 81a07004
      unknown authored
      into mysql.com:/tmp/skr99/mysql-4.0
      
      
      client/mysqltest.c:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      myisam/myisam_ftdump.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      81a07004
    • unknown's avatar
      Added patches from Novell · a37fc4bb
      unknown authored
      
      Build-tools/Do-compile:
        Fixed indentation
      configure.in:
        Added patches from Novell
        Added C_EXTRA_FLAGS as an easy way to pass flags to both CFLAGS and CXXFLAGS
      extra/perror.c:
        Fixed error number reporting to not report 'Unknown error'
      include/my_global.h:
        Defines to make NETWARE patches cleaner
      include/thr_alarm.h:
        Fixed wrong macro
      netware/mysql_install_db.c:
        Indentation fix
      a37fc4bb
    • unknown's avatar
      InnoDB cleanup and possible bug-fix: Remove srv0que · 8983aac4
      unknown authored
      
      BitKeeper/deleted/.del-srv0que.c~d1feebb77b5a9b96:
        Delete: innobase/srv/srv0que.c
      innobase/srv/Makefile.am:
        Remove srv0que.c
      BitKeeper/deleted/.del-srv0que.h~f12ecb4b5afe203e:
        Delete: innobase/include/srv0que.h
      innobase/include/Makefile.am:
        Remove srv0que.c
      innobase/include/que0que.h:
        Remove unnecessary function que_fork_error_handle()
        que_thr_end_wait(): Remove output parameter next_thr; return it
      innobase/include/trx0roll.h:
        trx_rollback(), trx_finish_rollback_off_kernel():
        Remove output parameter next_thr; return it instead
      innobase/include/trx0trx.h:
        trx_sig_send(), trx_sig_reply(), trx_sig_start_handle():
        Remove output parameter next_thr; return it instead
      innobase/include/usr0sess.h:
        Remove sess->state and its literals SESS_ACTIVE and SESS_ERROR
      innobase/que/que0que.c:
        Remove unnecessary function que_fork_error_handle()
        que_thr_end_wait(): Remove output parameter next_thr; return it
        Remove references to srv0que.c
      innobase/srv/srv0srv.c:
        Remove unnecessary #include "srv0que.h"
      innobase/trx/trx0purge.c:
        Remove unneeded references to srv0que.c
      innobase/trx/trx0roll.c:
        Many functions: Remove output parameter next_thr; return it instead
        Remove references to srv0que.c
      innobase/trx/trx0trx.c:
        Many functions: Remove output parameter next_thr; return it instead
        Remove references to srv0que.c
        Remove references to SESS_ERROR
      innobase/usr/usr0sess.c:
        Remove sess->state
      8983aac4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c33f9572
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      c33f9572
    • unknown's avatar
      changed comment for LONG_DATA_COMMAND · 7b89afd3
      unknown authored
      7b89afd3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 93e27bfe
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      93e27bfe
    • unknown's avatar
      Merge with 4.0 to get fixes for project files · cf26c504
      unknown authored
      cf26c504
    • unknown's avatar
      Fixed VC++ project files · dd62a2ed
      unknown authored
      
      VC++Files/copy_mysql_files.bat:
        Added /Y to avoid questions
        Fixed wrong path for copying data files
      VC++Files/sql/mysqld.dsp:
        Added missing compiler option
      dd62a2ed
    • unknown's avatar
      Corrected index_flags returned when index are created with USING HASH · 8c5f33fa
      unknown authored
      Updated ndb_ test cases 
      
      
      mysql-test/r/ndb_autodiscover.result:
        Updated to new output of error message
      mysql-test/r/ndb_basic.result:
        Added som order by to sort the result correctly before comparing
      mysql-test/r/ndb_index_unique.result:
        Added test for USING HASH combined with PRIMARY KEY and UNIQUE index
      mysql-test/t/ndb_autodiscover.test:
        Correctede error case
      mysql-test/t/ndb_basic.test:
        Added som order by
      mysql-test/t/ndb_index_unique.test:
        Added test for USING HASH combined with PRIMARY KEY and UNIQUE index
      sql/ha_ndbcluster.cc:
        Added the index flag HA_ONLY_WHOLE_INDEX if index is created with USING HASH.
      8c5f33fa
    • unknown's avatar
      Preparation for user-defined Unicode collations: · 105dde3c
      unknown authored
      weights data now comes from a static variables
      but from the charset structure. 
      
      105dde3c
    • unknown's avatar
      sql_string.h: · 520cad8d
      unknown authored
        Not used code.
        ,
      sql_string.cc:
        Not used code.
      
      
      sql/sql_string.cc:
        Not used code.
      sql/sql_string.h:
        Not used code.
        ,
      520cad8d
    • unknown's avatar
      1. Some optimization when conversion is not needed. · 58747e20
      unknown authored
      2. One now must pass length argument into append(const char *str, uint length),
      length is not calculated internally anymore.
      
      58747e20
    • unknown's avatar
      Removed references to BDB and InnoDB from 'classic' release · 745510b6
      unknown authored
      
      VC++Files/mysqldemb/mysqldemb.dsp:
        Removed references to BDB and InnoDB from 'classic'
      VC++Files/sql/mysqld.dsp:
        Removed references to BDB and InnoDB from 'classic'
      745510b6
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 · 514b1625
      unknown authored
      into neptunus.(none):/home/magnus/mysql-4.1
      
      
      sql/handler.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      514b1625
    • unknown's avatar
      fixed typos · d672bf8c
      unknown authored
      d672bf8c
    • unknown's avatar
      Uses table_type() function to get name of storage engine before printing... · c567d584
      unknown authored
      Uses table_type() function to get name of storage engine before printing engine specific error message.
      
      
      sql/handler.cc:
        Use table_type to get "name" of this handler
      c567d584