Commit graph

41276 commits

Author SHA1 Message Date
andrey@example.com
b275089b66 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  example.com:/work/bug24395-v2/my41
2006-12-01 23:11:44 +01:00
kent@mysql.com/kent-amd64.(none)
fb5abf8f4f mysql_upgrade.def Makefile.am:
Added new "mysql_upgrade.def" for Netware (bug#23504)
*.def:
  Allocate 128K stack for all executables (bug#23504)
2006-12-01 23:09:14 +01: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
thek@kpdesk.mysql.com
f74e1d2696 Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
2006-12-01 18:08:47 +01:00
thek@kpdesk.mysql.com
94b48caf2e Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-12-01 18:00:45 +01:00
thek@kpdesk.mysql.com
620a989133 Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS"
- Merged; updated test case.
2006-12-01 17:36:51 +01:00
thek@kpdesk.mysql.com
46de7157bd Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043
into  kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043
2006-12-01 17:23:12 +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
df@kahlann.erinye.com
887717c454 fix build failure introduced by 5.1-marvel merge 2006-12-01 14:25:32 +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
d19c93e900 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-12-01 14:05:41 +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
jonas@perch.ndb.mysql.com
76bdda5523 ndb - bug#24752
This prevent any subsequent node restarts, but it's better than crashing an alive node
2006-12-01 13:57:29 +01:00
df@kahlann.erinye.com
da7820c37d Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-01 13:02:54 +01:00
thek@kpdesk.mysql.com
b201d4ef93 Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS"
- Refactoring of duplicate code
- Modified bad test cases
- Changed expected error when operating on information_schema.
2006-12-01 12:50:57 +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
115643aab5 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-12-01 11:35:12 +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
7232d0f24a ndb - bug#24748
Skip rollback if only committedRead in transaction
2006-12-01 11:24:37 +01:00
Kristofer.Pettersson@naruto.
70c450a18a Merge naruto.:C:/cpp/bug17733/my50-bug17733
into  naruto.:C:/cpp/bug17733/my51-bug17733
2006-12-01 11:17:34 +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
df@kahlann.erinye.com
6dc7e55e9c Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-12-01 10:39:48 +01:00
df@kahlann.erinye.com
e6a2d18421 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2006-12-01 10:36:42 +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
gkodinov@dl145s.mysql.com
68b63d176e Merge bk-internal:/home/bk/mysql-5.1
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-12-01 10:31:07 +01:00
jonas@perch.ndb.mysql.com
f1722c76a0 ndb -
fix merge error
2006-12-01 10:29:45 +01:00
df@kahlann.erinye.com
feb70084d3 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-01 10:27:19 +01:00
jonas@perch.ndb.mysql.com
61c6f532d2 ndb -
add testcase for bug#24717
 + fix typo
2006-12-01 10:25:11 +01:00
df@kahlann.erinye.com
4e76f699b2 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-12-01 10:20:23 +01:00
df@kahlann.erinye.com
b70cdee8ab Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-12-01 10:17:27 +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
Kristofer.Pettersson@naruto.
6c8d7ea894 Bug#17733 Flushing logs causes daily server crash
Server crashes if a flush commmand is issued and binlog is closed.
- added check to prevent binlog access when binlog file isn't opened.
2006-12-01 09:49:19 +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
9d1ff70e85 ndb - bug#24717
5.0 version
  Add some extra state to try to prevent sending committedread to node too early
2006-12-01 09:06:01 +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
gni/root@ts3-168.ts.cn.tlan
3be47fe431 Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj
into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb
2006-12-01 11:13:43 +08:00
iggy@rolltop.ignatz42.dyndns.org
b457572385 Bug#17951: myisampack --force --silent : abnormal end in Windows XP
-myisampack wrote to a block on the heap that it did not allocate.
2006-11-30 21:04:02 -05: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
mskold/marty@mysql.com/linux.site
2311316962 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-11-30 23:12:33 +01:00
mskold/marty@mysql.com/linux.site
4b7e0b5fd9 bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated 2006-11-30 23:10:11 +01:00
mskold/marty@linux.site
d0a4d0c5b1 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 23:00:05 +01:00
mskold/marty@linux.site
5f84f3f428 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-11-30 22:55:06 +01:00