mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
42964 commits 2781 branches 343 tags 1.6 GiB
Commit graph

1669 commits

Author SHA1 Message Date
tsmith@siva.hindu.god
7a2d8c14dd Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots. 
Fixes:
- Bug #24712: SHOW TABLE STATUS for file-per-table showing incorrect time fields
- Bug #24386: Performance degradation caused by instrumentation in mutex_struct
- Bug #24190: many exportable definitions of field_in_record_is_null
- Bug #21468: InnoDB crash during recovery with corrupted data pages: XA bug?
 2007-01-04 19:51:34 -07:00
brian@zim.(none)
c578350e05 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2007-01-04 12:06:40 -08:00
brian@zim.(none)
452a1331b2 The CSV format has always relied on numbers being quoted, which doesn't always happen. This fixes that so that numbers can now be unquoted (and the output does this as well so that the log takes up less space). 2007-01-04 11:41:17 -08:00
baker@bk-internal.mysql.com
9ffaf185f0 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-01-04 19:54:52 +01:00
jonas@perch.ndb.mysql.com
a1fdeba328 ndb - bug#25329 
extra sledge hammer, (real 51)
  use dicklock to prevent SUB_START_REQ during node recovery
 2007-01-04 11:13:19 +01:00
jonas@perch.ndb.mysql.com
8cf69ddb8b ndb - recommit extra version info to real-51 2007-01-04 10:59:12 +01:00
jonas@perch.ndb.mysql.com
db8cd1ec44 ndb - bug#25329 
Fix most obvious error in dict/suma error handling of events
 2007-01-04 10:03:11 +01:00
brian@zim.(none)
6ff7092698 Split out the hidden class from the ha_tina file (probably should have just deleted it...) but this is a bit better. 2007-01-03 17:26:45 -08:00
istruewing@chilla.local
54c147a1bc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-01-03 10:27:51 +01:00
jonas@perch.ndb.mysql.com
c73b27f59b Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-01-03 06:47:23 +01:00
malff/marcsql@weblab.(none)
0055056c91 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-merge
 2007-01-02 14:18:13 -07:00
kent@kent-amd64.(none)
c92b3b9b6a Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-01-01 10:54:14 +01:00
holyfoot/hf@hfmain.(none)
b4c0867df1 Merge mysql.com:/d2/hf/clean/my51-clean 
into  mysql.com:/d2/hf/common/my51-common
 2006-12-31 12:41:42 +04:00
kent@mysql.com/kent-amd64.(none)
67868597bb Many files: 
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header
 2006-12-31 02:29:11 +01:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:32:21 +01:00
kent@kent-amd64.(none)
895e442dbf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:04:59 +01:00
svoj@april.(none)
de87e3174c Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-12-30 04:36:06 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
842b23a8fc WL#3630 (add embedded server to pushbuild) 
5.1-related fixes
libmysqld/Makefile.am fixed to recompile and link ha_*.cc files that
keep dependance on THD structure.
Minor fixes to make tests working.
 2006-12-28 09:42:04 +04:00
tomas@poseidon.
7b9a5f6de2 ndb: remove compiler warnings 2006-12-27 14:16:34 +01:00
tomas@poseidon.
044c410968 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
 2006-12-27 11:01:54 +01:00
kent@kent-amd64.(none)
2a10b99907 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-27 02:24:40 +01:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa Many files: 
Changed header to GPL version 2 only
 2006-12-27 02:23:51 +01:00
tsmith/tim@siva.hindu.god
0cb9cee7f4 Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
 2006-12-26 16:49:10 -07:00
acurtis/antony@ltamd64.xiphis.org
54133c7e38 Merge xiphis.org:/home/antony/work2/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/mysql-5.1-engines-merge
 2006-12-26 12:33:21 -08:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:20:40 +01:00
patg@radha.patg.net
2e538b4192 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
 2006-12-22 08:57:32 -05:00
patg@radha.patg.net
efefea6a5e WL #3031 
* Various windows errors fixed
* Increased max key length for federated
 2006-12-21 22:38:54 -05:00
tsmith/tim@siva.hindu.god
8075fc447e Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-21 18:23:14 -07:00
istruewing@chilla.local
dee46f9100 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-21 18:41:01 +01:00
msvensson@pilot.mysql.com
045a953909 Merge bk-internal:/home/bk/mysql-5.1-ndb 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
 2006-12-21 17:38:44 +01:00
msvensson@pilot.mysql.com
a498886d74 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
 2006-12-21 15:12:15 +01:00
tsmith/tim@siva.hindu.god
ab4c0f3b81 Merge siva.hindu.god:/usr/home/tim/m/bk/50-build 
into  siva.hindu.god:/usr/home/tim/m/bk/51-build
 2006-12-20 15:46:36 -07:00
istruewing@chilla.local
80b97a6b54 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-20 20:14:28 +01:00
patg@radha.patg.net
b2008230ef WL #3031 
fixing pushbuild warnings and errors
 2006-12-20 13:40:58 -05:00
mskold/marty@mysql.com/linux.site
f55af1eade ndb_dd_ddl.test, ndb_dd_ddl.result, ha_ndbcluster.cc: 
bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed TABLESPACE declaration for STORAGE MEMORY
Makefile:
  Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile -> storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
mgmapi_logevent2.cpp:
  Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp
Makefile:
  Rename mgmapi_logevent_dual to mgmapi_logevent2
mgmapi_logevent2.cpp:
  Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp
 2006-12-20 15:15:26 +01:00
istruewing@chilla.local
d17a8096a9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-19 17:12:06 +01:00
holyfoot/hf@mysql.com/deer.(none)
76ab2a81df bug #22451 (Partitions: duplicating results with ENGINE=FEDERATED) 
As presently PARTITIONS + FEDERATED just doesn't work i added error message
to inform user about that.
Should be enabled again after releted WL's completion.
 2006-12-19 16:37:50 +04:00
trudy@linux.site
6e258403c5 Updated file to use doxygen commenting style. 2006-12-18 18:08:38 -08:00
trudy@linux.site
f498540b3f Added back missing closing brace at file-end. 2006-12-18 17:16:40 -08:00
trudy@linux.site
9351d5e586 Update file to use doxygen commenting style. 2006-12-18 16:52:56 -08:00
trudy@linux.site
7b74da641f Updated file to use doxygen commenting style. 2006-12-18 14:28:15 -08:00
baker@bk-internal.mysql.com
b1d173f510 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-18 17:57:34 +01:00
lzhou/zhl@dev3-63.dev.cn.tlan
328a8ccaf6 BUG#22261 remove global variable global_mgmt_server_check from ClusterMgr 2006-12-15 17:49:13 +00:00
jonas@perch.ndb.mysql.com
ec4030cf71 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-15 17:14:41 +01:00
jonas@perch.ndb.mysql.com
2e37545419 merge fix 2006-12-15 17:12:41 +01:00
jonas@perch.ndb.mysql.com
e8e875ca33 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-15 16:57:43 +01:00
msvensson@shellback.
5a31bff73d Fix VC++ warning about extra ; delimiter 2006-12-15 10:45:25 +01:00
gni/root@dev3-221.dev.cn.tlan
3397f66ae5 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21715
 2006-12-14 19:08:11 +08:00
gni/root@dev3-221.dev.cn.tlan
eb0aec33e0 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug21715 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21715
 2006-12-14 18:52:37 +08:00
gni/root@dev3-221.dev.cn.tlan
975908c1fb BUG #19146 If Backup parameters incorrectly set, the data nodes can't start. 2006-12-14 18:10:18 +08:00
lzhou/zhl@dev3-63.dev.cn.tlan
08aac4349a Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-63.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug22025
 2006-12-12 20:19:32 +00:00
jonas@perch.ndb.mysql.com
691898c9a7 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-12 16:23:02 +01:00
jonas@perch.ndb.mysql.com
47a33ee5d0 ndb - bug#24949 
make sure not too poll to long, in case of hb-failure of last db-node
 2006-12-12 16:21:06 +01:00
gluh@gluh.(none)
c6d9cf1b12 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2006-12-12 17:59:34 +04:00
jonas@perch.ndb.mysql.com
f176467bbd Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-12 13:31:03 +01:00
jonas@perch.ndb.mysql.com
05dd5fc20c ndb - bug#25001 
make sure DISK flag is set on DATA column for blob table
 2006-12-12 13:09:20 +01:00
jonas@perch.ndb.mysql.com
6caf18ca8c ndb - style 
split assignment into 2 lines
 2006-12-12 13:07:22 +01:00
kostja@bodhi.local
bc6e73873d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2006-12-12 13:57:28 +03:00
jonas@perch.ndb.mysql.com
57d7f39556 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-11 16:19:22 +01:00
jonas@perch.ndb.mysql.com
7766aa089e ndb - bug#24664 
Fix in bug fix, make sure LCP_SKIP is only used for inserts...
 2006-12-11 16:18:34 +01:00
patg@govinda.patg.net
f9097b86af Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge
 2006-12-08 22:30:18 -05:00
patg@govinda.patg.net
98062f567d WL# 3031 
Post-commit issues fixed
* Test results for other tests fixed due to added error #s
* Memory allocation/free issues found with running with valgrind
* Fix to mysql-test-run shell script to run federated_server test (installs
mysql.servers table properly)
 2006-12-08 22:19:51 -05:00
pgalbraith@bk-internal.mysql.com
23f0c6d765 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-09 02:34:42 +01:00
jonas@perch.ndb.mysql.com
11edb43a37 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-08 22:18:59 +01:00
jonas@perch.ndb.mysql.com
3358f4f14b ndb - bug#24917 2006-12-08 17:21:29 +01:00
jonas@perch.ndb.mysql.com
6f01db2285 ndb - bug#24914 
Fix start transaction with hint from ndbapi
 2006-12-08 16:15:59 +01:00
istruewing@chilla.local
05dde1f311 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-08 15:55:56 +01:00
jonas@perch.ndb.mysql.com
a460d5f288 ndb - bug#21948 
Fix bug in previous changeset...causing SR problems with disk
 2006-12-08 10:24:48 +01:00
jonas@perch.ndb.mysql.com
ca3d0cf5b0 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-07 15:25:40 +01:00
jonas@perch.ndb.mysql.com
3ab75d971d ndb - bug#21948 & bug#17605 
fix alloc/free extent in undo log
  allow extent to be reused once a lcp is finished (instead of when next lcp starts)
 2006-12-07 15:25:02 +01:00
baker@bk-internal.mysql.com
37f7e29db2 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-06 20:26:10 +01:00
jonas@perch.ndb.mysql.com
4456144c58 ndb - add support for periodic mem-reporting 2006-12-06 14:38:32 +01:00
jonas@perch.ndb.mysql.com
174d561489 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-06 13:28:13 +01:00
jonas@perch.ndb.mysql.com
b7deb4dcec Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-06 13:10:00 +01:00
jonas@perch.ndb.mysql.com
315a4e18c8 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-05 22:45:17 +01:00
msvensson@neptunus.(none)
90226bbc33 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-05 19:19:58 +01:00
msvensson@neptunus.(none)
3ad4878385 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-05 18:52:58 +01:00
msvensson@neptunus.(none)
d8e6f01396 Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-12-05 18:50:46 +01:00
jonas@perch.ndb.mysql.com
d720cd2786 ndb - bug#24664 
1) run lcp snapshot for both MM and DD tables (so I dont have to change restore to use WRITE)
  2) fix >= and > bug in lcp skip/keep handling
  3) very cool test prog for this :-)
 2006-12-05 15:10:56 +01:00
holyfoot/hf@deer.(none)
1409b448ac Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/22634/my51-22634
 2006-12-05 12:52:59 +04:00
mskold/marty@linux.site
2b3789dd5a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-12-05 09:38:12 +01:00
brian@zim.(none)
f85acb894c This updates archive to use new header information in az files and makes way for combining the meta data file with the AZ file. 2006-12-04 22:01:48 -08:00
tsmith/tim@siva.hindu.god
97f48ef129 Change ::fileno() to fileno() in ndb/common/util/File.cpp. 
fileno(), and many other stdio functions, may be macros
(at least on *BSD).

Don't explicitly qualify it with global scope (::fileno()),
because it causes syntax errors.

<cstdio> doesn't define *most* of these macros.

It still has a macro for fileno(), however, on FreeBSD 6.1,
so even using <cstdio> isn't a fix for this.  Better to
just avoid ::standard_library_function() in general, in
order to be portable.
 2006-12-04 14:41:08 -07:00
istruewing@chilla.local
70e56f06cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-04 20:56:37 +01:00
msvensson@neptunus.(none)
971c783f7d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-04 19:11:55 +01:00
msvensson@neptunus.(none)
6072b7a4c4 Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-12-04 18:44:14 +01:00
iggy@rolltop.ignatz42.dyndns.org
b70d2b9341 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my51-bug17951 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-12-04 12:38:41 -05:00
iggy@rolltop.ignatz42.dyndns.org
76d43f1fdd Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my50-bug17951 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my51-bug17951
 2006-12-04 12:30:58 -05:00
holyfoot/hf@deer.(none)
d64142e2e6 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/22634/my51-22634
 2006-12-04 20:18:30 +04:00
petr/cps@outpost.site
dd8ff0ad33 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  outpost.site:/home/cps/mysql/trees/5.1-runtime-19044
 2006-12-04 18:47:16 +03:00
jonas@perch.ndb.mysql.com
630636a27c ndb - bug#24166 
SR crash if table with disk with hidden primary key...
 2006-12-04 10:06:51 +01:00
brian@zim.(none)
4eba36ee3b Fixed problems with original gzio() functions not being able to correctly return lengths of long rows. 2006-12-03 22:09:32 -08:00
petr/cps@outpost.site
b44bb83a27 Fix Bug #21328 mysqld issues warnings on ALTER CSV table to MyISAM 2006-12-04 03:07:44 +03:00
baker@bk-internal.mysql.com
dbe5f0acc5 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-03 21:19:35 +01:00
brian@zim.(none)
c4a1c72b5e Formailized the row buffer structure, implemented new streaming format. 2006-12-02 00:30:49 -08:00
brian@zim.(none)
31d67280f7 This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h 2006-12-01 17:26:52 -08:00
patg@radha.tangent.org
a3e85cce4e WL# 3031 
Backport of functionality in private 5.2 tree. 

Added new language to parser, new mysql.servers table and associated code
to be used by the federated storage engine to allow central connection information
per WL entry.
 2006-12-01 19:47:45 -05:00
istruewing@chilla.local
f7657f47c5 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-01 23:01:33 +01:00
istruewing@chilla.local
cc4e2a85c6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-01 22:59:51 +01:00
istruewing@chilla.local
fe206c71a7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-01 22:56:43 +01:00
lzhou/zhl@ts3-34.ts.cn.tlan
da0ce3628b BUG#22025 Return correct error message when transporter error occored 2006-12-01 20:57:07 +00:00
mskold/marty@linux.site
6f0e7a2631 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-01 21:12:13 +01:00
mskold/marty@linux.site
9e56779f97 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-12-01 16:44:50 +01:00
mskold/marty@linux.site
93b7491421 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-01 16:37:13 +01:00
andrey@example.com
8fcf14210d Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  example.com:/work/bug24395-v2/my51
 2006-12-01 16:27:48 +01:00
mskold/marty@mysql.com/linux.site
cde79e4f79 Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
jonas@perch.ndb.mysql.com
7a0179e178 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-01 14:06:15 +01:00
jonas@perch.ndb.mysql.com
764304031d ndb - bug#24655 
Handle events "differently" so that dict doesnt get lock too often
 2006-12-01 14:04:06 +01:00
jonas@perch.ndb.mysql.com
fc09c8a62d Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 13:58:24 +01:00
andrey@example.com
afb930947d Merge example.com:/work/bug24395-v2/my50 
into  example.com:/work/bug24395-v2/my51
 2006-12-01 11:37:33 +01:00
jonas@perch.ndb.mysql.com
32c67ca05f Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-01 11:32:52 +01:00
jonas@perch.ndb.mysql.com
37f97b29c0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 11:25:08 +01:00
jonas@perch.ndb.mysql.com
13c44a9197 ndb - bug#24717 
fixes to testprogram to test new impl. in 5.1
 2006-12-01 11:08:53 +01:00
jonas@perch.ndb.mysql.com
75467cc9f1 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 10:33:28 +01:00
jonas@perch.ndb.mysql.com
f1722c76a0 ndb - 
fix merge error
 2006-12-01 10:29:45 +01:00
pekka@orca.ndb.mysql.com
b304b3f8e1 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
 2006-12-01 10:10:22 +01:00
jonas@perch.ndb.mysql.com
b20c6e69ad ndb - bug#24717 
5.1 version
  remove 5.0 version
  add general routing signal
  send tckeyref routed if needed...
 2006-12-01 09:37:17 +01:00
jonas@perch.ndb.mysql.com
8f4dc87d98 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 09:14:12 +01:00
jonas@perch.ndb.mysql.com
3bf0a9d311 ndb - bug#24476 
Fix typo that yeilded rare crash in ACC
 2006-12-01 08:54:28 +01:00
gni/root@ts3-168.ts.cn.tlan
dfd2c8f4fb For merging mysql-5.1-new-ndb-bj tree into mysql-5.1-new-ndb tree 2006-12-01 12:16:25 +08:00
gni/root@ts3-168.ts.cn.tlan
24b1feea03 Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
 2006-12-01 11:35:05 +08:00
pekka@orca.ndb.mysql.com
6758c1679c ndb - bug#21690: fix typo which changed blob parts distribution 2006-12-01 02:06:37 +01:00
monty@narttu.mysql.fi
693b906f6e Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-30 23:27:16 +02:00
monty@mysql.com/narttu.mysql.fi
908ff4b1d1 After merge fixes 
Marked some functions as noreturn
 2006-11-30 23:23:23 +02:00
monty@narttu.mysql.fi
430d215c58 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-30 22:38:12 +02:00
msvensson@neptunus.(none)
5f7f1329ee Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-11-30 17:15:05 +01:00
mskold/marty@linux.site
34cfad6486 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-11-30 15:48:28 +01:00
mskold/marty@linux.site
d7e375680a Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-11-30 15:31:20 +01:00
mskold/marty@linux.site
6db1610c21 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-11-30 14:45:54 +01:00
mskold/marty@mysql.com/linux.site
9169edf348 Removed return of illegal pointer, changed signatures to ndb_mgm_get_clusterlog_severity_filter and ndb_mgm_get_clusterlog_loglevel 2006-11-30 13:30:59 +01:00
monty@mysql.com/narttu.mysql.fi
3a35c30027 Fixed compiler warnings (Mostly VC++): 
- Removed not used variables
- Changed some ulong parameters/variables to ulonglong (possible serious bug)
- Added casts to get rid of safe assignment from longlong to long (and similar)
- Added casts to function parameters
- Fixed signed/unsigned compares
- Added some constructores to structures
- Removed some not portable constructs

Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
(Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
 2006-11-30 03:40:42 +02:00
baker@bk-internal.mysql.com
082de8dfce Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-30 01:45:16 +01:00
monty@narttu.mysql.fi
717284b85c Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-29 23:07:15 +02:00
msvensson@shellback.(none)
521464755c Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
 2006-11-29 19:32:36 +01:00
kent@mysql.com/kent-amd64.(none)
ea5c7f9756 Many files: 
Changed paths to ndb include directory to include "storage"
Makefile.am:
  Adjusted path to yaSSL libtool libraries
ssl.m4:
  Use libtool way of specifying yaSSL libraries
 2006-11-29 18:36:51 +01:00
baker@bk-internal.mysql.com
94dc5d5379 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-29 18:31:13 +01:00
msvensson@shellback.(none)
7ddc43e305 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 15:44:09 +01:00
jonas@perch.ndb.mysql.com
e699ca7304 ndb - bug#24105 
Handle not started nodes correctly (for X restart)
  i.e dont wait for NF_COMPLETEREP
      but settle with NODEFAIL_REP
 2006-11-29 13:10:14 +01:00
mskold/marty@linux.site
77a59a1f48 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-11-29 11:55:52 +01:00
istruewing@chilla.local
172156d62d Merge chilla.local:/home/mydev/mysql-5.0-bug23139 
into  chilla.local:/home/mydev/mysql-5.1-bug23139
 2006-11-29 11:17:35 +01:00
brian@zim.(none)
8a9c481e0d Varchar hack to clean strings removed. 2006-11-28 18:30:41 -08:00
baker@bk-internal.mysql.com
f175a892ab Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-28 22:22:52 +01:00
kent@kent-amd64.(none)
2264dc7da0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-28 18:31:53 +01:00
msvensson@neptunus.(none)
e135cbde89 Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-11-28 16:54:49 +01:00
jonas@perch.ndb.mysql.com
9381d8c431 ndb - bug#24544 
fix so backup message is printed even in case of "ndb_mgm -e"
 2006-11-28 15:11:13 +01:00
monty@mysql.com/nosik.monty.fi
93f246d4c1 Fixed portablity problem 
Removed warnings from mysqltest scripts
 2006-11-28 05:43:30 +02:00
kent@kent-amd64.(none)
e99c548bcd Merge mysql.com:/home/kent/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/mysql-5.1
 2006-11-27 23:12:05 +01:00
monty@mysql.com/nosik.monty.fi
0e149b7170 Removed compiler warnings 
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable
 2006-11-27 18:16:08 +02:00
mskold/marty@mysql.com/linux.site
9f572b7d4b bug#24470 MySQL Servers crashes during creating new tables with blob column: fix of error handling at resource shortage 2006-11-27 11:49:43 +01:00
monty@mysql.com/nosik.monty.fi
fa81a82e7f Fixed a LOT of compiler warnings 
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
 2006-11-27 01:47:38 +02:00
msvensson@neptunus.(none)
58a8b34e20 Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-11-23 18:28:16 +01:00
jonas@perch.ndb.mysql.com
60b19639b9 ndb - bug#24543 
Resend if master dies during alloc node id
 2006-11-23 14:34:24 +01:00
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-22 14:11:36 +02:00
baker@bk-internal.mysql.com
098571df33 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-22 05:54:30 +01:00
monty@nosik.monty.fi
38a92caeb7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-21 23:12:45 +02:00
monty@mysql.com/nosik.monty.fi
f6682e2743 Added --debug-info to most clients to detect memory leaks in mysql-test-run 
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
 2006-11-21 22:32:58 +02:00
jonas@perch.ndb.mysql.com
32f4f8908e ndb - no bugs number 
1) Make sure not to read uninitialized data in unique index code
      harmless (atleast before dynattr)
  2) Dont update p_latest_trans_gci
      for dirty unique index lookup
 2006-11-21 14:23:42 +01:00
jonas@perch.ndb.mysql.com
b455689440 ndb - bug#24331 
Make sure LCP scan record is correct initialized
 2006-11-21 14:21:11 +01:00
jonas@perch.ndb.mysql.com
9e0be46731 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-11-21 14:18:52 +01:00
msvensson@neptunus.(none)
dad28e635d Fix DBUG_ENTER to print the correct function name 2006-11-21 12:53:05 +01:00
jonas@perch.ndb.mysql.com
60dbbadd64 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-11-21 12:06:34 +01:00
jonas@perch.ndb.mysql.com
1a1b112a3e Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-11-21 11:59:21 +01:00
brian@zim.(none)
39458a6e1b This straightens up usage of have_ variables, and removes dead -skip-isam option. 2006-11-20 14:04:07 -08:00
msvensson@shellback.(none)
d2c45ec3c5 Bug#24361 valgrind error when shutting down mysqld connected to cluster 
- Disconnect from transporter before starting to delete objects
 2006-11-20 21:11:45 +01:00
brian@zim.(none)
f0c661f1ac Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location. 2006-11-19 18:01:54 -08:00
msvensson@neptunus.(none)
ad47d85a90 Bug#24361 valgrind error when shutting down mysqld connected to cluster 
- Disconnect from transporter before starting to delete objects
 2006-11-17 13:18:09 +01:00
pekka@orca.ndb.mysql.com
caaadb9b05 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-misc 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-misc
 2006-11-16 18:15:03 +01:00
holyfoot/hf@mysql.com/deer.(none)
f8263518eb bug #22634 (partitioned tables with DATA DIRECTORY option corrupts table) 
In fact the problem is inside the ARCHIVE engine.
It stores real datapath inside the ARM file, but doesn't implement
specific ha_archive::rename_table function.
As the ALTER TABLE statement first creates the table with the temporary
name and then renames it to the normal one, we get the temporary name
saved in ARM what leads to "can't open file" error.
Code modified to store only path in the ARM, without filename.
 2006-11-16 15:13:48 +04:00
brian@zim.(none)
c13bf0e466 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/unmerge-5.1
 2006-11-15 18:04:35 -08:00
brian@zim.(none)
5649195493 This finished the bzero() on varchar patch I wrote a few months ago. It also completes the data_length() method I added to Fields to determine the length of data for a particular data type. I have many uses for this :) 2006-11-15 17:55:17 -08:00
istruewing@chilla.local
c1bee74dff Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-11-15 14:39:05 +01:00
Justin.He/justin.he@dev3-47.dev.cn.tlan
c4151cc450 Merge dev3-47.dev.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-47.dev.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/bug19203-5.1-new-ndb-bj
 2006-11-14 09:56:30 +08:00
Justin.He/justin.he@dev3-47.dev.cn.tlan
40888f48b9 BUG#19808, Online config. Wrong error message if DataMemory less than a data on cluster 2006-11-14 09:33:43 +08:00
mskold/marty@linux.site
e7a356a99d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-11-13 13:01:31 +01:00
lars@black.(none)
63c906f749 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-11-13 12:45:31 +01:00
Justin.He/justin.he@dev3-47.dev.cn.tlan
6f2724a251 Bug#19203, Different error reports for similar cases - unable allocate memory 2006-11-13 15:31:59 +08:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
eb28e03189 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug24190_many_field_in_rec_is_0
 2006-11-12 18:04:19 +02:00
istruewing@chilla.local
502912b8d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-11-12 14:15:01 +01:00
baker@bk-internal.mysql.com
52e03bac84 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-11 02:25:40 +01:00
brian@zim.(none)
b46c727a66 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-11-10 17:25:39 -08:00
brian@zim.(none)
739f2c27d0 This patch fixes the example engine, the example parser, and the example daemon to compile. AKA You can now test that the interface is actually working :) 2006-11-10 17:21:59 -08:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
d3976edabe Bug #24190 many exportable definitions of field_in_record_is_null 
mysql had several(2) exportable definitions of field_in_record_is_null function.

Fixed with adding static.
 2006-11-10 17:22:43 +02:00
mskold/marty@linux.site
6ad1b4f92c Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-11-10 11:38:54 +01:00
stewart@willster.(none)
2f20405ebc BUG#24143 Heavy file fragmentation with multiple ndbd on single fs 
If we have the XFS headers (at build time) we can use XFS specific ioctls
(once testing the file is on XFS) to better allocate space.

This dramatically improves performance of mysql-test-run cases as well:

e.g.
number of extents for ndb_dd_basic tablespaces and log files
BEFORE this patch: 57, 13, 212, 95, 17, 113 
WITH this patch  :  ALL 1 or 2 extents

(results are consistent over multiple runs. BEFORE always has several files
with lots of extents).

As for timing of test run:
BEFORE
ndb_dd_basic                   [ pass ]         107727
real    3m2.683s
user    0m1.360s
sys     0m1.192s

AFTER
ndb_dd_basic                   [ pass ]          70060
real    2m30.822s
user    0m1.220s
sys     0m1.404s

(results are again consistent over various runs)

similar for other tests (BEFORE and AFTER):
ndb_dd_alter                   [ pass ]         245360
ndb_dd_alter                   [ pass ]         211632
 2006-11-10 01:08:35 +11:00
tsmith@quadxeon.mysql.com
18080530d7 Applied innodb-5.1-ss1004 
Fixes:
- Bug #15815: Very poor performance with multiple queries running concurrently
- Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #24089: Race condition in fil_flush_file_spaces()
 2006-11-09 05:01:19 +01:00
stewart@willster.(none)
e07d563a4d Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work
 2006-11-08 15:23:46 +11:00
stewart@willster.(none)
753d0a3ad1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work
 2006-11-08 15:15:50 +11:00
lars/lthalmann@dl145h.mysql.com
3776e9622b Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-11-07 19:26:31 +01:00
jonas@perch.ndb.mysql.com
10b082f02a Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-11-07 13:59:46 +01:00
jonas@perch.ndb.mysql.com
4bf35faaf2 ndb - bug#24039 
Make sure index scan does not commitDelete
 2006-11-07 13:59:14 +01:00
jonas@perch.ndb.mysql.com
15f996f355 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-11-06 15:12:08 +01:00
jonas@perch.ndb.mysql.com
ebf4de96e3 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-11-06 15:09:58 +01:00
msvensson@neptunus.(none)
899dca14ee Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-03 17:53:10 +01:00
stewart@willster.(none)
e4f6760016 BUG#20065 Erroneous error message at Node Restart if MaxNoOfOrderedIndexes changed too low 
nicer error message to user, along with error code to help track down the problem.
 2006-11-03 19:05:09 +11:00
cmiller@zippy.cornsilk.net
b074e13483 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-02 17:51:59 -05:00
stewart@willster.(none)
dd2cea1698 remove OSE 2006-11-03 02:18:45 +11:00
stewart@willster.(none)
be7baa4f75 BUG#22309 FileLogHandler::createNewFile() isn't thread safe - may loose log messages 
BUG#22305  	SysLogHandler not thread safe
BUG#22313  	can get duplicate log messages in cluster log

Fix all these problems with one patch. Make Logger, hence EventLogger (with a 
bit more) thread safe.
 2006-11-03 01:12:30 +11:00
stewart@willster.(none)
d345a1fdf7 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work
 2006-11-02 23:46:59 +11:00
lzhou/root@dev3-138.dev.cn.tlan
c10719c605 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19352 
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug19352
 2006-11-02 11:03:48 +00:00
kostja@bodhi.local
aaeef40e72 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-02 03:30:16 +03:00