tomas@poseidon.ndb.mysql.com
97c8234b46
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2004-11-26 13:44:49 +00:00
mats@mysql.com
9ffb3fd39c
Merge
2004-11-25 12:23:41 +01: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
patg@patrick-galbraiths-computer.local
7df412160a
Needed for WL# 2094, MySQL Federated Storage Handler
...
sql_string.h:
simple string method to drop last character of a string (also decrements str_length)
2004-11-12 15:56:25 -08:00
monty@mysql.com
addd1a0da8
Merge with 4.1
2004-11-12 19:58:24 +02:00
monty@mysql.com
9252656d49
merge with 4.0
2004-11-12 11:17:53 +02: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
monty@mysql.com
071001950e
Merge with 4.1 to get in latest bug fixes
2004-11-04 15:06:24 +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
monty@mysql.com
afbe601302
merge with 4.1
2004-10-29 19:26:52 +03: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
mwagner@here.mwagner.org
06245b4508
post-commit:
...
Added catch for (example) WL#1234 into bk commit subjects
2004-10-12 15:08:58 -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
jani@a80-186-8-224.elisa-laajakaista.fi
9a781af114
Fixed a couple of bugs.
2004-09-14 22:02:23 +03:00
petr@mysql.com
974a13d0e2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/im/default_patch/mysql-5.0
2004-09-11 00:48:13 +04:00
petr@mysql.com
998873c996
Fixed a problem causing load_defaults not to accept some command-line
...
options.
2004-09-11 00:44:09 +04:00
matt@mysql.com
c998fbdb8c
configure.in:
...
Updated to 4.0.22
2004-09-10 00:08:12 +02:00
monty@mysql.com
49cd04b510
Merge on pull
2004-09-09 07:26:28 +03:00
brian@brian-akers-computer.local
df461bdeab
Updating the headers on a few files to include GPL header.
2004-09-08 18:26:19 -07:00
monty@mysql.com
31122efde7
Merge with 4.1
...
(Includes merge of arena code in 4.1 and 5.0)
2004-09-06 15:14:10 +03:00
cps@silver_beast.(none)
d14e6c3400
Please rewiev. Here added a function to process config. files options.
...
A lot of the default.c module code was refactored. The patch is needed
for the IM.
2004-08-30 18:17:50 +04:00
joreland@mysql.com
af7c3008db
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-27 14:11:50 +02:00
bar@mysql.com
43b792d5cf
win1251.conf:
...
Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed.
bug#5110
2004-08-27 10:54:57 +05:00
serg@serg.mylan
b4bb38e896
merged
2004-08-26 15:19:46 +02:00
rburnett@build.mysql.com
0e44c9fdab
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into build.mysql.com:/users/rburnett/mysql-4.0
2004-08-26 13:43:27 +02:00
rburnett@build.mysql.com
52a973c5ff
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into build.mysql.com:/users/rburnett/mysql-4.0
2004-08-25 06:39:19 +02:00