Commit graph

18525 commits

Author SHA1 Message Date
unknown
fb3d6c39a0 IM mostly fixed according to Brian's directions. Will need to do some additional option handling and cleanups
server-tools/instance-manager/Makefile.am:
  New file added
server-tools/instance-manager/client_func.c:
  typo fixed
server-tools/instance-manager/commands.cc:
  there are no admin-user snd admin-password fields anymore, so no need to show their values
server-tools/instance-manager/guardian.cc:
  Syncronization added -- now guardian wakes up whenever SIGCLD has been catched
server-tools/instance-manager/guardian.h:
  Condition variable declared
server-tools/instance-manager/instance.cc:
  Persistent connection to the instance removed. Now we use SIGTERM instead of com_shutdown for STOP. We also
  manage SIGCHLD ourselves now (therefore no double fork).
server-tools/instance-manager/instance.h:
  Pointer to the instance_map added, MySQL connection structures removed
server-tools/instance-manager/instance_map.cc:
  More syncronization added (to make proper STOP)
server-tools/instance-manager/instance_map.h:
  added condition variable and mutex for connection threads to wait for SIGCHLD
server-tools/instance-manager/instance_options.cc:
  defaults-handling methods have been added.
server-tools/instance-manager/instance_options.h:
  New functions and constants declared
server-tools/instance-manager/listener.cc:
  No changes here (bk bug?)
server-tools/instance-manager/manager.cc:
  SIGCHLD handling added
2005-01-25 13:54:56 +03:00
unknown
28f86d8ff1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
2005-01-11 11:14:14 +01:00
unknown
9cc4ada8d4 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
2005-01-11 11:12:46 +01:00
unknown
eae30642cd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-11 10:34:37 +01:00
unknown
1ef48556bd Bug#7477 2005-01-11 10:34:36 +01:00
unknown
7535b07425 bug#7765 - ndb startup on 64-bit, increase stack on 64-bit
ndb/src/common/portlib/NdbThread.c:
  Use double stack for 64-bit
2005-01-11 10:02:31 +01:00
unknown
c92554e81f Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0-clean


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-01-11 05:11:42 +01:00
unknown
7b66387475 Merge
BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-11 05:10:08 +01:00
unknown
3c41c5fb1c Merge mysql.com:/home/jwinstead2/mysql-4.1-7556
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 02:57:47 +01:00
unknown
7451f0b38c Merge mysql.com:/home/jwinstead2/mysql-4.1-7762
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 01:25:46 +01:00
unknown
4bd2b5adc4 Fix style nit
sql/examples/ha_archive.cc:
  Fix style
2005-01-11 01:01:35 +01:00
unknown
57ff6dd01a field.h, field.cc:
Did some more split TABLE to TABLE and TABLE_SHARE


sql/field.cc:
  Field 'db_low_byte_first' of 'struct st_table' is now in TABLE_SHARE sub struct 's'
sql/field.h:
  Field 'db_low_byte_first' of 'struct st_table' is now in TABLE_SHARE sub struct 's'
2005-01-11 00:17:21 +01:00
unknown
4bb238a054 Fix double-initalization of mutex in archive storage engine. (Bug #7762)
sql/examples/ha_archive.cc:
  Fix redundant initialization of share->mutex
  Fix error handling to always clean up correctly
  Fix a couple of warnings
2005-01-10 23:59:28 +01:00
unknown
d3f5dfbd17 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-10 18:46:31 +01:00
unknown
a4eb7490b0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-10 18:42:07 +01:00
unknown
7d8451266a Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/mysql-5.0
2005-01-10 16:27:16 +00:00
unknown
c0d168e65d Initialize lex->mqh structure. Fixes valgrind warnings. 2005-01-10 16:24:05 +00:00
unknown
4399f8931a Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-5.0-build


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
2005-01-10 16:32:03 +01:00
unknown
cc1c4a99ef - removed the mysql-test/suites/jp test suite and marked all files as gone 2005-01-10 16:19:01 +01:00
unknown
24b048f5f4 Merge mysql.com:/home/mysql_src/mysql-4.1-clean
into mysql.com:/home/mysql_src/mysql-5.0-clean


sql/net_serv.cc:
  Auto merged
2005-01-10 15:15:49 +01:00
unknown
87e1a296ab A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in 4.0 we don't replicate OPTIMIZE TABLE). 2005-01-10 15:13:33 +01:00
unknown
2d3c55cd7b os0file.c:
Fix compiler error on those OS X platforms where Apple's special file flush trick with fcntl() is not defined


innobase/os/os0file.c:
  Fix compiler error on those OS X platforms where Apple's special file flush trick with fcntl() is not defined
2005-01-10 15:26:33 +02:00
unknown
7a35921bff Merge mysql.com:/home/mysql_src/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.1-clean


Build-tools/Bootstrap:
  Auto merged
sql/net_serv.cc:
  Auto merged
2005-01-10 14:13:41 +01:00
unknown
d8d9f79e09 Fix for BUG#7658 "optimize crashes slave thread (1 in 1000)]":
mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table()
but fixing my_net_write() looked more future-proof.


sql/net_serv.cc:
  If no VIO, no write.
2005-01-10 13:52:32 +01:00
unknown
0b7895b9b1 merge 2005-01-10 11:49:58 +01:00
unknown
815f62223a bug#7761 - ndb does not autcommit - postreview fixes
sql/sql_table.cc:
  Move ha_enable to before new Copy, to ensure no memory is leaked
2005-01-10 11:33:08 +01:00
unknown
b4871e2973 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-10 11:20:01 +01:00
unknown
1409b9d7ae bug#7761 - ndb does not autocommit during alter table
sql/sql_table.cc:
  Turn off transactions before locking (as locking will need to know)
2005-01-10 11:17:01 +01:00
unknown
cfe5650cab Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-09 11:01:47 +01:00
unknown
9b80f95f8f ndb -
Fix ndb_limit, handle cmpDate of length 3
Remove ucs2 test as it requires one to configure --with-extra-charsets


mysql-test/r/ndb_charset.result:
  Remove ucs2 test as it requires one to configure --with-extra-charsets
mysql-test/t/ndb_charset.test:
  Remove ucs2 test as it requires one to configure --with-extra-charsets
ndb/src/common/util/NdbSqlUtil.cpp:
  Fix ndb_limit, handle cmpDate of length 3
2005-01-09 11:00:37 +01:00
unknown
79192c2335 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-09 05:03:33 +01:00
unknown
e7b9581f36 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0


sql/set_var.cc:
  Auto merged
2005-01-08 19:46:52 -06:00
unknown
f8f7888b5c set_var.cc:
Whack duplicate variable line. (Affects SHOW VARIABLES.)


sql/set_var.cc:
  Whack duplicate variable line. (Affects SHOW VARIABLES.)
2005-01-08 19:43:15 -06:00
unknown
c6f3edbe88 sql_select.cc:
silence picky compiler warning.


sql/sql_select.cc:
  silence picky compiler warning.
2005-01-08 19:40:58 -06:00
unknown
fdadfe515f Replace all sprintf() calls with my_snprintf() in client.c. All of the
format strings (in all languages) already included field limits on the
specifiers, so this is just protection against future mistakes. (Bug #7556)


sql-common/client.c:
  Replace all sprintf() calls with my_snprintf()
2005-01-09 02:19:42 +01:00
unknown
7177746d49 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0


mysql-test/r/type_float.result:
  Auto merged
sql/field.cc:
  Auto merged
2005-01-08 18:42:48 -06:00
unknown
e528890462 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2005-01-08 18:32:57 -06:00
unknown
91a3e90baf ndb - wl-1442 merge fix 5.0 -> 5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 merge fix 5.0 -> 5.0-ndb
2005-01-09 01:14:11 +01:00
unknown
f029af067b Merge
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndb_constants.h:
  merge 5.0->5.0-ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge 5.0->5.0-ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  merge 5.0->5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  merge 5.0->5.0-ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  merge 5.0->5.0-ndb
2005-01-09 00:45:06 +01:00
unknown
3fbb1dd5ff updated some mgmapi docs 2005-01-09 00:45:05 +01:00
unknown
09ee2d3db0 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-08 23:32:53 +01:00
unknown
e9befed644 Update test as result of merge
mysql-test/r/heap.result:
  update test
2005-01-08 23:32:28 +01:00
unknown
09a4872661 ndb - wl-1442 4.1->5.0 merge fixes
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/include/ndb_constants.h:
  wl-1442 4.1->5.0 merge fixes
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 4.1->5.0 merge fixes
2005-01-08 23:24:25 +01:00
unknown
2c12921a64 Merge
client/mysql.cc:
  Auto merged
mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/include/util/NdbSqlUtil.hpp:
  merge
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
sql/ha_ndbcluster.cc:
  merge
2005-01-08 22:34:16 +01:00
unknown
f2034fdbba Merge mysql.com:/home/jwinstead2/mysql-4.1-7233
into mysql.com:/home/jwinstead2/mysql-5.0-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
2005-01-08 22:22:41 +01:00
unknown
94504d529b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-08 21:27:22 +01:00
unknown
4c8d52aa80 few harmless warnings from automated code-checking tools fixed
client/mysql.cc:
  few harmless warnings from automated code-checking tools fixed
  cleanup
2005-01-08 21:25:31 +01:00
unknown
c86ae20457 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-08 21:16:51 +01:00
unknown
39aa7b102c ndb_constants.h:
wl-1442 comment for 4.1->5.0


ndb/include/ndb_constants.h:
  wl-1442 comment for 4.1->5.0
2005-01-08 19:37:50 +01:00
unknown
3186b340da ndb - wl-1442 fix Time ordering
mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Time.  adds new type id 25
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Time.  adds new type id 25
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Time.  adds new type id 25
sql/ha_ndbcluster.cc:
  wl-1442 fix Time.  adds new type id 25
2005-01-08 19:28:44 +01:00