Commit graph

16061 commits

Author SHA1 Message Date
unknown
b0d586e564 added error code message for 897 2004-11-26 13:20:48 +00:00
unknown
b18b1be913 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-26 09:46:13 +00:00
unknown
33d654d7e1 cleaned up code a bit
added command CONNECT in management client
    added some verbose printouts
    removed prompt printout on !isatty(0)


ndb/src/mgmapi/mgmapi.cpp:
  improved verbose printouts on connecting to management server
ndb/src/mgmclient/CommandInterpreter.cpp:
  cleaned up code a bit
  added command CONNECT in management client
  added some verbose printouts
ndb/src/mgmclient/main.cpp:
  removed prompt printout on !isatty(0)
ndb/src/mgmclient/ndb_mgmclient.hpp:
  added verbose opotion
2004-11-26 09:44:57 +00:00
unknown
5557ae747e ha_innodb.cc:
Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error


sql/ha_innodb.cc:
  Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error
2004-11-26 00:26:35 +02:00
unknown
a560f0fa38 Many files:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup


innobase/buf/buf0buf.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/buf/buf0lru.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/buf0lru.h:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/db0err.h:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/row0sel.h:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/ut0mem.h:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/mem/mem0pool.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/row/row0mysql.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/row/row0sel.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/srv/srv0start.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/ut/ut0mem.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
2004-11-26 00:12:50 +02:00
unknown
bf39ae6a5c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-25 21:32:04 +00:00
unknown
00534590af moved default setting to config.ini to MgmtSrvr
only try to connect to other ndb_mgmd if connect_string explicitly given or config_file not given


ndb/src/mgmsrv/main.cpp:
  moved default setting to config.ini to MgmtSrvr
2004-11-25 21:29:59 +00:00
unknown
32f93da093 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/bkroot/mysql-4.1
2004-11-25 13:35:53 +01:00
unknown
207676814b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
2004-11-25 16:18:48 +04:00
unknown
26339663b8 table.cc:
Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1


sql/table.cc:
  Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1
2004-11-25 16:18:47 +04:00
unknown
026259249e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441


sql/item_func.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
2004-11-25 16:18:46 +04:00
unknown
9fc190e603 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-25 13:18:46 +01:00
unknown
897b7cbd44 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-25 12:18:45 +00:00
unknown
45f941cb5c ndb/src/common/logger/LogHandler.cpp
changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp
    some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp
    rewrote parsing on parseNameValuePair, was buggy


ndb/src/common/logger/LogHandler.cpp:
  changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp:
  some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  rewrote parsing on parseNameValuePair, was buggy
2004-11-25 12:14:15 +00:00
unknown
c4dbf1e969 Merge
BitKeeper/etc/logging_ok:
  auto-union
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/repl_failsafe.cc:
  Merging 4.0 and 4.1 changes.
2004-11-25 12:23:41 +01:00
unknown
32c3009d3a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-25 10:40:56 +01:00
unknown
0e6d4fd043 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2004-11-25 10:39:34 +01:00
unknown
5aaffe9b3c bug#6775 - ndb - fix bug introduced by bug fix
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Scan number allocation must be on table even in case of range scan
  Otherwise scan takeover won't work as LQHKEYREQ contains table
2004-11-25 10:38:46 +01:00
unknown
467c481479 Merge mysql.com:/space/bkroot/mysql-4.0
into mysql.com:/space/bk/b6148-mysql-4.0


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-11-25 09:38:52 +01:00
unknown
6f2cf12aa6 Fix for Bug#6148. Only rewind read position in binary log when the
slave SQL thread is started.


sql/slave.cc:
  Adding threads to init as parameter to init_master_info.
  Only rewind read position when starting SQL thread.
sql/slave.h:
  Adding threads to init as parameter to init_master_info.
  Only rewind read position when starting SQL thread.
sql/sql_repl.cc:
  Adding threads to init as parameter to init_master_info.
  Only rewind read position when starting SQL thread.
sql/repl_failsafe.cc:
  Adding threads to init as parameter to init_master_info.
  Only rewind read position when starting SQL thread.
2004-11-25 09:26:45 +01:00
unknown
2b4400e22d Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-24 23:47:14 +01:00
unknown
6429a0c598 bug#6784
mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos
2004-11-24 23:16:16 +01:00
unknown
c3272ae718 configure.in:
Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system


innobase/configure.in:
  Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system
2004-11-24 19:41:38 +02:00
unknown
185965214d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-24 17:41:37 +00:00
unknown
2f36bf7418 added explanation of error code 4335 2004-11-24 17:40:40 +00:00
unknown
03cba628f6 Bug#6787 LIKE not working properly with _ and utf8 data 2004-11-24 20:09:54 +04:00
unknown
232bbfda4d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-24 17:09:53 +01:00
unknown
d1441b68d0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-24 17:09:53 +01:00
unknown
b760bfd77d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-24 16:09:52 +00:00
unknown
f4db89ea85 also backup needs triggers 2004-11-24 16:04:11 +00:00
unknown
61dbdff2a6 calculation of noOfTriggers 2004-11-24 15:51:59 +00:00
unknown
1634ecf295 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
2004-11-24 16:47:08 +01:00
unknown
98de7e010f bug#6775 - ndb
Queue scan on real fragment.
  Index fragment for range scans
  Table fragment for table scans


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Document meaning of fragPtrI and how it differs
    from scanTcRec->fragmentptr
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Queue scan on real fragment.
    Index fragment for range scans
    Table fragment for table scans
ndb/src/ndbapi/NdbConnection.cpp:
  Check tOp before assigning
2004-11-24 16:36:18 +01:00
unknown
dcfd4e41d9 Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/mysql-4.1
client/mysqladmin.cc:
  Auto merged
2004-11-24 15:29:35 +01:00
unknown
55ea7c8b0e Ensure consistent sources up to 5.0 where a C++ problem occurs.
client/mysqladmin.c:
  Cast to overcome a C vs. C++ signature problem, occurring in 5.0 where this is a C++ file.
2004-11-24 15:24:23 +01:00
unknown
15edb7fc15 added mgmapi/mgmapi_config_parameters.h, mgmapi/mgmapi_config_parameters_debug.h
to distribution
2004-11-24 13:59:03 +00:00
unknown
81a1875027 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-24 13:21:41 +01:00
unknown
4221f04ab6 Merged 4.0 change into 4.1
Build-tools/Do-compile:
  Merged new default "--force" (can be switched off using "--one-error") from 4.0 into 4.1
2004-11-24 13:04:13 +01:00
unknown
3a56452c77 merge error 2004-11-24 12:33:09 +01:00
unknown
8998e128b6 Merge mysql.com:/home/jonas/src/wl2077
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
2004-11-24 11:59:06 +01:00
unknown
3d52cdeff7 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077
2004-11-24 11:05:05 +01:00
unknown
1b9ea9b3c8 ndb - 4.1.8 is not online software upgradable with 4.1.7 (due to close scan optimizations)
ndb/src/common/util/version.c:
  4.1.8 is not online software upgradable with 4.1.7 (due to close scan optimizations)
2004-11-24 11:03:54 +01:00
unknown
5909722f04 harmless "buffer overflow" fixed 2004-11-24 11:01:54 +01:00
unknown
e0ec1f1609 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2004-11-24 10:52:21 +01:00
unknown
135cdcef24 uca-dump.c:
Use less wide spaces on the primary level,
  to avoid big diff for ctype-uca.c.


strings/uca-dump.c:
  Use less wide spaces on the primary level,
  to avoid big diff for ctype-uca.c.
2004-11-24 13:28:48 +04:00
unknown
e26a5dbc6a ndb - Add testcase to autotest
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  print on state on rare crash
ndb/test/run-test/daily-basic-tests.txt:
  more test cases
2004-11-24 09:39:05 +01:00
unknown
343b645ba2 ndb - debug printout
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  print state on rare crash
2004-11-24 09:36:49 +01:00
unknown
a9aff01ebd Change "Do-compile" to make automatic build log analysis easier and
to run the standard tests with "--force" (default, can be switched off).


Build-tools/Do-compile:
  1) For an automated log analysis, we need a clear marker in the build log
     whether compile + link succeeded: Write it after successful "make".
  2) Ensure the standard tests are run with "--force" in the default case,
     but allow the old behaviour by an option "--one-error".
  3) Correct a typing error in the usage message.
2004-11-23 17:18:41 +01:00
unknown
f30976748c Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-23 15:35:50 +01:00
unknown
892197ca36 use FT_MAX_WORD_LEN_FOR_SORT instead of HA_FT_MAXBYTELEN when calculating
preferred key block length for ft index
2004-11-23 15:03:16 +01:00