Commit graph

18582 commits

Author SHA1 Message Date
unknown
647906259c Added test data and test case files. 2005-01-07 00:32:31 -08:00
unknown
5ebc648ea4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-07 08:40:55 +01:00
unknown
9bb36aa37c merge 2005-01-07 07:15:08 +01:00
unknown
b95768589a merge
BitKeeper/etc/logging_ok:
  auto-union
ndb/src/mgmsrv/main.cpp:
  Auto merged
2005-01-07 06:47:41 +01:00
unknown
04498c2a4f Bootstrap:
Made the default --mail address to be <build@mysql.com>.


Build-tools/Bootstrap:
  Made the default --mail address to be <build@mysql.com>.
2005-01-06 22:30:23 -06:00
unknown
dd02fd59b6 Skip client_test when testing embedded server
mysql-test/t/client_test.test:
  Doesn't make sense to run this test when running the embedded server
2005-01-07 04:53:05 +01:00
unknown
d732379b30 This just fixes the compile issues for table structure changes.
The test case does not currently work (I am comitting this so that Patrick will have a working copy).
I am going to look at the test case next. It is suspected that it is failing do to a change in mysql_test_run.



sql/ha_federated.cc:
  Changed for table structure change.
2005-01-06 19:37:16 -08:00
unknown
c0e6e87926 Updates for Monty's changes in the table structure. All tests pass currently.
Seems like such a short commit message...


sql/examples/ha_archive.cc:
  Updates for Monty's change to table structures.
  The way the loop through blobs worked has changed.
sql/examples/ha_tina.cc:
  Update for monty's change in table structures. 
  Only used for copying null bytes.
2005-01-06 18:34:17 -08:00
unknown
ccbadbc94a Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3
2005-01-07 12:06:57 +11:00
unknown
5de7459359 Along the road to a working Impl3 of WL2278.
ndb/src/common/transporter/TransporterRegistry.cpp:
  Only try to get dynamic port number for TCP transporters.
ndb/src/mgmapi/mgmapi.cpp:
  DBUG_RETURN in ndb_mgm_set_connection_int_parameter
  
  Unique negative error codes for ndb_mgm_get_connection_int_parameter
ndb/src/mgmsrv/MgmtSrvr.cpp:
  add MgmtSrvr::set_connect_string(const char *str)
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Add:
  - prototype for set_connect_string
  - get_config_retriever
ndb/src/mgmsrv/main.cpp:
  Fake a connect string and connect back to ourselves.
  
  This enables us to use mgmapi routines to get configuration information.
  i.e. ndb_mgm_get_connection_int_parameter for getting dynamic port numbers to connect to.
2005-01-07 12:05:56 +11:00
unknown
fb0f6c9de1 Fix for compiling error in sql_parse
sql/sql_parse.cc:
  Fixing merge issue with goto label missing.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-06 16:31:18 -08:00
unknown
e95db1ce68 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-06 23:59:15 +01:00
unknown
888f2fce98 2 small fixes for binlog (sorry for grouping them - I won't do it again):
WL#2335 (wait if binlog or binlog index file hits disk full or quota exceeded),
fix for BUG#7236 ("--expire_logs_days does not apply if all statements
happen in transactions"), and a behaviour change: abort if mysqld can't start
binlog at startup (if running with --log-bin of course).


sql/log.cc:
  2 small fixes for binlog:
  1) We create binlog and binlog index file with flag MY_WAIT_IF_FULL, so that they have the same
  behaviour as MyISAM tables when disk is full or quota exceeded (wait, try to finish write
  every minute, warn in error log every 10 minutes). That's WL#2335.
  2) Honour expire-log-days when we write a transaction to binlog (we honoured it already when writing
  an autocommit statement). This fixes BUG#7236.
sql/mysqld.cc:
  If we fail to create binlog or binlog index file or write to them at mysqld's startup, mysqld
  will exit. The former behaviour was to print error and continue, which led to stupid things like
  if you mispell a directory name in --log-bin, you don't immediately notice your mistake and
  you corrupt your recovery/replication. New behaviour is consistent with if you mispelt innodb_data_file_path.
2005-01-06 23:53:58 +01:00
unknown
2297b865e5 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 21:48:51 +01:00
unknown
5770356338 Merge mysql.com:/home/jwinstead2/mysql-4.1-7539
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 21:47:52 +01:00
unknown
ae7cfe9ee8 Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0


client/mysqladmin.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_pthread.h:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
2005-01-06 21:39:57 +01:00
unknown
fd2433762c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-06 21:35:50 +01:00
unknown
ba9b518ab1 Merge mysql.com:/home/mysql_src/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.1-clean


mysys/my_write.c:
  Auto merged
2005-01-06 21:31:47 +01:00
unknown
5b47aaed3a Fix for BUG#7714 "if disk full, sometimes MyISAM doesn't wait for free space, corrupts table"
This happened only if my_write() couldn't write even one byte.
I cannot easily add a .test for this, but I tested by hand before and after the change.


mysys/my_write.c:
  Monty and I could not find a reason why a write should not wait for free disk space
  (if disk is full) because it could not write at least one byte; doing so certainly
  corrupts tables. my_pwrite() and my_fwrite() don't test for -1, so no problem.
2005-01-06 21:30:39 +01:00
unknown
e50bfebe99 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 21:26:07 +01:00
unknown
58f8f9b3ca updated event example to make use of new NdbError member in NdbEventOperation
added my_pthread_init to get dbug print correct in Hugo
    added define for event error code



ndb/examples/ndbapi_event_example/ndbapi_event.cpp:
  updated event example to make use of new NdbError member in NdbEventOperation
  + use define to check error code
ndb/include/kernel/signaldata/CreateEvnt.hpp:
  updated create event signal to use define
ndb/include/ndbapi/NdbEventOperation.hpp:
  added NdbError member to NdbEventOperation
ndb/include/ndbapi/ndberror.h:
  added define for event error code
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  changed name of error code
ndb/src/ndbapi/NdbEventOperation.cpp:
  added NdbError
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  added debug printout
  added some error handling
ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  added NdbError
ndb/src/ndbapi/Ndberr.cpp:
  added NdbError for NdbEventOperationImpl
ndb/src/ndbapi/ndberror.c:
  changed some error codes
ndb/test/ndbapi/test_event.cpp:
  added testcase for BUG#7627
ndb/test/src/HugoTransactions.cpp:
  added printout in event
ndb/test/src/NDBT_Test.cpp:
  added my_pthread_init to get dbug print correct
2005-01-06 21:13:04 +01:00
unknown
7826587dbe Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.0
2005-01-06 21:03:09 +01:00
unknown
3770d90689 main.cpp:
correcting 4.1 merge error


ndb/src/mgmsrv/main.cpp:
  correcting 4.1 merge error
2005-01-06 21:01:32 +01:00
unknown
5728b1daa7 Make sure all char columns in the mysql.* tables have the proper width in
mysql_fix_privilege_tables.sql, or they may get truncated during conversion
to utf8. (Bug #7539)       


scripts/mysql_fix_privilege_tables.sql:
  Reset widths of all text fields at the same time as vonersion to utf8 to avoid length changes
2005-01-06 20:42:06 +01:00
unknown
c9da387e5f Merge mysql.com:/home/jwinstead2/mysql-4.1-7021
into mysql.com:/home/jwinstead2/mysql-4.1-clean


scripts/mysql_config.sh:
  Auto merged
2005-01-06 20:03:06 +01:00
unknown
7261f3c016 Merge mysql.com:/home/jwinstead2/mysql-4.1-6964
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 20:01:18 +01:00
unknown
eb6f4f85f0 Add comment to make code for option-stripping in mysql_config more clear
scripts/mysql_config.sh:
  Add comment to clarify why we can safely only strip flags with a leading space
2005-01-06 19:57:02 +01:00
unknown
d3faf620ac Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2005-01-06 20:49:27 +02:00
unknown
babb77767a postreview changes
client/mysqldump.c:
  fixed comment
  fixed compiler warning
2005-01-06 20:47:08 +02:00
unknown
382cc831de merged
BitKeeper/etc/ignore:
  auto-union
include/my_pthread.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  merged manually
2005-01-06 19:32:16 +02:00
unknown
928c20f8e3 fixed comparation with string constant on some platform (BUG#7651)
client/mysqldump.c:
  fixed comparation with string constant on some platform
2005-01-06 19:13:58 +02:00
unknown
299d0a8775 Merge mysql.com:/home/jwinstead2/mysql-4.1-7451
into mysql.com:/home/jwinstead2/mysql-4.1-clean


client/mysqladmin.cc:
  Auto merged
2005-01-06 17:27:48 +01:00
unknown
9a8c1ee351 Merge mysql.com:/home/jwinstead2/mysql-4.1-7249
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 17:24:47 +01:00
unknown
63abeac74a Merge mysql.com:/home/jwinstead2/mysql-4.1-7524
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 17:23:52 +01:00
unknown
6b584127af Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-01-06 17:53:32 +02:00
unknown
d5ad4615fb Merge 2005-01-06 16:50:34 +01:00
unknown
4532a89f0d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-06 17:40:00 +02:00
unknown
574a2820cf Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-06 16:37:08 +01:00
unknown
5360632639 removed unused label 2005-01-06 17:08:38 +02:00
unknown
e750ce2613 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/sql_prepare.cc:
  Auto merged
2005-01-06 17:00:59 +02:00
unknown
615cd4ff75 Fixed a bug in prepared statements error handling
After merge fixes


libmysql/libmysql.c:
  Fixed a bug in prepared statements error handling introduced by me on a recent patch
mysql-test/r/delayed.result:
  Updated results
mysql-test/t/delayed.test:
  Bigger timeout needed when using --ps-protocol (don't understand why yet)
  Added output of not_flushed_dealyed_rows for easier debugging
sql/sql_base.cc:
  USE tables_share fix for prepared statements
sql/sql_prepare.cc:
  After merge fix
2005-01-06 16:59:29 +02:00
unknown
f40d29a232 - Manually merged two changes from 4.0
BUILD/compile-dist:
  - manual merge
include/my_pthread.h:
  - manual merge
2005-01-06 15:32:42 +01:00
unknown
4d960869ef Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-06 15:18:03 +01:00
unknown
7344af9cbc Ensure that a 'bool' function really returns a value - was compiler error on some problems causing build failure. 2005-01-06 15:09:33 +01:00
unknown
10844e41da - enable "with-extra-charsets=complex" for the "compile-dist" distribution
build (to make the test suite pass)


BUILD/compile-dist:
  - enable "with-extra-charsets=complex" for the distribution build
    (to make the test suite pass)
2005-01-06 14:35:14 +01:00
unknown
eeec709d15 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-06 14:32:00 +01:00
unknown
744ceabebe ha_ndbcluster.m4:
fixed ndb configure according to 4.1


config/ac-macros/ha_ndbcluster.m4:
  fixed ndb configure according to 4.1
2005-01-06 13:04:52 +01:00
unknown
d42ff5df42 NdbRecAttr.cpp:
forgot hex prefix


ndb/src/ndbapi/NdbRecAttr.cpp:
  forgot hex prefix
2005-01-06 13:03:37 +01:00
unknown
72d5197681 NdbRecAttr.cpp:
improved printout routine


ndb/src/ndbapi/NdbRecAttr.cpp:
  improved printout routine
2005-01-06 13:02:06 +01:00
unknown
8ff8867251 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
2005-01-06 13:31:31 +02:00