holyfoot/hf@hfmain.(none)
d26de7bee0
Merge mysql.com:/home/hf/work/26921/my50-26921
...
into mysql.com:/home/hf/work/26921/my51-26921
2007-12-07 09:39:31 +04:00
tsmith@ramayana.hindu.god
b922c9646c
Fix compiler warning about wrong integer size (probably harmless)
2007-12-06 16:11:26 -07:00
tsmith@ramayana.hindu.god
44d74f631f
ctype-simple.c: Backport quick fix to remove Windows compiler warnings
2007-12-06 15:05:24 -07:00
holyfoot/hf@hfmain.(none)
45edb712d4
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/hf/work/mrg/my51-mrg
2007-12-06 22:31:22 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
3f27019281
partition_archive tests added
2007-12-06 22:17:42 +04:00
mleich@five.local.lan
dba250956a
Fix for
...
Bug#32856 testsuite parts: partition_basic_myisam fails
in pushbuild
Skip test if symlink support is missing.
2007-12-06 18:26:50 +01:00
tnurnberg@sin.intern.azundris.com
5cab4a77e1
Bug#31177: Server variables can't be set to their current values
...
initialise limits properly for getopt_ll_limit()
(fixes falcon_opt test)
2007-12-06 18:03:30 +01:00
mskold/marty@mysql.com/quadfish.(none)
27c025061d
bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts
2007-12-06 17:15:21 +01:00
mattiasj@witty.ndb.mysql.com
c27d93c83a
Bug#32948: FKs allowed to reference partitioned table
...
Problem: when alter to partitioned table,
it does not see it as change of engine.
Solution: If alter includes partitioning, check if it is possible
to change engines (eg. is the table referenced by a FK)
2007-12-06 14:43:06 +01:00
holyfoot/hf@hfmain.(none)
18e6de9f15
Merge mysql.com:/home/hf/work/32247/my51-32247
...
into mysql.com:/home/hf/work/mrg/my51-mrg
2007-12-06 16:43:52 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
dc01dba255
Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
...
ha_partition::update_create_info() just calls update_create_info
of a first partition, so only get the autoincrement maximum
of the first partition, so SHOW CREATE TABLE can show
small AUTO_INCREMENT parameters.
Fixed by implementing ha_partition::update_create_info() in a way
other handlers work.
HA_ARCHIVE:stats.auto_increment handling made consistent with other engines
2007-12-06 16:39:42 +04:00
tnurnberg@white.intern.koehntopp.de
d349effe11
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/misc/mysql/31177/51-31177
2007-12-06 08:56:04 +01:00
tnurnberg@white.intern.koehntopp.de
987ec3f306
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/31177/50-31177
2007-12-06 08:46:01 +01:00
tnurnberg@white.intern.koehntopp.de
fe8d3dddf2
Merge mysql.com:/misc/mysql/31177/50-31177
...
into mysql.com:/misc/mysql/31177/51-31177
2007-12-06 01:46:49 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b1e77cfc31
Bug#31177: Server variables can't be set to their current values
...
additional fixes for BDB and correct assignment of both signed
and unsigned 64-bit data to unsigned system variables
2007-12-06 01:28:01 +01:00
tsmith@ramayana.hindu.god
ac811ce455
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
2007-12-05 15:31:18 -07:00
tsmith@ramayana.hindu.god
f1323ad628
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-05 15:29:37 -07:00
tsmith@ramayana.hindu.god
c3a0572d8e
Post-merge fix (reorder tests in ctype_ucs.test)
2007-12-05 13:54:11 -07:00
tsmith@ramayana.hindu.god
8fc0bfb6b6
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
2007-12-05 12:33:36 -07:00
mattiasj@witty.
5452a154d6
Merge witty.:/Users/mattiasj/clones/mysql-5.1-bug30822
...
into witty.:/Users/mattiasj/clones/51to_push
2007-12-05 19:39:32 +01:00
davi@endora.local
aa5786eb0f
Merge mysql.com:/Users/davi/mysql/bugs/32996-5.1
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2007-12-05 11:25:51 -02:00
davi@mysql.com/endora.local
b79b57c645
Bug#32996 log_tables.test fails sporadically
...
Only select entries from the general_log that were issued by the current
connection.
2007-12-05 09:48:13 -02:00
tsmith@ramayana.hindu.god
10cab933b2
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-04 20:58:21 -07:00
tsmith@ramayana.hindu.god
6453025165
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/41
2007-12-04 19:16:22 -07:00
kent@mysql.com/kent-amd64.(none)
5caf347a56
configure.in:
...
Removed the auto detection and use of Solaris "libmtmalloc", as it
cause regression on bug#18322. The code removed also prevented
a build without using this library. Users can still compile with
"libmtmalloc", if configuring with "--with-mysqld-libs=-lmtmalloc"
2007-12-04 20:27:08 +01:00
mhansson@dl145s.mysql.com
e602ae16af
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into dl145s.mysql.com:/data0/mhansson/my51-bug30234
2007-12-04 16:53:55 +01:00
anozdrin/alik@station.
1bfc9d692c
Bug#32966 main.status fails.
...
Disable failing test case.
2007-12-04 18:52:43 +03:00
anozdrin/alik@station.
69792afb14
Bug#32965 main.ctype_create fails.
...
Disable failing test case.
2007-12-04 18:51:03 +03:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
be06bfe1be
post-commit:
...
Use $BK_USER, if set, in preference to $USER
2007-12-04 12:57:16 +00:00
mhansson@dl145s.mysql.com
22b4b4db04
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/mhansson/my50-bug30234
2007-12-04 11:32:11 +01:00
gluh@mysql.com/eagle.(none)
aaf5b7fddd
test case fix
2007-12-04 12:48:11 +04:00
tnurnberg@mysql.com/white.intern.koehntopp.de
ae8b22d91e
Bug#31177: Server variables can't be set to their current values
...
additional fixes for 64-bit
---
Merge mysql.com:/misc/mysql/31177/50-31177
into mysql.com:/misc/mysql/31177/51-31177
---
Bug#31177: Server variables can't be set to their current values
additional 5.1 fixes (for plugins)
2007-12-04 01:17:52 +01:00
mattiasj@witty.
1d7ac77479
Bug#30480: Falcon: searches fail if LIKE and key partition
...
(also fixes the bugs: Bug#29320, Bug#29493 and Bug#30536)
Problem: Partitioning did not handle unordered scans correctly
for engines with unordered read order.
Solution: do not stop scanning fi a recored is out of range, since
there can be more records within the range afterwards.
Note: this is the patch that fixes the bug, but since there are no
storage engines shipped with mysql 5.1 (falcon comes in 6.0) there
are no test cases (it is a separate patch that only goes into 6.0)
2007-12-03 16:12:25 +01:00
jonas@perch.ndb.mysql.com
42cfaa616a
ndb - testNodeRestart -n Bug27466 T1
...
make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race, error insert causes 5s delay)
2007-12-03 14:31:17 +01:00
jonas@perch.ndb.mysql.com
6d56f4b95b
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-12-03 12:46:08 +01:00
jonas@perch.ndb.mysql.com
2d67819f74
ndb - bug#26457
...
Fix bug in bug fix, causing random test-failure
2007-12-03 12:43:50 +01:00
mhansson@dl145s.mysql.com
8639c8683c
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into dl145s.mysql.com:/data0/mhansson/my51-bug30234
2007-12-03 12:34:36 +01:00
mhansson/martin@linux-st28.site
cb1bc4e355
Bug#30234: Post-null-merge fix
...
Restores files that were automerged during null merge.
2007-12-03 11:39:49 +01:00
mhansson/martin@linux-st28.site
6c4eafdae3
Merge linux-st28.site:/home/martin/mysql/src/bug30234/my50-bug30234
...
into linux-st28.site:/home/martin/mysql/src/bug30234/my51-bug30234
2007-12-03 11:31:44 +01:00
mhansson/martin@linux-st28.site
d2c6ed55ef
Bug#30234: Unexpected behavior using DELETE with AS and USING
...
Anti-patch. This patch undoes the previously pushed patch. It is
null-merged in versions 5.1 and above since there the original
patch is still desired.
2007-12-03 10:08:58 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
658f66e36e
Bug#31177: Server variables can't be set to their current values
...
additional fixes for 64-bit
2007-12-03 10:01:56 +01:00
kaa@polly.(none)
4e08609f03
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-12-02 14:18:27 +03:00
kaa@polly.(none)
3ecbd79c88
Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-12-02 14:14:42 +03:00
kaa@polly.(none)
0e78354baa
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-12-02 14:11:36 +03:00
kaa@polly.(none)
a008572871
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
...
into polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
2007-12-02 13:51:39 +03:00
kaa@polly.(none)
d905aade4f
Windows-specific fixes in floating point tests.
2007-12-02 13:49:12 +03:00
tnurnberg@mysql.com/white.intern.koehntopp.de
2cc07b287a
Bug#31177: Server variables can't be set to their current values
...
extra 5.1 fixes
2007-12-02 05:18:34 +01:00
tnurnberg@white.intern.koehntopp.de
f561e8ddf3
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/misc/mysql/31177/51-31177
2007-12-02 03:19:07 +01:00
tnurnberg@white.intern.koehntopp.de
55d6d04df0
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/31177/50-31177
2007-12-02 01:48:43 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
56274466be
Bug#31177: Server variables can't be set to their current values
...
5.1+ specific fixes (plugins etc.)
2007-12-01 19:55:06 +01:00