msvensson@pilot.mysql.com
eb7500f44a
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061220175325|03033
2006-12-22 12:14:12 +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
fe89182899
Add call to 'thd::clean_up' before deleting THD
2006-12-21 16:43:11 +01:00
mskold/marty@linux.site
7993c76c10
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-21 16:30:07 +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
joerg@trift2.
1341cf1827
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M51/tmp-5.1
2006-12-21 12:18:28 +01:00
msvensson@pilot.mysql.com
a44f076061
Merge neptunus:mysql/my51-ndb-valgrind
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
2006-12-21 12:08:39 +01:00
joerg@trift2.
2d1292ce7d
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2006-12-21 11:58:03 +01:00
tsmith/tim@siva.hindu.god
c2de802e9c
Post-merge fix (related to bug 24200 changes)
2006-12-20 17:11:47 -07: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
tsmith/tim@siva.hindu.god
aee48b346f
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:12:42 -07:00
msvensson@neptunus.(none)
7e7a0e95d3
Improve ndb thread shutdown handling
2006-12-20 22:57:23 +01:00
joerg/mysqldev@bk-internal.mysql.com
a420981f74
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-build
2006-12-20 22:29:03 +01:00
msvensson@neptunus.(none)
d7be1b7cbb
Merge bk-internal:/home/bk/mysql-5.1-ndb
...
into neptunus.(none):/home/msvensson/mysql/my51-ndb-valgrind2
2006-12-20 21:19:21 +01:00
joerg@trift2.
7f0cb242bc
Merge trift2.:/MySQL/M50/upward-5.0
...
into trift2.:/MySQL/M51/push-5.1
2006-12-20 19:24:04 +01:00
msvensson@neptunus.(none)
168c5f1424
Fix valgrind warning from deinitializing ha_ndbcluster, referencing
...
another handler from 'plugin_foreach'
2006-12-20 18:53:25 +01:00
mskold/marty@linux.site
753f661bc4
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-20 17:08:05 +01:00
tomas@poseidon.
dd2c9ea102
Bug #21806 : wrong ndb binlog behaviour when cluster disconnects/restarts
...
- latest gci is reinitialized to 0 at reconnect, ndb binlog thread needs to wait until valid gci is retrieved
2006-12-20 15:34:45 +01: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
mskold/marty@linux.site
226e2be1b1
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-20 13:36:40 +01:00
joerg@trift2.
d9ff6ef3fa
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M50/clone-5.0
2006-12-20 11:17:31 +01:00
joerg@trift2.
90fc044fc2
Fix silly typos in the disabling of "im_daemon_life_cycle" (bug#24415).
2006-12-20 11:13:16 +01:00
joerg@trift2.
c9572a10c4
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release
...
into trift2.:/MySQL/M50/clone-5.0
2006-12-20 10:58:16 +01:00
joerg@trift2.
eb7dfa032c
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-12-20 10:56:43 +01:00
joerg@trift2.
f9802fd47d
Disable test "im_deamon_life_cycle", Bug#24425, see note: [19 Dec 23:17] Trudy Pelzer
2006-12-20 10:54:41 +01:00
df@kahlann.erinye.com
dc33e0f49d
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-24896
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
2006-12-20 10:40:05 +01:00
df@kahlann.erinye.com
e55331b4ed
Merge dev:my/build-200612151202-5.0.32/mysql-5.0-release
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
2006-12-20 09:44:47 +01:00
tsmith/tim@siva.hindu.god
945756e484
Merge siva.hindu.god:/usr/home/tim/m/bk/50-release
...
into siva.hindu.god:/usr/home/tim/m/bk/50-build
2006-12-19 20:23:34 -07:00
tsmith/tim@siva.hindu.god
7c82a06dcf
Remove warnings by casting
2006-12-19 20:17:33 -07:00
tsmith/tim@siva.hindu.god
73932df7d0
Merge siva.hindu.god:/usr/home/tim/m/bk/50-release
...
into siva.hindu.god:/usr/home/tim/m/bk/50-build
2006-12-19 17:46:28 -07:00
tsmith/tim@siva.hindu.god
84a0873d05
Merge siva.hindu.god:/usr/home/tim/m/bk/50-24200
...
into siva.hindu.god:/usr/home/tim/m/bk/50-release
2006-12-19 17:43:56 -07:00
tsmith/tim@siva.hindu.god
6cbfc343a8
Alternative decimal2double implementation using an algorithm
...
more similar to my_strtod() (and maybe even a bit faster due
to less floating point divisions).
This should at least partially fix Bug #23260 for DECIMALs
with a moderate number of total digits.
2006-12-19 17:42:26 -07:00
tsmith/tim@siva.hindu.god
0d5dc51438
Added innodb_rollback_on_timeout option to restore the 4.1
...
InnoDB timeout behavior (Bug #24200 )
2006-12-19 16:57:51 -07:00
tsmith/tim@siva.hindu.god
2bc45899c0
Bug #24947 : REPEAT function returns NULL when passed a field as the count parameter
...
Handling of large signed/unsigned values was not consistent, so some string functions could return bogus results.
The current fix is to simply patch up the val_str() methods for those string items.
It would be good clean this code up in general, to make similar problems much harder to make. This is left as an exercise for the reader.
2006-12-19 15:54:12 -07:00
mskold/marty@mysql.com/linux.site
3587ee8e4e
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: ALTER TABLE must specify STORAGE explicitely to change it, + post review changes
2006-12-19 23:20:43 +01:00
mskold/marty@mysql.com/linux.site
dab48d5df2
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: copy tablespace from old table in copying alter table
2006-12-19 15:53:46 +01:00
df@kahlann.erinye.com
98e52bd61f
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
2006-12-19 15:32:41 +01:00
df@kahlann.erinye.com
cf1fd5427c
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-19 15:31:10 +01:00
df@kahlann.erinye.com
6b27694ac8
remove hard-coded socket paths from some tests
2006-12-19 15:10:15 +01:00
skozlov/ksm@mysql.com/virtop.localdomain
74a5079fa0
WL#2862 ndb_sp.test - removed unnecessary line
2006-12-19 16:17:57 +03:00
dfischer/mysqldev@mysql.com/production.mysql.com
3cc1a4251a
Merge mysql.com:/data0/mysqldev/my/mysql-5.0-release
...
into mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release
2006-12-19 11:48:08 +01:00
tsmith/tim@siva.hindu.god
2145103ac4
Merge siva.hindu.god:/usr/home/tim/m/bk/50-release
...
into siva.hindu.god:/usr/home/tim/m/bk/50-build
2006-12-18 18:48:52 -07:00
tsmith/tim@siva.hindu.god
d60550a4d6
This ChangeSet must be null-merged to 5.1.
...
Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
Bugs fixed:
- Bug #21468 : InnoDB crash during recovery with corrupted data pages: XA bug?
- Bug #24299 : Identifiers in foreign keys cannot contain U+0160, U+0360, ..., U+FF60
- Bug #24386 : Performance degradation caused by instrumentation in mutex_struct
- Bug #24712 : SHOW TABLE STATUS for file-per-table showing incorrect time fields
2006-12-18 18:41:38 -07:00
df@kahlann.erinye.com
7d840b96fb
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2006-12-18 14:41:55 +01:00
df@kahlann.erinye.com
ad1abb3cb3
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-18 14:38:00 +01:00
df@kahlann.erinye.com
038f0051b5
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
2006-12-18 13:49:53 +01:00
df@kahlann.erinye.com
5ad288f18b
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-18 13:44:57 +01:00
df@kahlann.erinye.com
4a98f36e59
Use a temporary directory for sockets if the socket path becomes too long.
2006-12-18 13:44:21 +01:00
df@kahlann.erinye.com
c78b3c4ee8
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-18 13:35:29 +01:00
joerg@trift2.
c011b2e70f
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2006-12-18 11:59:14 +01:00