mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-06 03:03:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25391 commits 2861 branches 349 tags 1.7 GiB
Commit graph

25391 commits

Author SHA1 Message Date
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
33811ac3a3 Fixed back some bin log writes to avoid merge problems 
Added missing #ifdef for partitioning
 2005-08-20 16:56:54 -04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
5e91e260e6 WL , , 
Added new syntax for partition management
 2005-08-19 10:26:05 -04:00
tomas@poseidon.ndb.mysql.com
e9ce46a0bc ha_ndbcluster.h, ha_innodb.h: 
corrected compile error
 2005-08-18 12:24:52 +02:00
joerg@mysql.com
880bbb0406 Manual merge of 5.0.11 changes into 5.1.1 - use "local" files in cases of conflict. 2005-08-15 19:51:01 +02:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ccbab519ac Merge fix 2005-08-06 13:11:56 -04:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
db8e0b7306 Fixed ndb_config problems with merge 2005-08-05 18:45:03 -04:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-08-05 18:01:34 -04:00
joerg@mysql.com
17f2cc4e87 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into mysql.com:/M50/clone-5.0
 2005-08-05 20:50:56 +02:00
joerg@mysql.com
294aa66d92 New "Instance Manager" code: 
Rename "port.h" to "portability.h" to avoid conflict with system header file name,
and include the file in "Makefile.am".
 2005-08-05 20:44:52 +02:00
kent@mysql.com
bae0050358 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-08-05 19:31:19 +02:00
kent@mysql.com
19ad0933f9 client_priv.h: 
Removed ending comma in enum
Makefile.am:
  config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
ndb_config.cpp:
  Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
 2005-08-05 19:29:13 +02:00
hf@deer.(none)
56b91a8c15 testcase added to fix for bug (Geometry & trigger crash) 2005-08-05 20:26:55 +05:00
hf@deer.(none)
b2147206ba Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.12281
 2005-08-05 20:21:56 +05:00
hf@deer.(none)
4aeded63fd Fix for bug (Geometry: crash in trigger) 
Field_geom lack size_of method
 2005-08-05 20:19:51 +05:00
joerg@mysql.com
23603ca7cb Reset the version to 5.0.11 (this is within the updated clone). 2005-08-05 16:35:04 +02:00
petr@mysql.com
ee6109e95f post-review fix 2005-08-05 17:48:37 +04:00
petr@mysql.com
21a1f466ba chmod -x new IM files 2005-08-05 17:09:02 +04:00
petr@mysql.com
22ccfb4d67 IM port cleanup 2005-08-05 17:02:06 +04:00
petr@mysql.com
07431723c0 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-08-05 14:53:23 +04:00
petr@mysql.com
a64f264e4b IM port fixes: fix crash on startup, add more error checking, get rid of unnecessary code. 2005-08-05 14:35:30 +04:00
andrey@lmy004.
3a52916436 fix for bug - SHOW TABLE STATUS FROM information_schema; does not sort tablenames 2005-08-05 11:01:29 +02:00
konstantin@mysql.com
85e9801651 Fix gcc -ansi -pedantic compilation failure. 2005-08-05 11:10:51 +04:00
jimw@mysql.com
995b5dd02d Fix out-of-order results in view results file 2005-08-04 16:33:29 -07:00
jimw@mysql.com
b0c5b625d1 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-04 14:41:16 -07:00
jimw@mysql.com
2da798c991 Update test results 2005-08-04 14:38:48 -07:00
evgen@moonbone.local
1894cff045 Manual merge of bugfix 2005-08-05 00:34:42 +04:00
jimw@mysql.com
fa94e5389a Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-04 12:49:23 -07:00
jimw@mysql.com
b9da417688 Update test to deal with more relaxed datetime parsing. 2005-08-04 12:45:32 -07:00
jimw@mysql.com
5ad0c87dd0 Merge mysql.com:/home/jimw/my/mysql-4.1-12328 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-04 11:00:07 -07:00
jimw@mysql.com
d0c8e929c8 Merge mysql.com:/home/jimw/my/mysql-4.1-7308 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-04 10:48:53 -07:00
reggie@fedora.(none)
069fb89bb9 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  fedora.(none):/home/reggie/bk/im_patch
 2005-08-04 11:03:24 -05:00
reggie@fedora.(none)
d146cc9e2f add support for vcproj and sln files (Visual Studio 2003) 2005-08-04 10:08:55 -05:00
reggie@fedora.(none)
11d3d1a09c Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  fedora.(none):/home/reggie/bk/im_patch
 2005-08-04 10:03:33 -05:00
reggie@fedora.(none)
72c0a021e9 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  fedora.(none):/home/reggie/bk/im_patch
 2005-08-04 09:33:44 -05:00
lenz@mysql.com
59cec0635c Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-08-04 15:25:01 +02:00
hf@deer.(none)
570c754993 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-08-04 18:24:18 +05:00
hf@deer.(none)
176bfcab13 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2005-08-04 18:22:53 +05:00
lenz@mysql.com
a6182100f1 - Bumped up version number to 5.0.12-beta to indicate the 5.0.11 release build branchoff 2005-08-04 15:20:03 +02:00
kent@mysql.com
32e548f3cf Merge 2005-08-04 14:15:21 +02:00
kent@mysql.com
bab56abbfc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-04 14:04:48 +02:00
kent@mysql.com
468c3ad532 mysql-test-run.pl: 
Back ported ndbcluster_support() from 5.0
  Corrected the server id handling
 2005-08-04 13:54:39 +02:00
kent@mysql.com
b2819677e8 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-08-04 13:48:34 +02:00
kent@mysql.com
d17a4773b4 mysqld.dsp: 
Added the blackhole storage engine to the Max builds
 2005-08-04 13:47:02 +02:00
hf@deer.(none)
293cfafd37 Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-08-04 16:36:14 +05:00
hf@deer.(none)
0a3a6137d8 Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-4.1.9508
 2005-08-04 16:33:28 +05:00
hf@deer.(none)
b16812e6ca Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-4.1.11083
 2005-08-04 16:30:36 +05:00
hf@deer.(none)
1311d4dc79 Merging 2005-08-04 16:27:53 +05:00
lenz@mysql.com
280da3cf15 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-08-04 12:49:18 +02:00
lenz@mysql.com
aff1328ada Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0-build
 2005-08-04 12:48:28 +02:00
lenz@mysql.com
eb19f12fbf - manual merge from 4.0 into 4.1: used the local version of ha_innodb.cc, merged 
the rpm spec file changelog
 2005-08-04 12:35:13 +02:00