mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50688 commits 2788 branches 343 tags 1.7 GiB
Commit graph

50688 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
883abae508 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-11-01 11:37:32 +01:00
tomas@whalegate.ndb.mysql.com
5f592bfc7d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-11-01 11:33:04 +01:00
tomas@whalegate.ndb.mysql.com
d8eb4cdcb5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2007-11-01 10:19:26 +01:00
knielsen@loke.(none)
5ef088a7af Merge 10.102.0.1:/usr/local/mysql/mysql-5.0-ndb 
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
 2007-11-01 08:30:18 +01:00
knielsen@ymer.(none)
084849d917 Bug #31848: Test failure: Cluster has problems on insert with auto-increment 
Fix uninitialized variable causing failures for some interpreted update
operations on gcc 4.2.1.
 2007-11-01 07:59:55 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
480ee022ad Adding dbutil to ndb test lib 2007-10-31 22:37:10 +01:00
kent@kent-amd64.(none)
b5e97b4b04 Merge mysql.com:/home/kent/bk/bug24809/mysql-5.0-build 
into  mysql.com:/home/kent/bk/bug24809/mysql-5.1-build
 2007-10-31 10:52:18 +01:00
kent@mysql.com/kent-amd64.(none)
2f88dce6ff Makefile.am: 
Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
  work around for problem with automake 1.10 (bug#24809)
 2007-10-30 20:54:31 +01:00
joerg@trift2.
37e47a080a Minor Makefile fixes: 
1) Add a new top level "Makefile.am" target "make embedded-test".

2) Fix a syntax error (bad merge) in "netware/Makefile.am".
 2007-10-30 20:06:49 +01:00
df@pippilotta.erinye.com
d76498a6a2 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-30 15:48:25 +01:00
df@pippilotta.erinye.com
3c3c7d0203 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-10-30 15:39:02 +01:00
df@pippilotta.erinye.com
220add0366 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-10-30 15:37:48 +01:00
df@pippilotta.erinye.com
c72c86713e 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-10-30 15:33:41 +01:00
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
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
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
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
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
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
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
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
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
mskold/marty@linux.site
588b05d599 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-10-24 14:10:36 +02:00
mskold/marty@linux.site
4785c57334 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-10-24 14:07:33 +02:00
gluh@mysql.com/eagle.(none)
97e0180b2b result fix 2007-10-24 12:49:58 +05:00
gluh@mysql.com/eagle.(none)
b2aeda7699 result fix 2007-10-23 20:12:50 +05:00
gluh@eagle.(none)
d639739022 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-23 20:11:39 +05:00