Commit graph

50866 commits

Author SHA1 Message Date
df@pippilotta.erinye.com
c4ab8a9395 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-10-30 15:24:17 +01:00
df@pippilotta.erinye.com
e5b809333c bug#30630 2007-10-30 15:22:52 +01:00
tomas@whalegate.ndb.mysql.com
38ce0fc24d correct result file 2007-10-30 14:52:12 +01:00
tomas@whalegate.ndb.mysql.com
b0e90a43cb correct manual merge 2007-10-30 14:04:41 +01:00
davi@moksha.com.br
26f03b0bc6 Merge moksha.local:/Users/davi/mysql/bugs/31669-5.0
into  moksha.local:/Users/davi/mysql/mysql-5.0-runtime
2007-10-30 09:41:24 -03:00
kostja@bodhi.(none)
5a09edd203 Fix failing init_connect.test (5.1-runtime). 2007-10-30 15:39:50 +03:00
kostja@bodhi.(none)
47c381fbb4 Make sure rpl.rpl_innodb_mixed_dml passes even if rpl_mixed.dat is read-only.
This is important for a development environment where not all source files
are checked out.
2007-10-30 15:25:39 +03:00
istruewing@stella.local
250f5769bf Post-merge fix 2007-10-30 12:03:44 +01:00
svoj@mysql.com/june.mysql.com
cbd3dfbbcb BUG#11392 - fulltext search bug
Fulltext boolean mode phrase search may crash server on platforms
where size of pointer is not equal to size of unsigned integer
(in other words some 64-bit platforms).

The problem was integer overflow.

Affects 4.1 only.
2007-10-30 14:46:43 +04:00
tomas@whalegate.ndb.mysql.com
a214b1b9ba Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-10-30 11:28:19 +01:00
jani@hynda.mysql.fi
ae0032f3ec Fixed a typo. 2007-10-30 11:40:08 +02:00
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
joerg@trift2.
c836873a8f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2007-10-29 23:13:28 +01:00
kent@mysql.com/kent-amd64.(none)
a77f626cc9 autorun.sh:
After review changes
2007-10-29 22:48:58 +01:00
kent@mysql.com/kent-amd64.(none)
5218a5d033 autorun.sh:
Removed innobase from compile-dist, and let it use autorun.sh to avoid
  code duplication. Also corrected a problem when searching for one of
  "libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)
2007-10-29 20:12:44 +01:00
joerg@trift2.
b41a047d5c 5.1 has been promoted to "rc" status. 2007-10-29 20:00:36 +01:00
jani@hynda.mysql.fi
3c2f58c8ec Fix for counting query time for Windows. 2007-10-29 18:18:49 +02:00
joerg@trift2.
e11d481e5f Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-10-29 15:47:37 +01:00
malff@lambda.weblab
0909d1f8cb Merge lambda.weblab:/home/malff/TREE/mysql-5.1-base
into  lambda.weblab:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-29 08:07:27 -06:00
malff@lambda.weblab
1eb8f03eaa Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  lambda.weblab:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-29 08:01:40 -06:00
malff@lambda.weblab
6d15d42eca Merge lambda.weblab:/home/malff/TREE/mysql-5.0-base
into  lambda.weblab:/home/malff/TREE/mysql-5.0-rt-merge
2007-10-29 07:53:15 -06:00
anozdrin/alik@station.
ee25b4f56f Fix for BUG#27610: ALTER TABLE ROW_FORMAT=... does not
rebuild the table.

The problem was that ROW_FORMAT clause in ALTER TABLE did not trigger
table reconstruction.

The fix is to rebuild a table if ROW_FORMAT is specified.
2007-10-29 15:42:49 +03:00
joerg@trift2.
77c4bfe63a Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-10-29 12:56:48 +01:00
joerg@trift2.
9fee3fb694 Merge trift2.:/MySQL/M41/push-4.1
into  trift2.:/MySQL/M50/push-5.0
2007-10-29 12:15:17 +01:00
joerg@trift2.
007b410109 Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-29 12:11:05 +01:00
joerg@trift2.
408727615c Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-29 11:55:48 +01:00
joerg@trift2.
33f1f130ea Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-10-29 11:54:09 +01:00
gluh@eagle.(none)
e3f7762226 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-29 12:38:32 +04:00
mleich@four.local.lan
f85bf63ce7 Fix for
Bug#31857 funcs_1: a_processlist_priv_no_prot and b_processlist_priv_ps fail
  
Reason for the changes is:
  WL4007 Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> UPGRADE
2007-10-29 09:31:13 +01:00
mleich@four.local.lan
d3e18cc9bb Fix for
Bug#31408 funcs_1: <engine>_trig_03e test fail
Modification:
   The TRIGGER PRIVILEGE is now needed for getting informations about TRIGGERs.
   Therefore after REVOKE TRIGGER privilege the 
   - SHOW TRIGGERS
   - SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
   result sets are now empty.
2007-10-26 17:36:22 +02:00
istruewing@stella.local
8cc5fe116f Bug#4692 - DISABLE/ENABLE KEYS waste a space
Disabling and enabling indexes on a non-empty table grows the
index file.

Disabling indexes just sets a flag per non-unique index and does not
free the index blocks of the affected indexes. Re-enabling indexes
creates new indexes with new blocks. The old blocks remain unused
in the index file.

Fixed by dropping and re-creating all indexes if non-empty disabled
indexes exist when enabling indexes. Dropping all indexes resets
the internal end-of-file marker to the end of the index file header.
It also clears the root block pointers of every index and clears the
deleted blocks chains. This way all blocks are declared as free.
2007-10-26 15:29:06 +02:00
tomas@whalegate.ndb.mysql.com
93c95156bc correct unused code 2007-10-26 11:43:05 +02:00
tomas@whalegate.ndb.mysql.com
39b1aaed0f commit of WL#3686 test case already in 5.1 to get regression testing, no code committed 2007-10-26 11:42:33 +02:00
antony@pcg5ppc.xiphis.org
ada0b49328 Bug#30296
"Dynamic plugins fail to load on FreeBSD"
  ELF executables need to be linked using the -export-dynamic option to
  ld(1) for symbols defined in the executable to become visible to dlsym().
  Also, do not build plugins on an all-static build.
2007-10-25 21:19:28 -07:00
antony@anubis.xiphis.org
c08ffb6bb6 Merge anubis.xiphis.org:/usr/home/antony/work/p1-bug31473.1-backport-5.0
into  anubis.xiphis.org:/usr/home/antony/work/p1-bug31473.1-backport-5.1
2007-10-25 17:26:11 -07:00
antony@pcg5ppc.xiphis.org
f9fc31f967 protect bug31473 from regressing into 5.0 2007-10-25 17:23:12 -07:00
df@pippilotta.erinye.com
25c12e7d72 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-10-25 13:31:31 +02:00
df@pippilotta.erinye.com
68a24d9f71 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-10-25 13:28:56 +02:00
df@pippilotta.erinye.com
91fd078149 add new trigger to prevent certain naming clashes 2007-10-25 13:28:12 +02:00
joerg@trift2.
00ca6476be Mimic a rename which Daniel already did in 6.0,
to get rid of a name clash among *deleted* files on case-insignificant file systems.
2007-10-25 13:17:44 +02:00
svoj@june.mysql.com
c74c7b6728 Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.1-engines
2007-10-25 14:05:13 +05:00
knielsen@loke.(none)
bb6346fd02 Merge loke.(none):/home/knielsen/devel/mysql-5.0-ndb
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
2007-10-25 11:00:36 +02:00
knielsen@loke.(none)
b77f44c76d Merge loke.(none):/home/knielsen/devel/bug31810
into  loke.(none):/home/knielsen/devel/mysql-5.0-ndb
2007-10-25 10:54:23 +02:00
knielsen@loke.(none)
328fc573e4 Merge loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
2007-10-25 10:48:42 +02:00
knielsen@loke.(none)
815a63008c Merge loke.(none):/home/knielsen/devel/bug31761
into  loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca
2007-10-25 09:27:15 +02:00
knielsen@loke.(none)
75a5c28d98 Merge loke.(none):/home/knielsen/devel/bug31761
into  loke.(none):/home/knielsen/devel/mysql-5.0-ndb
2007-10-25 08:45:27 +02:00
knielsen@loke.(none)[knielsen]
e16f03cd64 BUG#31810: Potential infinite loop with autoincrement failures in ndb
Fix extra semicolon causing if-statement to be disabled.
2007-10-25 08:40:42 +02:00
knielsen@loke.(none)[knielsen]
a7f7875578 BUG#31761: Code for cluster is not safe for strict-alias optimization in new gcc
Fix problem with AttributeHeader::init() seen with gcc 4.2.1.

Using the same object as both Uint32 and class AttributeHeader violates
strict aliasing rule.
2007-10-25 07:57:18 +02:00
malff@lambda.hsd1.co.comcast.net.
2bc41b7e1e Bug#30854 (Tables name show as binary in slave err msg on vm-win2003-64-b)
The root cause of this defect is that a call to my_error() is using a
'LEX_STRING' parameter instead of a 'char*'

This patch fixes the failing calls to my_error(), as well as similar calls
found during investigation.

This is a compiling bug (see the instrumentation in the bug report), no test cases provided.
2007-10-24 19:01:08 -06:00
mskold/marty@linux.site
d850b107b7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-10-24 22:27:28 +02:00