istruewing@stella.local
7aa8144460
Merge stella.local:/home2/mydev/mysql-5.0-bug4692
...
into stella.local:/home2/mydev/mysql-5.1-bug4692
2007-10-30 09:51:05 +01:00
antony@pcg5ppc.xiphis.org
3b95727600
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines
...
into anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
2007-10-19 13:06:37 -07:00
antony@pcg5ppc.xiphis.org
407f73c821
Merge pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1
...
into pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1-merge-5.1-engines
2007-10-18 15:02:20 -07:00
antony@pcg5ppc.xiphis.org
f4a153c3c4
Bug#31473
...
"CSV does not work with NULL value in datetime fields"
Attempting to insert a row with a NULL value for a DATETIME field
results in a CSV file which the storage engine cannot read.
Don't blindly assume that "0" is acceptable for all field types,
Since CSV does not support NULL, we find out from the field the
default non-null value.
Do not permit the creation of a table with a nullable columns.
2007-10-18 14:48:04 -07:00
kaa@polly.(none)
a9184873cf
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-16 19:25:04 +04:00
tsmith@ramayana.hindu.god
06c6fce750
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-10-10 14:15:09 -06:00
istruewing@stella.local
0ab9d3718d
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-10-10 21:25:19 +02:00
cmiller@zippy.cornsilk.net
04296df344
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-10-08 12:40:21 -04:00
df@pippilotta.erinye.com
1f665da388
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-29 09:33:05 +02:00
df@pippilotta.erinye.com
6f8f1883cb
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-29 09:28:05 +02:00
df@pippilotta.erinye.com
877b17d6e2
align types
2007-09-29 09:26:33 +02:00
istruewing@stella.local
32fb502bd7
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-09-28 09:54:21 +02:00
joerg@trift-lap.fambruehe
6aa39a1cf6
Merge trift-lap.fambruehe:/MySQL/M51/push-5.1
...
into trift-lap.fambruehe:/MySQL/M51/antony-5.1
2007-09-27 16:51:40 +02:00
joerg@trift-lap.fambruehe
a81116eef8
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
...
into trift-lap.fambruehe:/MySQL/M51/antony-5.1
2007-09-24 15:33:46 +02:00
gkodinov/kgeorge@macbook.local
4eee02dd3d
fixed type conversion warnings revealed by bug 30639
2007-09-21 10:15:16 +02:00
istruewing@stella.local
a34a2e3e6d
Merge stella.local:/home/mydev/mysql-5.1-amain
...
into stella.local:/home/mydev/mysql-5.1-axmrg
2007-09-14 11:59:35 +02:00
istruewing@stella.local
d704f90c96
Merge stella.local:/home/mydev/mysql-5.1-ateam
...
into stella.local:/home/mydev/mysql-5.1-axmrg
2007-09-14 11:40:03 +02:00
svoj@june.mysql.com
ac29e21e0b
Merge mysql.com:/home/svoj/devel/mysql/BUG30590/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG30590/mysql-5.1-engines
2007-09-13 17:12:46 +05:00
antony@pcg5ppc.xiphis.org
3d75d36e1f
Changes for pushbuild test runs and VSC compile warnings
2007-09-12 18:16:50 -07:00
antony@pcg5ppc.xiphis.org
421d2d2a4a
undo unneccessary change to ha_innodb.cc
...
remove 'drop database' from new tests.
2007-09-12 13:35:39 -07:00
tomas@whalegate.ndb.mysql.com
59e502dc2b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-09-12 14:02:27 +02:00
tomas@whalegate.ndb.mysql.com
f0f025f91b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
2007-09-12 13:58:03 +02:00
tomas@whalegate.ndb.mysql.com
63648db422
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
2007-09-12 13:55:45 +02:00
tomas@whalegate.ndb.mysql.com
0c0f6dfa03
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-09-11 19:56:26 +02:00
tomas@whalegate.ndb.mysql.com
9620892508
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-09-11 19:52:05 +02:00
jonas@perch.ndb.mysql.com
cf17cd229b
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-09-11 16:55:37 +02:00
jonas@perch.ndb.mysql.com
0b2c8fa3c4
ndb - bug#30914
...
Dont add insert+delete tuple(s) to lcp-keep-list
2007-09-11 16:45:22 +02:00
tomas@whalegate.ndb.mysql.com
9e37aaf433
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-09-11 16:17:28 +02:00
antony@pcg5ppc.xiphis.org
89f88eab6e
Bug#30919
...
"Rows not deleted from innodb partitioned tables if --innodb_autoinc_lock_mode=0"
Due to a previous bugfix which initializes a previously uninitialized
variable, ha_partition::get_auto_increment() may fail to operate
correctly when the storage engine reports that it is only reserving
one value and one or more partitions have a different 'next-value'.
Currently, only affects Innodb's new-style auto-increment code which
reserves larger blocks of values and has less inter-thread contention.
2007-09-08 20:26:12 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
d8d199c469
Bug#30907
...
"Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases"
Bug#28430
"Failure in replication of innodb partitioned tables on row/mixed format"
Bug#30888
"Innodb table + stored procedure + row deletion = server crash"
Apply Oracle patch from Sunny
Include tests cases by Omer
Ensure that innobase_read_and_init_auto performs table autoinc lock when lock_mode = 0
No need for "if" guard around row_unlock_table_autoinc_for_mysql() because
it already performs same check.
Make autoinc_lock_mode variable read-only for duration of running mysqld process.
2007-09-08 11:19:35 -07:00
kent/mysqldev@mysql.com/production.mysql.com
76c99a074c
azio.c, azlib.h:
...
Don't use typedef 'voidpc' as later addition and not needed
2007-09-07 13:27:52 +02:00
tomas@whalegate.ndb.mysql.com
35bddfecf7
Bug #11313 confusing/erroneous 4006 message
2007-09-07 11:15:07 +02:00
jonas@perch.ndb.mysql.com
13298bd821
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-09-06 07:40:54 +02:00
lzhou/zhl@dev3-63.(none)
c0f5b574f4
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug27543
2007-09-05 15:37:30 +00:00
lzhou/zhl@dev3-63.(none)
b2b22e93a2
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug30024
2007-09-05 15:03:11 +00:00
lzhou/zhl@dev3-63.(none)
53c2c7fa3f
BUG#27543 Backup and restore can compatible with different endians for blob attribute
2007-09-05 13:01:30 +00:00
tomas@whalegate.ndb.mysql.com
29af14afa2
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-09-04 22:25:23 +02:00
malff/marcsql@weblab.(none)
0f58ed7e74
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
2007-09-04 12:25:54 -06:00
jonas@perch.ndb.mysql.com
9529e06c9a
ndb - merge error code
...
forgot to update next TC no
2007-09-03 11:32:48 +02:00
jonas@perch.ndb.mysql.com
d1c8dc8320
ndb - merge error code(s)
2007-09-03 11:29:58 +02:00
jonas@perch.ndb.mysql.com
eab642a4f4
ndb - bug#30764
...
When adding a read to lock queue, where there is a X-lock ahead, upgrade to X-lock
(found by pekkas blob changes)
2007-09-03 08:15:59 +02:00
jonas@perch.ndb.mysql.com
9b913a1973
ndb - autotest
...
remove more "extra mysql-"
2007-08-31 16:55:59 +02:00
jonas@perch.ndb.mysql.com
97380c6906
ndb autotest
...
add --tag
remove prepended mysql-
add conf-test.cnf
add embryo upgrade-boot.sh
2007-08-31 16:12:51 +02:00
jonas@perch.ndb.mysql.com
44ff2d8b4d
merge
2007-08-31 16:09:48 +02:00
kostja@bodhi.(none)
467de3981b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-12713-new
2007-08-31 10:58:02 +04:00
kostja@bodhi.(none)
8d1af60da0
Never access thd->ha_data directly, use getters/setters from the plugin
...
API instead.
This is a pre-requisite of the fix for Bug 12713, which changes the
data type of thd->ha_data from void * to struct Ha_data.
2007-08-31 10:19:52 +04:00
tomas@whalegate.ndb.mysql.com
626c03c7ef
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-08-30 10:52:07 +02:00
tomas@whalegate.ndb.mysql.com
dfc1e0cc79
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-08-30 10:46:32 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
f8a85abf3c
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
2007-08-30 16:17:32 +08:00
stewart@willster.(none)
d14cba104a
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2007-08-30 10:00:36 +10:00