mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26510 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1100 commits

Author SHA1 Message Date
stewart@mysql.com
57d5d6c09e Remove dead code 2004-12-08 20:13:33 +11:00
joreland@mysql.com
ba83763a77 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2004-12-07 08:38:06 +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
pekka@mysql.com
a5c311e251 ndb: testing "bk gone" with ndb/tools/old_dirs/ndbnet 2004-12-06 14:14:45 +01:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02: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
d6efb4bbfd configure.in: 
Incremented for next version
 2004-12-02 07:24:08 +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
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
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
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
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
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
timour@mysql.com
4d070fd92b Fix for Bug#3759 
The cause of the bug is that Item_func_in::fix_fields did not fully update its
used_table_cache. This was the cause for not_null_tables in setup_conds() to be
still 0 after the call
  not_null_tables= (*conds)->not_null_tables();
As a result the condition in setup_conds()
  if ( ... (table->table->map & not_null_tables) ...)
failed, which was the cause for the ON expression not to be added to conds, and later
the optimizer couldn't detect that it could apply the OUTER JOIN ==> JOIN optimization.
 2004-08-30 15:26:27 +03: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
joerg@mysql.com
b8c7b6b0ae All 'Makefile's must use '$(AR)' (not just 'ar') because the variable may contain options. 2004-08-24 19:05:42 +02:00
miguel@hegel.txg.br
2e238f7eff Fix warning VC++ and fix applied fisrt to source 4.1 2004-08-24 10:40:20 -03:00
mronstrom@build.mysql.com
c4c6bb7e75 Merge build.mysql.com:/home/bk/mysql-4.1-ndb 
into build.mysql.com:/users/mronstrom/wl2056
 2004-08-21 15:11:47 +02:00
rburnett@build.mysql.com
d3e6b5c3ad This fixes a Windows build failure. How did this build on Linux? 
logging_ok:
  Logging to logging@openlogging.org accepted
mysql_priv.h, my_time.h:
  Moved declaration of days_in_month array from mysql_priv.h to my_time.h to correct Windows build issues
 2004-08-19 22:40:31 +02:00
miguel@hegel.txg.br
da9fe0e6e2 Removed non-used variable 2004-08-17 12:20:01 -03:00
rburnett@build.mysql.com
67003d1c98 mysql_priv.h: 
Added declarations for print_msg_to_log and vprint_msg_to_log.  sql_print_error are simple functions that wrap calls to print_msg_to_log.  Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
gen_lex_hash.cc:
  Added NULL error reporting parameter to handle_options
log.cc:
  Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log.  Print_msg_to_log will write the message to the windows event log if on NT.  We now have error, warning, and information versions of sql_print_xxxx.  T his is a variation of a similar changeset WAX did.
mysqld.cc:
  Added option_error_reporter callback function and pass that into handle_options
mysql.cc:
  Added NULL as error reporter arg to the end of handle_options
Many files:
  Added NULL error reporter parameter as the last paramter to handle_options
my_getopt.c:
  Added second function pointer to server as an error reporting callback.  Added local function report_option_error that will either write the error to stderr or to the error reporting callback.  changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
my_getopt.h:
  Changed declaration of handle_options to use typedefs for the two function pointers.  added second function pointer to server as an error reporting callback
mysqld.dsp:
  Added custom build step for compiling message file and added message resource file (output of mc)
 2004-08-14 03:38:37 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
259bce85b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug4411
 2004-08-11 23:26:44 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
bc78a46ac4 Bug#4411 
Fix for server hang bug
 2004-08-11 23:24:36 +01:00
dlenev@brandersnatch.localdomain
f325a92b0a Fix for bug #4491 "timestamp(19) doesn't work". 
We should allow 19 as length of newly created TIMESTAMP fields.
 2004-08-06 12:15:40 +04:00
ndbdev@eel.hemma.oreland.se
8e74c1b78c Merge 2004-08-05 22:32:25 +02:00
ndbdev@eel.hemma.oreland.se
64618d7fe4 Merge joreland@bk-internal.mysql.com:irix 
into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04
 2004-08-05 22:19:52 +02:00
mronstrom@mysql.com
b023e1835b Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/mikron/mysql-4.1
 2004-08-05 19:20:11 +02:00
mronstrom@mysql.com
a0a5a6a6fb Remove unused config parameters 2004-08-05 18:23:01 +02:00
kent@mysql.com
48c8a11a4f mysqld.cc, mysql_test_run.c: 
Changed URL in error message, page has moved
 2004-08-05 17:05:21 +02:00
ndbdev@eel.hemma.oreland.se
f4b3e9edd6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04
 2004-08-04 14:07:36 +02:00
joreland@mysql.com
20c86363f5 Merge 4.1 with jonas irix clone 2004-08-03 14:16:16 +02:00
jan@hundin.mysql.fi
0449396a67 Added innodb_locks_unsafe_for_binlog option. This option turns off Innodb 
next-key locking. Using this option the locks InnoDB sets on index 
  records do not affect the ``gap'' before that index record. Thus, this option
  allows phantom problem.
 2004-07-20 14:15:38 +03:00
monty@mysql.com
31fe2837f9 Merge with 4.1 2004-07-12 08:20:24 +03:00
mysqldev@o2k.irixworld.net
7e6bb0eee8 Irix64 mipspro ndb compile fixes 2004-07-09 12:48:32 +02:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
antony@ltantony.rdg.cyberkinetica.com
58cec1fd6a Bug#4407 - assertion in ha_myisam.cc 
Fix assertion failure where ha_myisam::index_next() is called
  without first calling ha_myisam::ha_index_init()
 2004-07-06 16:30:50 +01:00
mysqldev@melody.local
c29cd379d7 BUG#4384 2004-07-05 07:52:20 +02:00
gordon@zero.local.lan
7071d062c9 WL#1564 Intensive test of prepared statements via 'mysqltest' 2004-07-01 16:30:29 +02:00
monty@mysql.com
b1d08ba2b4 Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03:00
mwagner@here.mwagner.org
6cd530b37c mysql-copyright: 
Cleaned-up trim_the_fat()
 2004-06-23 12:31:10 -05:00
tomas@poseidon.elisa-laajakaista.fi
769fb11057 ndb file missing in src dist 2004-06-21 11:24:08 +00:00
mwagner@here.mwagner.org
64f1cc46e9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
 2004-06-18 15:00:17 -05:00
mwagner@here.mwagner.org
bfd0c576a5 my_md5sum: 
new file, simulates 'md5sum' as a perl script
 2004-06-18 14:57:42 -05:00
miguel@hegel.txg
ba4f2c73fe Fix for bug #4182 2004-06-18 01:42:28 -03:00
mronstrom@mysql.com
80bb13716e Randomise time-out to avoid aborting both transactions in deadlock 2004-06-10 20:03:06 +02:00
bar@mysql.com
1b76aa077f charset.c: 
Fix to be ANSI C complient
  ,
 2004-06-09 12:33:30 +05:00
jplindst@t41.(none)
d6e1e47bbe Added function innobase_store_binlog_offset_and_flush_log requested by Guilhem 
to ha_innodb.cc and ha_innodb.h
 2004-06-08 15:38:22 +03:00
brian@brian-akers-computer.local
e24e1350a3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-06-05 10:43:22 -07:00
autotest@mc01.ndb.mysql.com
e69afe3921 extern"C" bug 2004-06-03 08:03:37 +02:00
tomas@poseidon.ndb.mysql.com
f265403fb7 various ndb make changes, see respective file 2004-06-01 11:19:40 +00:00
mskold@mysql.com
bc0cf2ccff Added missing ; 2004-05-28 11:23:44 +02:00
tomas@poseidon.bredbandsbolaget.se
26df6c6fc1 added shared mem + sci options for ndb 2004-05-28 09:22:27 +00:00
pem@mysql.com
71eddc362e Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
brian@brian-akers-computer.local
fee4ed7f1c Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-05-25 14:53:55 -07:00
tomas@mc05.(none)
d1b6ef1bbc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-05-25 13:07:06 +02:00
patg@krsna.patg.net
115e769be2 Merge 2004-05-24 19:06:33 -07:00
patg@krsna.patg.net
775f8042c9 logging_ok: 
Logging to logging@openlogging.org accepted
Do-compile:
  1. Option to ensure that logs are moved and then backed up on each host prior to a build
  2. Option to run build with flag "--without-ndbcluster"
 2004-05-24 17:20:22 -07:00
patg@krsna.patg.net
8421a5a6b3 see notes for Do-compile 2004-05-24 12:48:18 -07:00
brian@brian-akers-computer.local
00bd872d41 Resolving merge issues between archive and most recent changes by Monty/NDB 2004-05-21 10:06:49 -07:00
tomas@poseidon.(none)
cb07a07ed9 fix for macosx where SIGRTMIN is missing 2004-05-21 10:04:15 +00:00
brian@avenger.(none)
467cad0bfc First commit of archive example. Archive is a simple storage engine that handles inserts and selects. 2004-05-20 18:13:11 -07:00
tomas@poseidon.(none)
167ebc676b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-ndb
 2004-05-21 00:00:34 +00:00
msvensson@build.mysql.com
5415cbc0fe Fix for BUG#3839 , too many signal handlers installed 2004-05-20 21:56:29 +02:00
mysqldev@mysql.com
cf194d4b93 Merge mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/mysqldev/tulin/mysql-4.1-ndb
 2004-05-19 14:39:24 +02:00
mysqldev@mysql.com
2c2d70a243 Forte compile fixes 2004-05-19 14:38:38 +02:00
mronstrom@mysql.com
c8f36e8255 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/Users/mikron/patch_cluster
 2004-05-18 16:46:25 +02:00
pekka@mysql.com
c0d5a51e89 fix ndb odbc compile 2004-05-18 09:58:30 +02:00
pem@mysql.com
df69f93ae9 Post-merge post-merge fix (new error codes for fparser). 2004-05-14 16:10:31 +02:00
mronstrom@mysql.com
64d9f1fe22 Snippet from the Internet: 
Common Symbols

If you get errors in linking complaining about common symbols
ld: common symbols not allowed with MH_DYLIB format

Then it means that you've got a global variable in the library which has
not been assigned a value.

Got this problem with three globals in NdbDaemon.c
 2004-05-13 19:49:10 +02:00
ndbdev@ndbmaster.mysql.com
3a880e3aac Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into ndbmaster.mysql.com:/ndb/clone-4.1-ndb-daily
 2004-05-11 22:26:10 +02:00
ndbdev@ndbmaster.mysql.com
9a12b80a5b Inverted #ifdef on HAVE_MLOCKALL 2004-05-11 22:23:29 +02:00
tomas@mc05.(none)
c9c5260e7a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1
 2004-05-11 21:25:17 +02:00
timour@mysql.com
eadcae3dc1 Merge of WL#1469 with latest bk version. 2004-05-11 12:12:32 +03:00
tsmith@build.mysql.com
8746a7dab4 logging_ok: 
Logging to logging@openlogging.org accepted
item_cmpfunc.cc, ctype_recoding.test, ctype_recoding.result:
  Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() (but #3704)
 2004-05-10 23:19:50 +02:00
tulin@build.mysql.com
ff4018aa8a merge resolve 2004-05-10 17:40:57 +02:00
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
georg@beethoven.local
c745ae9503 Added additional parameter userdata for mysql_set_local_infile_handler 
to allow binding of userland functions in PHP.
 2004-05-07 14:50:10 +02:00
ingo@mysql.com
19156a3ac7 Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-bug2831
 2004-05-07 10:42:08 +02:00
jani@a80-186-24-72.elisa-laajakaista.fi
6bc03b14d9 Fixed a problem with option --where, which earlier was not dynamic. One was not able 
to use long query strings with it.
Bug#3633
 2004-05-07 01:02:57 +03:00
ingo@mysql.com
ba0697c658 Fix a forgotten skip of space at line begin for the 'system' command. 2004-05-06 16:15:46 +02:00
monty@mysql.com
d21d49a32a Merge with 4.0.19 2004-05-05 17:05:24 +03:00
joreland@mysql.com
230134152e Merge NDB patches into 4.1-clone, below is list of changesets 
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1858.1.1
# Removal of NDBT_Table
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1858.1.2
# Removal of NDBT_Table
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1858.1.3
# Fix for crashing AT
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1858.1.4
# Bug fixes in testIndex
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1866.1.5
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/tmp
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.1.5
# Fix for takeover when accessing indexes.
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1866.1.6
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/tmp
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.1
# Fixed error handling of fire_trigger_ord + lqhkeyref w.r.t indexes
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.2
# Simple retry mechanism in UTIL
# Helps testIndex -n BuildDuring _a lot_
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.3
# Misc fixes to test prg.
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.4
# Allow more retires on application errors
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.5
# Pass no of rows fetched in SUB_SYNC_CONTINUE_REQ
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1869
# wl1714
# Improve parallellism
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1870
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/wl1714
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1866.1.7
# Merge
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1871
# Merge mysql.com:/home/jonas/src/wl1714
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1872
# Fix for testScan -n ScanReadError5030
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1873
# fix testDict -n FragmentType*
# --------------------------------------------
# 04/04/14      johan@stingray.(none)   1.1866.2.1
# small fixes
# --------------------------------------------
# 04/04/14      johan@stingray.(none)   1.1874
# Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into stingray.(none):/space/bk/rep/mysql-4.1-ndb
# --------------------------------------------
# 04/04/14      johan@stingray.(none)   1.1875
# handle rep node as an api node
# --------------------------------------------
# 04/04/14      pekka@mysql.com 1.1873.1.1
# Fix for NDBT_Table removal
# --------------------------------------------
# 04/04/15      joreland@mysql.com      1.1873.1.2
# Uninitialized var.
# --------------------------------------------
# 04/04/15      johan@stingray.(none)   1.1876
# Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into stingray.(none):/space/bk/rep/mysql-4.1-ndb
# --------------------------------------------
# 04/04/15      joreland@mysql.com      1.1873.1.3
# Write pid before changing user
# (as runas user probably doesn't have permissions on pid-dir)
# --------------------------------------------
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1862.1.3
# Fix printout of varchars
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1877
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mc03.ndb.mysql.com:/space/ndb/tmp
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1862.1.4
# Hmm.. don't print attr as many times as length of array
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1878
# Merge mc03.ndb.mysql.com:/space/ndb/mysql-4.1-ndb
# into mc03.ndb.mysql.com:/space/ndb/tmp
# --------------------------------------------
# 04/04/15      joreland@mysql.com      1.1876.1.1
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
# 04/04/15      joreland@mysql.com      1.1877.1.1
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1879
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mc03.ndb.mysql.com:/space/ndb/tmp
# --------------------------------------------
# 04/04/17      joreland@mysql.com      1.1880
# LCP bug when restarting ops take's longer than DIH sending a new lcp ord
# Solution:
# Send LCP_FRAG_REP after restarting all ops
# --------------------------------------------
# 04/04/18      joreland@mysql.com      1.1881
# Missspelled ERROR_INSERT
# --------------------------------------------
# 04/04/18      joreland@mysql.com      1.1882
# Added possibility to log only distributed signals
# --------------------------------------------
# 04/04/22      joreland@mysql.com      1.1883
# Removed dependancy to libstdc++
# * pure virtual functions "__cxa_pure_virtual" is defined in libstd++ ->
#   remove all pure virtual functions
# --------------------------------------------
# 04/04/23      joreland@mysql.com      1.1884
# Various minor bug fixes for problems found while compiling
# with icc
# --------------------------------------------
# --------------------------------------------
# 04/04/25      joreland@mysql.com      1.1885
# Removed debug code (joreland:1.1875)
# --------------------------------------------
# 04/04/26      ejonore@mc03.ndb.mysql.com      1.1862.1.5
# Lock pages in memory _after_ daemon-mode (exec/fork)
# --------------------------------------------
# 04/04/27      ejonore@mc03.ndb.mysql.com      1.1862.1.6
# 1) Trap abort()
# 2) StopStart/StopAborted events
# 3) warning if memlock fails
# 4) use g_logger more often (instead of ndbout)
# 
# --------------------------------------------
# 04/04/27      joreland@mysql.com      1.1886
# bug fix for a bug in wl1714 + software upgrade
# --------------------------------------------
# 04/04/27      joreland@mysql.com      1.1887
# Cset exclude: joreland@mysql.com|ChangeSet|20040422160720|05374
# --------------------------------------------
# 04/04/27      joreland@mysql.com      1.1888
# removed libstc++ second try...
# --------------------------------------------
# 04/04/28      ejonore@mc03.ndb.mysql.com      1.1862.1.7
# 1) Don't lock FUTURE pages but only current
# 2) Do this when SIZEALT has completed
# --------------------------------------------
# 04/04/30      joreland@mysql.com      1.1889
# Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
# 04/05/03      ndb@mc03.ndb.mysql.com  1.1862.1.8
# Version update
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1862.3.1
# Changed restart behavior.
# Use "angel" process which monitor "real" process
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1862.1.9
# Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x
# into mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1890
# Merge B2 fixes
# --------------------------------------------
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1862.1.10
# Better handling of children terminations
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1862.1.11
# Fixes for angel-restarting
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1891
# Merge mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
#
 2004-05-04 11:19:19 +02:00
paul@kite-hub.kitebird.com
0682c59cff my-medium.cnf.sh: 
Correct typo, and fix up rest of sentence as well.
 2004-04-28 11:50:32 -05:00
antony@ltantony.dsl-verizon.net
28870228d4 Fix for Bug 3481 
CREATE statement allowed extra unnecessary commas
 2004-04-28 16:14:53 +01:00
monty@mishka.local
ef18b13738 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mishka.local:/home/my/mysql-4.1
 2004-04-27 15:48:48 +03:00
monty@mishka.local
21fd1d270e Merge with 4.0 2004-04-26 15:53:31 +03:00
timour@mysql.com
9f1fd5bd90 Implementation of WL#1469 (Greedy algorithm to search for an optimal execution plan). 2004-04-16 13:21:08 +03:00
brian@brian-akers-computer.local
886ef75c95 Resolved changes between example storage engine and NDB storage engine. 2004-04-14 14:36:36 -04:00
brian@brian-akers-computer.local
86952cd9a6 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1-examples
 2004-04-14 11:59:51 -04:00
tomas@mc05.(none)
40de5714b0 logging_ok: 
Logging to logging@openlogging.org accepted
stop_ndbcluster, ndb_config_2_node.ini, install_ndbcluster:
  new file
 2004-04-14 15:46:39 +02:00
magnus@neptunus.(none)
5b3aec2b90 Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
tim@sand.box
cfc019af6e Fix typos that resulted in adding names to the global namespace that 
were never defined.  This potentially caused problems when trying to link
libmysqld with shared libraries.
 2004-04-12 08:05:15 -06:00
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
jani@a80-186-24-72.elisa-laajakaista.fi
0f484ebae6 Fixed a problem with mysqld_multi log file. The default is now datadir/mysqld_multi.log, 
if doesn't exists or is not writable, then /var/log/mysqld_multi.log, if does not exists
or is not writable, then /tmp/mysqld_multi.log, but only in case the file does not yet
exists in /tmp. Otherwise log will be disabled, unless user explicitely sets it with an
option.
 2004-04-06 17:57:32 +03:00
brian@brian-akers-computer.local
e1527cd7ec Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1-examples
 2004-04-05 22:35:23 -07:00
serg@serg.mylan
3cd665ba3c Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-04-02 23:50:41 +02:00
serg@serg.mylan
7652c904c7 correct test in trigger 2004-04-02 22:31:31 +02:00
serg@serg.mylan
0c1d34a81d trying pre-delta trigger 2004-04-02 22:12:39 +02:00
dlenev@jabberwock.localdomain
a80f46bfdf WL#775 "Add status variable identifying binlog_cache_size shortage" 
Added two status variables: 
  binlog_cache_use - counts number of transactions that used somehow
    transaction temporary binary log.
  binlog_cache_disk_use - counts number of transactions that required
    disk I/O for storing info in this this binary log.
 2004-04-02 00:47:20 +04:00
brian@brian-akers-computer.local
dfba8cdf50 First commit of the skeleton storage engine. Use this example as a template to build storage engines. Also includes a new degine for marking storage engine methods as not being implemented. 2004-04-01 01:02:42 -08:00
dlenev@brandersnatch.localdomain
f38e0a935d Merge of fix for bug #2050 and bug #3307 2004-03-31 22:17:10 +04:00
dlenev@brandersnatch.localdomain
9e28b7698d "Fix" for BUG #2050 "10 to 1 performance drop with server 4.1.1". 
Actually it is not a bug but right behavior observed as pefomance 
degradation after we have forced Item_field::fix_fields() to 
re-execute each time when we are executing prep stmt.

This patch implements small optimization which heals this bad 
behavior. We are caching field position in TABLE::field array in
Item's member and are using this position for speeding up field
lookups in fix_fields() in case of its re-execution.
 2004-03-28 04:11:54 +04:00
serg@serg.mylan
9bf7e07b75 version updated after merge :) 2004-03-26 12:36:57 +01:00
monty@mysql.com
e0e0314d60 Merge with 4.0 2004-03-25 23:29:45 +02:00
serg@serg.mylan
755c068ff9 bugs-aware post-commit trigger 
cleanup (VERSION variable)
 2004-03-25 13:29:12 +01:00
serg@serg.mylan
d8a9a8267b shared IO_CACHE: protection against remove_io_share in a wrong time 
bug#3134
 2004-03-25 11:22:01 +01:00
jcole@mugatu.jcole.us
15cc92cacb Added LOCAL INFILE callback function support. 2004-03-22 19:58:49 -05:00
monty@mysql.com
b6e5c23c26 Ensure that we use unix file format (no \r\n) for all new files 
Portability fixes
 2004-03-20 12:48:14 +02:00
monty@mysql.com
350b433569 merge with 4.0 2004-03-16 22:41:30 +02:00
jani@ua72d24.elisa.omakaista.fi
8dcb41d8d9 Fixed Bug#3115. CAST AS DATE with malformed string returns NULL but IS NULL 
is false.
 2004-03-09 22:03:01 +02:00
ingo@mysql.com
235f0ffec1 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mydev/mysql/mysql-4.1
 2004-03-05 13:48:38 +01:00
mydev@mysql.com
3d13fb00b3 Fixed a type mismatch between int_table_flags and table_flags() in MyISAM handler. 2004-03-04 22:53:48 +01:00
jani@ua72d24.elisa.omakaista.fi
58a978b900 Fixed Bug#2491, INSERT DELAYED causes binary log unusable by mysqlbinlog (replication is ok) 
Setting insert delayed threads = 0 at mysql_init_command.
 2004-03-04 17:58:36 +00:00
harrison@corona.lordblink.com
ab1786129c Fix up history in readline implementation. 
Two things changed:
1. Repeated queries are only stored once in the history.
2. Multiline queries are stored in a concated format in the history, 
   in addition to pieces. 
(Push approved by serg)
 2004-03-03 15:54:37 -05:00
ulli@morbus.(none)
7b5020b215 Merge ubayer@bk-internal.mysql.com:/home/bk/mysql-4.0 
into morbus.(none):/home/ulli/work/mysql-4.0
 2004-03-01 11:24:10 +01:00
dlenev@brandersnatch.localdomain
3c58ae9e74 Fixed small race condition, when global query_id was modified 
without proper locking.
 2004-03-01 09:15:33 +03:00
Greg@greg-laptop.
59e8a77f6a Applied fixes to issues discovered during test builds on Windows. 2004-02-27 17:27:07 +01:00
Greg@greg-laptop.
f4ebcaff4d Changes to fix errors encountered in test builds on Windows. 2004-02-27 16:51:01 +01:00
serg@build.mysql.com
d0b0e5bf77 do not use static array of pastpoints in my_strtod - it is not portable 
(that is, these numbers are converted to doubles by a local OS strtod,
and on different systems they get different values)
 2004-02-27 14:40:08 +01:00
ulli@morbus.(none)
709a5d6a8b fix for bug #2905 - 
"mysqladmin.c & co fail to use MYSQL_PORT as the default value of the TCP/IP port"
 2004-02-26 19:09:49 +01:00
arjen@bitbike.com
fafc130b61 Inserted comment about lost root pwd procedure in Docs relying on command order in mysqladmin. 2004-02-25 09:46:43 +10:00
monty@mashka.mysql.fi
494e43c1f5 merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
marko@hundin.mysql.fi
42b18e6fab Remove unnecessary files 
.del-univoldmysql.i~9253a6f92058c565:
  Delete: innobase/include/univoldmysql.i
.del-univold.i~4b5ed652407f63f1:
  Delete: innobase/include/univold.i
.del-tsut.c~4a154913fc9cd5c0:
  Delete: innobase/ut/ts/tsut.c
.del-makefile~9b8356bbdb8bd94e:
  Delete: innobase/ut/ts/makefile
.del-tsttrxold.c~eb6fd6091405d54e:
  Delete: innobase/trx/ts/tsttrxold.c
.del-tstrx.c~5425c98548ec1e0d:
  Delete: innobase/trx/ts/tstrx.c
.del-makefile~16d63c17c8edf62a:
  Delete: innobase/trx/ts/makefile
.del-tsthr.c~b095667070d626a9:
  Delete: innobase/thr/ts/tsthr.c
.del-makefile~d5e4661188c1939d:
  Delete: innobase/thr/ts/makefile
.del-tssync.c~fed4676cd4eb8457:
  Delete: innobase/sync/ts/tssync.c
.del-makefile~f23368879649c806:
  Delete: innobase/sync/ts/makefile
.del-tssrv.c~b8a6f5ad9ae639c8:
  Delete: innobase/srv/ts/tssrv.c
.del-tsdbc.c~d36206bdccf338f:
  Delete: innobase/srv/ts/tsdbc.c
.del-makefile~da6e87ef29c12dca:
  Delete: innobase/srv/ts/makefile
.del-tstcur.c~a9d5cf73b020ec41:
  Delete: innobase/row/ts/tstcur.c
.del-makefile~2cdfe39689004e6:
  Delete: innobase/row/ts/makefile
.del-tsrem.c~bb4e1e2e8c2ee179:
  Delete: innobase/rem/ts/tsrem.c
.del-makefile~3e48a33b4970faef:
  Delete: innobase/rem/ts/makefile
.del-tspage.c~f5baf63f9924e43b:
  Delete: innobase/page/ts/tspage.c
.del-makefile~66de73bc499566f9:
  Delete: innobase/page/ts/makefile
.del-tsosaux.c~9ec97a83392a984c:
  Delete: innobase/os/ts/tsosaux.c
.del-tsos.c~f6057d3c171f5915:
  Delete: innobase/os/ts/tsos.c
.del-makefile~9a1d210afa6d666e:
  Delete: innobase/os/ts/makefile
.del-tsmtr.c~293250c7ebfe0d3:
  Delete: innobase/mtr/ts/tsmtr.c
.del-tsbuf.c~e8d15ee095194d2c:
  Delete: innobase/mtr/ts/tsbuf.c
.del-makefile~fdf4c2a4ddb23230:
  Delete: innobase/mtr/ts/makefile
.del-tsmem.c~cc483e2ab96e625c:
  Delete: innobase/mem/ts/tsmem.c
.del-makefile~6d58ab1de0ac572:
  Delete: innobase/mem/ts/makefile
.del-tsmach.c~af65166bb53ddfe9:
  Delete: innobase/mach/ts/tsmach.c
.del-makefile~b8cbd25992ee51b:
  Delete: innobase/mach/ts/makefile
.del-tsha.c~13dd5ea03fda370c:
  Delete: innobase/ha/ts/tsha.c
.del-makefile~1bf12ce7b2dadfd5:
  Delete: innobase/ha/ts/makefile
.del-tsfsp.c~890ead1636f0eaba:
  Delete: innobase/fsp/ts/tsfsp.c
.del-makefile~a466e9eb27493a80:
  Delete: innobase/fsp/ts/makefile
.del-del.c~35c6283be580200:
  Delete: innobase/fsp/ts/del.c
.del-tsfil.c~e554b6f3c189c081:
  Delete: innobase/fil/ts/tsfil.c
.del-makefile~1df6f952a960fef4:
  Delete: innobase/fil/ts/makefile
.del-tsdyn.c~6f976764b53f3191:
  Delete: innobase/dyn/ts/tsdyn.c
.del-makefile~f64427335fafdc65:
  Delete: innobase/dyn/ts/makefile
.del-tsdict.c~5e82f7b8ac2b2e15:
  Delete: innobase/dict/ts/tsdict.c
.del-makefile~6356c424e9747647:
  Delete: innobase/dict/ts/makefile
.del-tscom.c~26aae2c5c4ca1dce:
  Delete: innobase/com/ts/tscom.c
.del-tscli.c~2f3e4b281141eac2:
  Delete: innobase/com/ts/tscli.c
.del-makefile~608fd39568db7238:
  Delete: innobase/com/ts/makefile
.del-tsos.c~1dadfc1ef69f2ba3:
  Delete: innobase/buf/ts/tsos.c
.del-tsbuf.c~b4c3feee158ef154:
  Delete: innobase/buf/ts/tsbuf.c
.del-makefile~598acb06bf1e466:
  Delete: innobase/buf/ts/makefile
.del-tscli.c~8d35740cc1f6f864:
  Delete: innobase/btr/ts/trash/tscli.c
.del-tssrv.c~ee30b746c485aec:
  Delete: innobase/btr/ts/tssrv.c
.del-tss.c~21ae628550141a68:
  Delete: innobase/btr/ts/tss.c
.del-tsrecv97.c~dbeb3bc494b241c1:
  Delete: innobase/btr/ts/tsrecv97.c
.del-tsrecv.c~3415f8a936a8d9fd:
  Delete: innobase/btr/ts/tsrecv.c
.del-tscli.c~77fc1962db99aa2e:
  Delete: innobase/btr/ts/tscli.c
.del-tsbtrold5.c~72a60e768c944904:
  Delete: innobase/btr/ts/trash/tsbtrold5.c
.del-tsbtrins.c~3e3bb3f95f058b46:
  Delete: innobase/btr/ts/tsbtrins.c
.del-TSIT.C~f53cce6fab8d325:
  Delete: innobase/btr/ts/trash/TSIT.C
.del-tsbtrfull.c~fbcbe41b64cc71b6:
  Delete: innobase/btr/ts/tsbtrfull.c
.del-tsbtr97.c~84dbb84ea9fa267c:
  Delete: innobase/btr/ts/tsbtr97.c
.del-makefile~491918b4162b927c:
  Delete: innobase/btr/ts/makefile
.del-isql.c~bc0b8cc213905175:
  Delete: innobase/btr/ts/isql.c
 2004-02-19 11:32:07 +02:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
pem@mysql.com
c8585f3283 Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
jani@ua141d10.elisa.omakaista.fi
1ce9ae5429 An include was missing. 2004-02-10 13:11:55 +00:00
jani@ua141d10.elisa.omakaista.fi
a3dc5449e9 Added new option --sync-frm / --skip-sync-frm 
Marked --bdb-no-sync as deprecated
Added --sync-bdb-logs / --disable-sync-bdb-logs as a synonym / alternative.
 2004-02-03 18:10:45 +00:00
salle@vafla.home
5b9c62b6c3 Typo fixing 
s/expection/exception
 2004-02-02 12:09:47 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
aa31e98c90 Fix deprecation warning - database_engine => storage_engine 2004-01-18 22:30:35 +00:00
bar@deer.(none)
b13808d55f logging_ok: 
Logging to logging@openlogging.org accepted
item_strfunc.cc:
  Bug wich appeared in ctype_tis620 is fixed
 2003-12-29 18:45:13 +04:00
bar@bar.intranet.mysql.r18.ru
e0e6aab6cc ctype-big5.c: 
Like did not work in some cases
  ,
 2003-12-24 17:01:48 +04:00
sergefp@mysql.com
23b25675f2 Merge mysql.com:/home/psergey/mysql-5.0-latest-pull 
into mysql.com:/dbdata/psergey/mysql-5.0-imerge-unique
 2003-12-20 00:54:38 +03:00
pem@mysql.com
99e0ae85c7 Merge 4.1 to 5.0. 2003-12-19 18:03:27 +01:00
bar@bar.intranet.mysql.r18.ru
5be2b8b11a Fix for Bug#2151: 
"USE db"  affected the character set of further CREATE DATABASEs,
which should have not happened.
 2003-12-19 19:12:11 +04:00
psergey@psergey-rh8.(none)
b1f07034da Merge psergey-rh8.(none):/home/psergey/mysql-5.0-latest-pull 
into psergey-rh8.(none):/home/psergey/mysql-5.0-imerge-unique
 2003-12-18 17:01:35 +03:00
jani@linux.local
ecf54df991 Fixed some minor issues, revealed by compiler warnings when using 
BUILD/compile-pentium-debug-max
 2003-12-17 19:18:01 +00:00
igor@rurik.mysql.com
54628879fc Many files: 
Fixed a bug causing a crash for multi-update/multi-delete
  with impossible where (bug #1860).
 2003-12-11 14:55:48 -08:00
pem@mysql.com
63f4858030 Merged 4.1 -> 5.0 2003-12-05 13:11:50 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
afc619f0a2 WorkLog#1280 - Remove fixed table handler from lex/yacc 2003-12-02 20:23:13 +00:00
sergefp@mysql.com
486415233e Fix for bug #1980 2003-12-02 21:05:40 +03:00
pem@mysql.com
6e717133c5 Merge 4.1 to 5.0 2003-12-01 16:14:40 +01:00
sergefp@mysql.com
30b3c3bf1b Merged, most likely needs post-merge fix 2003-11-21 00:27:54 +03:00
sergefp@mysql.com
4016048d81 logging_ok: 
Logging to logging@openlogging.org accepted
sql_union.cc, sql_select.cc, opt_range.h, opt_range.cc, opt_ft.h:
  Post-merge fixes
Many files:
  new file
 2003-11-20 23:27:11 +03:00
jani@ua167d18.elisa.omakaista.fi
0b1bae4677 Added error reporting if one of the multi queries failed. 2003-11-20 20:06:51 +02:00
pem@mysql.com
28a2c6a96b Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
monty@mashka.mysql.fi
a47d56088f Merge with 4.0 tree 2003-11-18 18:54:27 +02:00
sergefp@mysql.com
6c5b4af81c Fix for bug #1820 2003-11-18 17:04:52 +03:00
psergey@psergey.(none)
4894565432 merging in index_merge (in progress, not yet working) 2003-11-13 22:14:37 +03:00
psergey@psergey.(none)
ca6c4cc30b Added index_merge access method 2003-11-13 17:52:02 +03:00
salle@vafla.online.bg
e51d0ced61 Fix for Bug #1752 Wrong letter cases. 
Thanks to Daniel Convissor
 2003-11-05 14:35:08 +02:00
ram@deer.(none)
ea5a7a3d7e fix for r-tree code (memory overlap reported by valgrind) 
new comments.
 2003-11-04 17:58:18 +04:00
monty@narttu.mysql.fi
4e4725377d Merge with 4.0 2003-11-04 09:40:36 +02:00
monty@mysql.com
4668b54837 Call my_sync() after all data is written to .frm file 
Added my_sync() to mysys which will do fsync/fdatasync/_commit() on a file.
 2003-11-02 15:55:02 +02:00
monty@mysql.com
cf535556c6 Cleanups (comments and compiler warnings) 
dded init of variable to fix core dump on startup errors
 2003-11-02 14:00:25 +02:00
konstantin@mysql.com
af02e27e3f fix for bug #1634 '"operator new" in my_new wastes memory' 2003-10-30 12:25:15 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
fc475dbfa7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl1280-part1
 2003-10-28 23:24:57 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
c7688a3a85 Worklog #1280, (Stage 1 Implementation) 
This is a starting work to remove handler name dependencies 
from the Lex/Parser.
 2003-10-28 21:39:55 +00:00
serg@serg.mylan
72d00ef0c2 cleanup 2003-10-25 22:43:19 +02:00
pem@mysql.com
fb548cbc6d Put username in the Subject line as well (with the changeset number). 2003-10-23 15:24:48 +02:00
pem@mysql.com
337238b78a Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
harrison@bud.lordblink.com
672a7791c4 Add in bit_xor function (approved by Sergei) 2003-10-15 02:11:03 -04:00
paul@ice.snake.net
1ba7e941a6 Minor edits. 2003-10-03 11:42:37 -05:00
monty@mishka.mysql.fi
70da491d34 Add proc table if not exists 2003-10-01 16:50:50 +03:00
ram@gw.mysql.r18.ru
df59678b95 A fix. Please never use 'ulong' here! 2003-09-24 15:41:09 +05:00
pem@mysql.com
8d884c02bb Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
monty@mishka.mysql.fi
c22c1d8a4d merge 2003-09-24 10:24:56 +03:00
monty@mishka.mysql.fi
b0ae222ea2 Merge script with 4.1 2003-09-24 09:08:33 +03:00
ram@gw.mysql.r18.ru
50254237de Fix for the bug #1333: COMPRESS(NULL) segfaults. 2003-09-19 12:25:03 +05:00
monty@mashka.mysql.fi
73f66f68fd merge with 4.0.15 2003-09-11 20:24:14 +03:00
carsten@tsort.bitbybit.dk
e0d04fd22b Add QUICK as mysql-recover option in mysqld --help 2003-09-05 14:44:21 +02:00
gerberb@ou800.zenez.com
7005115e97 Change set for gcc patch on OpenUNIX and UnixWare SCO is the OS vendor. 2003-09-03 08:07:58 -06:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
kostja@oak.local
7a51e36929 removed stale comment 
13:58 <monty> konstantin: the comment is missplaced (probably after merge).
          You can remove it
 2003-08-29 14:38:39 +04:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02:00
gweir@build.mysql.com
d7367dea43 Bootstrap: 
Corrections to Bootstrap for --win-dist
 2003-08-13 02:13:45 +02:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
wax@mysql.com
10f4883c83 Merge mysql.com:/home/wax/mysql/mysql-4.0 
into mysql.com:/home/wax/mysql/mysql-4.0chsize
 2003-08-10 05:40:16 +06:00
monty@mashka.mysql.fi
1279f9b024 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2003-08-07 21:19:43 +03:00
greg@gcw.ath.cx
c10d1204bc Add --win-dist parameter to Bootstrap, to run make_win_src_distribution 2003-08-07 14:19:42 -04:00
dlenev@build.mysql.com
3f5faaaff9 openssl_1.result, openssl_1.test: 
Aligned test with regenerated SSL certs
Many files:
  Regenerated expired certificates
 2003-08-07 15:20:15 +02:00
monty@mashka.mysql.fi
a5cf27b65b Merge 2003-08-05 16:08:36 +03:00
konstantin@mysql.com
4dc963f6d6 Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
 2003-08-01 19:44:27 +04:00
kostja@oak.local
f54d9df31b added disable_query_log to fulltext2.test 2003-08-01 18:49:30 +04:00
wax@mysql.com
5eb2c03f84 Merge mysql.com:/home/wax/mysql/mysql-4.0 
into mysql.com:/home/wax/mysql/mysql-4.0chsize
 2003-07-31 04:17:42 +06:00
wax@mysql.com
99df703bcb BUG 
Add functions SetFilePointerEx and SetEndOfFile for huge 
tables instead of chsize
Move chsize to right place
 2003-07-31 04:14:36 +06:00
dlenev@mysql.com
8f50cd0472 Fix security bug. mysqld server without ssl support was completly 
ignorant about ssl_type attribute
 2003-07-30 03:33:48 +04:00
gweir@build.mysql.com
56305765a4 logging_ok: 
Logging to logging@openlogging.org accepted
README.1st:
  new file - Readme for Windows distribution
 2003-07-29 00:40:50 +02:00
dlenev@dlenev.mshome
b5faccbbc3 Fix security bug. mysqld server without ssl support was completly 
ignorant about ssl_type attribute
 2003-07-23 18:50:18 +04:00
greg@gcw.ath.cx
6f60424629 mysql_test_run.c and associated files, with my initial changes and WAX's changes for Windows 2003-07-23 01:35:24 -04:00
monty@mashka.(none)
428e348139 Portability fixes for Redhat 9 2003-07-18 12:35:29 +03:00
monty@mashka.(none)
30cfe09adf Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.(none):/home/my/mysql-4.1
 2003-07-15 15:53:20 +03:00
paul@ice.local
bc8d48920e perror.c: 
fix typo.
 2003-07-12 11:45:43 -05:00
pem@mysql.telia.com
9c3a7a6ba3 Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02:00
monty@mashka.mysql.fi
ca2913a07e Merge with 3.23 tree to get latest bug fixes 2003-07-01 15:02:16 +03:00
serg@sergbook.mylan
d9287bfe61 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-06-23 12:49:38 +02:00
serg@sergbook.mylan
c6d9d57b37 fixed bug in references column grants 2003-06-23 12:48:55 +02:00
bk@mysql.r18.ru
cec3fb4a25 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/bk/mysql-4.1
 2003-06-21 19:42:36 +05:00
miguel@hegel.(none)
10c81fb52d Fix error msg. Bug #681 2003-06-19 12:38:14 -04:00
miguel@hegel.(none)
354af955bc Fix error msg. Bug #681 2003-06-19 12:17:23 -04:00
greg@gcw.ath.cx
a05ccddd9a Tagged ChangeSet 1.1385 as mysql-3.23.57 2003-06-19 04:02:29 -04:00