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