Commit graph

805 commits

Author SHA1 Message Date
tulin@build.mysql.com
cee870e9b5 Merge bk-internal:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1-cluster-extra
2005-01-05 15:55:26 +01:00
paul@snake-hub.snake.net
fc0d550bad set_var.cc:
Silence compiler warning.
2005-01-02 15:10:08 -06:00
mskold@mysql.com
76b2df6043 Merged bugfix 2004-12-30 21:36:16 +01:00
marty@linux.site
1ddb554b8b Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browser 2004-12-30 19:56:09 +01:00
mysqldev@bk-internal.mysql.com
2370f9da7f Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/data0/bk/mysql-4.1-cluster-extra
2004-12-20 13:34:25 +01:00
paul@frost.snake.net
adfb20f64a fill_help_tables.sh:
Convert @samp{c} to 'c', not c.
2004-12-18 14:22:20 -06:00
matt@booty.(none)
35942c09de my-innodb-heavy-4G.cnf.sh:
I fixed the typos in the transaction-isolation comments.
  I fixed the spelling mistakes in the comment.  It had tripped up a support 
  customer as they couldn't start the server with transaction-isolation=
  read-commited
2004-12-17 22:25:35 -05:00
mysqldev@bk-internal.mysql.com
e4da7f4a40 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/data0/bk/mysql-4.1-cluster-extra
2004-12-17 11:46:44 +01:00
joreland@mysql.com
cfa20fbaa6 merge 2004-12-17 10:36:14 +01:00
joreland@mysql.com
50e15affff Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl1744
2004-12-06 14:52:31 +01:00
stewart@mysql.com[stewart]
00915656e7 Add (optional) endian parameter to 'get nodeid' to warn on endian conflicts. 2004-12-06 11:41:16 +11:00
jimw@mysql.com
4b8e96d5ca Merge 2004-12-03 00:39:55 +01:00
jimw@mysql.com
13649d90ae Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the
insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682)
(Original fix reimplemented after review by Serg and Guilhem.)
2004-12-03 00:05:11 +01:00
mwagner@mysql.com
2e0d1b3f9c openssl_1.result, have_openssl_1.require, openssl_1.test:
Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
2004-12-01 02:35:02 +01:00
timour@mysql.com
f1e86036ee Merge mysql.com:/home/timka/mysql/src/4.0-virgin
into mysql.com:/home/timka/mysql/src/4.0-master
2004-11-25 13:25:35 +02:00
mats@mysql.com
9ffb3fd39c Merge 2004-11-25 12:23:41 +01:00
timour@mysql.com
38ab93c6be Merge for BUG#3759 which was missing from the main tree for some reason. 2004-11-25 11:37:28 +02:00
mats@mysql.com
fe0911e95e Merge mysql.com:/space/bkroot/mysql-4.0
into mysql.com:/space/bk/b6148-mysql-4.0
2004-11-25 09:38:52 +01:00
petr@mysql.com
edc868e397 Added --disable-log-bin option to the mysqlbinlog (WL1787) 2004-11-19 18:35:36 +03:00
timour@mysql.com
5d1f920ba7 correct name of function in synopsis 2004-11-18 16:52:45 +02:00
joreland@mysql.com
f63b126f7e Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
2004-11-15 10:50:58 +01:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02:00
Administrator@w2k.
414298f38b Merge joreland@bk-internal.mysql.com:wl1744 into w2k.:C:/mysql-4.1 2004-11-10 14:02:59 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
083a2f5613 Changed default.c so that it now checks for my.ini and then
my.cnf from the default directories.
2004-11-05 18:59:19 +02:00
lars@mysql.com
485de9cbb7 Fix for bug#5551 (Version 4).
The idea of the fix is that the administrative statements 
OPTIMIZE TABLE, REPAIR TABLE and ANALYZE TABLE should not 
generate binlog errors if there is no errors on the master.
2004-11-03 18:23:58 +01:00
tim@siva.hindu.god
b0510c7fd4 Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROC
for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself.
2004-11-02 17:53:25 -07:00
matthias@three.local.lan
afecfd77b5 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-11-01 10:51:43 +01:00
dellis@goetia.(none)
34e5df0d36 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0
2004-10-17 18:47:08 -05:00
jani@a193-229-222-105.elisa-laajakaista.fi
4d55c4a321 Improved mysqld_multi documentation, especially the --example
section, which had gotten somewhat out-dated.
2004-10-11 20:54:48 +03:00
jani@a193-229-222-2.elisa-laajakaista.fi
951e54df74 Changed a fatal error to a warning in case the default mysqld
binary for mysqld_multi was not found. This is because it is
possible to define one under each mysqldN group separately.
Bailing out if mysqld binary is not found at all.

Added option --silent to turn off warnings.
2004-10-08 20:18:25 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
724749e9a7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into a80-186-41-201.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2004-10-07 22:09:14 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
a44b6b67a5 Fixed a bug in password handling. All related to Bug#5955. 2004-10-07 22:08:17 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
c73cd9ff8a Fixed Bug#5575, mysqlhotcopy is broken when using --noindices 2004-10-07 20:30:30 +03:00
monty@mysql.com
62f3cd6a31 Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
2004-10-06 19:14:33 +03:00
tomas@poseidon.ndb.mysql.com
f6ad058388 Merge 2004-10-03 21:39:04 +00:00
dellis@goetia.(none)
634df1c19c mysqld.cc:
BUG #5731 Restrict key_buffer_size to 4GB on 64 bit platforms
2004-10-03 10:00:26 -05:00
dellis@goetia.(none)
8a12b5add0 logging_ok:
Logging to logging@openlogging.org accepted
sql_acl.cc, grant.test, grant.result:
  BUG 5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
2004-10-01 07:50:26 -05:00
magnus@shellback.(none)
94b305b226 Merge 2004-09-26 16:21:15 +02:00
magnus@shellback.(none)
059941db21 WL#1424 Updated after review
* Changed the implementation of ndbcluster_find_files to be more efficient, using only one mutex lock
* Moved ha_find_files to end of mysql_find_files so that it can be passed the list that we are interested to find.
2004-09-26 16:11:24 +02:00
hartmut@mysql.com
42b063c3b4 make --with-openssl work with parameters as expected,
old options for include path and library settings still
work for backwards compatibility
(fix for BUG #5494)
2004-09-26 15:24:57 +02:00
tomas@poseidon.ndb.mysql.com
0273e84b7f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-09-24 11:07:55 +00:00
bar@noter.intranet.mysql.r18.ru
b5b7801917 logging_ok:
Logging to logging@openlogging.org accepted
sql_show.cc, type_enum.test, type_enum.result:
  Bug #5628 German characters in field-defs will be '?' with some table definitions
2004-09-24 13:14:44 +05:00
tomas@poseidon.ndb.mysql.com
a0317069e5 Merge 2004-09-21 12:56:05 +00:00
brian@private-client-ip-101.oz.net
ce218b9b99 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into private-client-ip-101.oz.net:/Users/brian/mysql/mysql-4.1
2004-09-21 10:18:33 +02:00
joreland@mysql.com
efb0ae38af Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-20 17:25:55 +02:00
mleich@mysql.com
51d42739b9 These modifications were part of WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
They are separated from the other WL#1856 stuff, because they improve the behaviour of the current tests.  

Make the result sets (order of rows) more predictable by using ORDER BY.
2004-09-20 13:10:47 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
0b6dc49388 Bug#5553 - Multi table UPDATE IGNORE fails on dup key
We don't want the update to abort when IGNORE is specified
2004-09-17 12:07:59 +01:00
mysql@mc04.(none)
d905188230 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc04.(none):/space/mysql/mysql-4.1-ndb
2004-09-16 09:21:49 +02:00
mikael@mc04.(none)
72017f8dd2 logging_ok:
Logging to logging@openlogging.org accepted
SCI_Transporter.hpp, SCI_Transporter.cpp:
  Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
TransporterRegistry.cpp:
  Some fixes for wrap around needed plus DBUG handling
TCP_Transporter.hpp, TCP_Transporter.cpp:
  Added DBUG statements
SHM_Transporter.hpp, SHM_Transporter.cpp:
  Fixed SHM Transporter
SHM_Buffer.hpp:
  Fixed SHM Buffer to handle wrap around properly
IPCConfig.cpp:
  Fixed up config of SCI
SocketServer.cpp:
  Added DBUG support for SocketServer threads
ConfigInfo.cpp:
  Config changes for SCI
TransporterDefinitions.hpp, mgmapi_config_parameters.h:
  SCI fixes
Makefile.am, type_ndbapitools.mk.am, type_ndbapitest.mk.am:
  Added SCI library path to Makefiles
configure.in:
  Fixed small bug with shared mem and sci together in configure
acinclude.m4:
  Added possibility of providing SCI library path in confgure
2004-09-15 20:41:49 +02:00
matt@mysql.com
c998fbdb8c configure.in:
Updated to 4.0.22
2004-09-10 00:08:12 +02:00