Commit graph

13929 commits

Author SHA1 Message Date
unknown
f9831c0401 bad merge fixed - myisamchk support for --ft_stopword_file restored 2004-08-10 10:07:59 +02:00
unknown
e74007fb7c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4756
2004-08-10 03:07:07 +04:00
unknown
c17bc7a7ff Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.0-bg4491
2004-08-10 02:57:32 +04:00
unknown
201f86ef62 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2004-08-09 19:10:54 +02:00
unknown
17f95c28da mysqld.cc:
minor option description change.


sql/mysqld.cc:
  minor option description change.
2004-08-09 10:34:36 -05:00
unknown
520a745891 mysql-test ndb_index_unique
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Compensate for "extra" lqhkeyreqrec during index read (when IgnoreError)
ndb/src/mgmsrv/main.cpp:
  Read corrent local node id
ndb/tools/waiter.cpp:
  Yet another user of LocalConfig
2004-08-09 15:13:46 +02:00
unknown
dbf02c07ce row0mysql.c:
row_drop_table_for_mysql(): Removed a ut_ad() assertion that failed
  when a DROP TABLE is executed in the background.


innobase/row/row0mysql.c:
  row_drop_table_for_mysql(): Removed a ut_ad() assertion that failed
  when a DROP TABLE is executed in the background.
2004-08-09 15:38:40 +03:00
unknown
fd2544c4ba - added EXCEPTIONS-CLIENT to the "devel" RPM subpackage and added
a note to the RPM ChangeLog about it
2004-08-09 14:36:59 +02:00
unknown
2d9190418d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-08-09 07:12:19 -05:00
unknown
96587f58c8 Forgott to update testBackuo w.r.t to ConfigRetreiver 2004-08-09 14:10:50 +02:00
unknown
a95ad750b4 testBlobs take more than 5-minutes (but less than 10) 2004-08-09 13:57:01 +02:00
unknown
1905e1c5ac bug#4529
ndb/include/mgmcommon/ConfigRetriever.hpp:
  Separate connect and all/fetch
ndb/include/mgmcommon/LocalConfig.hpp:
  Use BaseString
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Separate connect and all/fetch
ndb/src/common/mgmcommon/LocalConfig.cpp:
  Removed useless onlyNodeId
ndb/src/kernel/main.cpp:
  Separeted Configuration fetch/setup
ndb/src/kernel/vm/Configuration.cpp:
  Separeted Configuration fetch/setup
ndb/src/kernel/vm/Configuration.hpp:
  Separeted Configuration fetch/setup
ndb/src/mgmapi/mgmapi.cpp:
  Fixed some return codes
ndb/src/mgmclient/main.cpp:
  LocalConfig update
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Put mutex around reserving node'ids
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Put mutex around reserving node'ids
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Changes ConfigRetreiver interface
ndb/src/mgmsrv/Services.cpp:
  Allow reserve same id twice
ndb/src/mgmsrv/main.cpp:
  Ignore SIGPIPE
ndb/src/ndbapi/TransporterFacade.cpp:
  ConfigRetriever interface
2004-08-09 13:25:07 +02:00
unknown
3603196b19 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-4000
2004-08-09 11:41:50 +02:00
unknown
63ae5d0b4d bug#4497 - Serious regression if disk based TMP table is used.
Solved performance problems by enabling write buffer.



sql/sql_select.cc:
  bug#4497 - Serious regression if disk based TMP table is used.
  Solved performance problems by enabling write buffer.
  Supplied no test case, as it required too much data to see the performance regression.
2004-08-09 11:39:26 +02:00
unknown
499a71bcb5 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2004-08-09 11:28:59 +02:00
unknown
9694a1f9dd bug#4369 - MySQL 4.1 regression in Alter table/tmp table from hash.
Solved performance problems by fixing a typo, which prevented enabling of write buffer.


sql/ha_myisam.cc:
  bug#4369 - MySQL 4.1 regression in Alter table/tmp table from hash.
  Solved performance problems by fixing a typo, which prevented enabling of write buffer.
  Supplied no test case, as it required too much data to see the performance regression.
2004-08-09 11:02:09 +02:00
unknown
db64c33f15 configure.in:
Collation name fixes.


configure.in:
  Collation name fixes.
2004-08-09 13:04:34 +05:00
unknown
89b446969a testTransaction -n FRead*
testTransaction -n *Scan*
testTimeout -n *


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Added DUMP for tc appl timeout
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Send tckey conf if m_exec_flags is set
  Added dump for appl timeout
ndb/test/include/HugoOperations.hpp:
  Add scanRead
ndb/test/ndbapi/testTimeout.cpp:
  Reenable
ndb/test/ndbapi/testTransactions.cpp:
  Fix scan test cases
ndb/test/run-test/daily-basic-tests.txt:
  reenable timeout-tests
  added testTransaction -n Scan* testcases
ndb/test/src/HugoOperations.cpp:
  Fix scan
ndb/test/src/NDBT_Test.cpp:
  Drop table before test...(if createTable==true)
2004-08-09 09:44:05 +02:00
unknown
caaa692ca6 mysqld.cc:
Put --help first, reorder other options so that they are
  alphabetical. (shouldn't have to use grep to find an option.)
  Move group_concat_max_len to variable part of list.
  Rename character_set_server, collation_server,
  shared_memory_base_name to character-set-server,
  collation-server, shared-memory-base-name.
  Make default-collation message refer to collation-server
  rather than character-set-server.


sql/mysqld.cc:
  Put --help first, reorder other options so that they are
  alphabetical. (shouldn't have to use grep to find an option.)
  Move group_concat_max_len to variable part of list.
  Rename character_set_server, collation_server,
  shared_memory_base_name to character-set-server,
  collation-server, shared-memory-base-name.
  Make default-collation message refer to collation-server
  rather than character-set-server.
2004-08-08 21:23:03 -05:00
unknown
fbceeb05fe Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/ll


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-08-08 20:58:57 +02:00
unknown
41b820a540 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-08 20:27:57 +02:00
unknown
a968c37f19 testDict -n CreateMaxTables
- Init _all_ of CREATE_TABLE_REF


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Init _all_ of CREATE_TABLE_REF
2004-08-08 20:27:39 +02:00
unknown
82d9b4a8a0 mysqld.cc:
get_options() did an exit(0) after reporting "Too many arguments"


sql/mysqld.cc:
  get_options() did a exit(0) when reporting "Too many arguments"
2004-08-08 15:46:57 +02:00
unknown
91f20a16b8 cleanup
mysql-test/r/select_found.result:
  explain added
mysql-test/t/select_found.test:
  cleanup. 5000-char long line removed :)
sql/sql_select.cc:
  reverted
2004-08-07 23:18:13 +02:00
unknown
03fc7a08b7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-07 18:28:10 +02:00
unknown
978e1ba084 bug#4881 - crash in ALTER .. RENAME if rename fails
sql/sql_select.cc:
  typos in comments
  harmless (hopefully) bug in optimizer fixed
2004-08-07 18:26:59 +02:00
unknown
2cebb9308c Merge
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
2004-08-07 09:11:18 +02:00
unknown
20e8d38bd0 Jammed Qmgr a bit more
Fixed Bug #4935, initialise before connecting again
Some lines removed
2004-08-06 20:22:34 +02:00
unknown
901c1db483 libmysql.c:
Can't return value from void function


libmysql/libmysql.c:
  Can't return value from void function
2004-08-06 18:03:27 +02:00
unknown
fc4364e350 InnoDB: Add option for disabling innodb_status.<pid> files.
InnoDB: Implement tmpfile() differently on Windows (Bug #3998)


innobase/dict/dict0dict.c:
  Check the return value of os_file_create_tmpfile(),
  as it can now return NULL
innobase/include/os0file.h:
  Note that os_file_create_tmpfile() can now return NULL
innobase/include/srv0srv.h:
  Add a new server flag (srv_innodb_status) to disable
  the creation of innodb_status.<pid> files
innobase/lock/lock0lock.c:
  Check the return value of os_file_create_tmpfile(),
  as it can now return NULL
innobase/os/os0file.c:
  os_file_create_tmpfile(): separate implementation for Win32;
  errors will be reported but will not cause assertion failure
innobase/srv/srv0srv.c:
  Add a new server flag (srv_innodb_status) to disable
  the creation of innodb_status.<pid> files
innobase/srv/srv0start.c:
  innobase_start_or_create_for_mysql(): create srv_monitor_file
  with tmpfile() or with a visible name "innodb_status.<pid>",
  depending on the setting of the flag srv_innodb_status.
sql/ha_innodb.cc:
  innobase_init(): initialize srv_innodb_status
  update_table_comment(), get_foreign_key_create_info(): replace
  tmpfile() with os_file_create_tmpfile()
sql/ha_innodb.h:
  Add new Boolean flag, innobase_create_status_file.
sql/mysqld.cc:
  Add new Boolean flag, innodb_status_file
2004-08-06 15:55:50 +03:00
unknown
2bb314c2c5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-08-06 11:31:53 +02:00
unknown
01e1451ad8 Bug#4586 + TC fix
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Operations with marker always leads to abort even
  if IgnoreError was supplied (limitation)
  
  Check marker before marking operation as aborted (which removes marker)
ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Init cnoOfAllocatedPages after returnCommonArea
2004-08-06 11:29:56 +02:00
unknown
72987924dd Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
2004-08-06 11:14:39 +02:00
unknown
3a00469e4a Fix for bug #4491 "timestamp(19) doesn't work".
We should allow 19 as length of newly created TIMESTAMP fields.


mysql-test/r/type_timestamp.result:
  Added test of TIMESTAMP(19) support.
mysql-test/t/type_timestamp.test:
  Added test of TIMESTAMP(19) support.
sql/sql_parse.cc:
  add_field_to_list(): TIMESTAMP columns should also support 19 as length since it is
  length of 4.1 compatible representation.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-06 12:15:40 +04:00
unknown
0bf9c56bf0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Auto merged
2004-08-06 10:06:58 +02:00
unknown
e4837b10d9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/ll


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Auto merged
2004-08-06 10:04:58 +02:00
unknown
bcdc77b3d1 Fixed ndb backup bug
ndb/src/kernel/blocks/backup/Backup.hpp:
  SCAN_FRAGCONF contains length of key(s) aswell
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Send correct signal length
2004-08-06 09:43:06 +02:00
unknown
52e0926ad0 Increase value of TimeBetweenWatchDogCheck to make it to start cluster on lowend machines.
mysql-test/ndb/ndb_config_2_node.ini:
  Increase TimeBetweenWatchDogCheck to 30000
2004-08-06 09:41:44 +02:00
unknown
1b0f0b0afc Fix for bug #4756 "STR_TO_DATE() returning bad results with AM/PM".
Added support of converion specifiers mentioned in manual but missing in code.


mysql-test/r/date_formats.result:
  Added tests of str_to_date() with new %T, %r and %V, %v conversion specifiers, and also 
  some other specifiers for which tests were missing previously.
mysql-test/t/date_formats.test:
  Added tests of str_to_date() and new %T, %r and %V, %v conversion specifiers, and also 
  some other specifiers for which tests were missing previously.
sql/item_timefunc.cc:
  Added support for %T, %r, %V, %v, %X, %x conversion specifiers to extract_date_time()
  function. Also simplified a bit calculation of dates from week number.
2004-08-06 10:01:29 +04:00
unknown
8e55628d38 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-06 06:13:45 +02:00
unknown
689f4f2735 removed unused and illegal print method 2004-08-05 23:39:12 +02:00
unknown
67570b8b1b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-08-05 14:19:18 -07:00
unknown
9919574acf Cleanup in mysql_time.h/my_time.h headers. The first is used in mysql.h,
the second is for the rest of time declarations in mysys.


include/my_time.h:
  New declarations moved from mysql_time.h
include/mysql_time.h:
  New declarations moved to my_time.h.
sql/tztime.cc:
  Enforcing Monty's approach to header files.
sql/tztime.h:
  Enforcing Monty's approach to header files: everything is included in
  one place.
2004-08-05 14:16:43 -07:00
unknown
acd3775521 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-08-05 23:02:31 +02:00
unknown
432e469746 Merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  SCCS merged
2004-08-05 22:32:25 +02:00
unknown
e223c07eb1 Merge joreland@bk-internal.mysql.com:irix
into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/test/ndbapi/testBasic.cpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-08-05 22:19:52 +02:00
unknown
a2b6166e0d Fix for BUG #4096
Introduced refresh of watch dog at various places and
removed init of memory in allocRecord
Also changed default watch to 6 seconds
2004-08-05 20:16:45 +02:00
unknown
cdca651f6d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
2004-08-05 19:20:11 +02:00
unknown
6c8df36263 Small fix for updated config params 2004-08-05 18:51:27 +02:00
unknown
83c9f45fc2 Remove unused config parameters
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-05 18:23:01 +02:00