Commit graph

843 commits

Author SHA1 Message Date
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
monty@mysql.com
49cd04b510 Merge on pull 2004-09-09 07:26:28 +03: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
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
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