mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46121 commits 2781 branches 343 tags 1.6 GiB
Commit graph

46121 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
cfbb8672ab correction of result file 2007-04-26 21:32:02 +02:00
kaa@polly.local
02f2616ee3 Merge polly.local:/home/kaa/src/maint/bug22364/my50-bug22364 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-04-26 20:51:02 +04:00
joerg@trift-lap.fambruehe
044f2e110e Merge trift-lap.fambruehe:/MySQL/M50/push-5.0 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-04-26 17:11:33 +02:00
joerg@trift-lap.fambruehe
03f4492b5b Merge trift-lap.fambruehe:/MySQL/M50/clone-5.0 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-04-26 16:48:53 +02:00
joerg@trift-lap.fambruehe
f7bac607cf Merge trift-lap.fambruehe:/MySQL/M50/push-5.0 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-04-26 16:15:52 +02:00
joerg@trift-lap.fambruehe
5af470eef5 Merge trift-lap.fambruehe:/MySQL/M41/push-4.1 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-04-26 16:13:32 +02:00
joerg@trift-lap.fambruehe
69d39592b9 Merge trift-lap.fambruehe:/MySQL/M41/mysql-4.1 
into  trift-lap.fambruehe:/MySQL/M41/push-4.1
 2007-04-26 16:09:19 +02:00
joerg@trift-lap.fambruehe
2ed383302f Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-04-26 16:06:44 +02:00
joerg@trift-lap.fambruehe
f723388b18 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-04-26 16:03:02 +02:00
tomas@whalegate.ndb.mysql.com
9a70312001 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-26 14:00:16 +02:00
tomas@whalegate.ndb.mysql.com
86cd5c7603 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-26 13:59:57 +02:00
msvensson@pilot.blaudden
27418637d7 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-26 13:58:33 +02:00
tomas@whalegate.ndb.mysql.com
9edb19eedf Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-26 13:56:32 +02:00
tomas@whalegate.ndb.mysql.com
99b81f15f5 remove compiler warning 2007-04-26 13:56:09 +02:00
tomas@whalegate.ndb.mysql.com
0326179d10 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-26 13:50:04 +02:00
tomas@whalegate.ndb.mysql.com
ef77deda42 Bug #27205 Occational 899 if delete+insert during LCP 
- put page of deleted row last in list
 2007-04-26 13:41:33 +02:00
tomas@whalegate.ndb.mysql.com
8dd90e8817 WL#1190 preparatory work needed for compatability with future online add column 2007-04-26 13:36:51 +02:00
msvensson@pilot.blaudden
667cb17942 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-26 13:18:19 +02:00
tomas@whalegate.ndb.mysql.com
5c2138f57b Bug #24667 After ALTER TABLE operation ndb_dd table becomes regular ndb 2007-04-26 13:12:43 +02:00
gkodinov/kgeorge@magare.gmz
f4ec0f1cbe Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27363-5.0-opt
 2007-04-26 11:16:01 +03:00
gkodinov/kgeorge@magare.gmz
bfa29e175e Bug #27363: 
Validity checks for nested set functions
were not taking into account that the enclosed
set function may be on a nest level that is
lower than the nest level of the enclosing set
function.
Fixed by :
 - propagating max_sum_func_level
up the enclosing set functions chain.
 - updating the max_sum_func_level of the 
   enclosing set function when the enclosed set
   function is aggregated above or on the same
   nest level of as the level of the enclosing 
   set function.
 - updating the max_arg_level of the enclosing
   set function on a reference that refers to
   an item above or on the same nest level
   as the level of the enclosing set function.
 - Treating both Item_field and Item_ref as possibly
   referencing items from outer nest levels.
 2007-04-26 11:12:17 +03:00
df@pippilotta.erinye.com
fcea1c66e2 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-04-26 09:38:15 +02:00
tomas@whalegate.ndb.mysql.com
3b38c544eb ndb: force varpart part I, allow setting of flag in dictionary 2007-04-26 08:34:38 +02:00
df@pippilotta.erinye.com
d384d67af2 Two test cases didn't work without Blackhole compiled into the server. 2007-04-26 08:22:05 +02:00
malff/marcsql@weblab.(none)
62fd6aa696 manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I 2007-04-25 21:38:12 -06:00
jonas@perch.ndb.mysql.com
35b65dbf14 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-04-25 23:49:37 +02:00
jonas@perch.ndb.mysql.com
0fc59172aa Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-04-25 23:48:31 +02:00
malff/marcsql@weblab.(none)
18d7ed6564 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25411_merge
 2007-04-25 15:39:40 -06:00
gshchepa/uchum@gshchepa.loc
5983038a66 Fixed bug #27650: 
INSERT into InnoDB table may cause "ERROR 1062 (23000): Duplicate entry..."
errors or lost records after multi-row INSERT of the form:
"INSERT INTO t (id...) VALUES (NULL...) ON DUPLICATE KEY UPDATE id=VALUES(id)",
where "id" is an AUTO_INCREMENT column.

It happens because InnoDB handler forgets to save next insert id after
updating of auto_increment column with new values. As result of that
last insert id stored inside InnoDB dictionary tables differs from it's
cached thd->next_insert_id value.
 2007-04-26 02:01:23 +05:00
tsmith@quadxeon.mysql.com
c6f625bdbc Add --symbolic-links=1 for partition_not_windows-master.opt. 2007-04-25 22:55:19 +02:00
jonas@perch.ndb.mysql.com
7c7f5104eb ndb - 
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
 2007-04-25 22:50:35 +02:00
df@pippilotta.erinye.com
69395833bc 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-04-25 21:48:28 +02:00
df@pippilotta.erinye.com
b353df7474 Fix test case that was broken for builds without InnoDB. 
---
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vanilla-building
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-vanilla-building
---
Fix test cases to pass for a plain ./configure && make build. This includes disabling two test cases when certain features are not present in the server. We're not losing coverage from this because these features are usually present, and disabling them here only serves the purpose to make the test cases work in the unlikely case that they aren't.
---
fixes
 2007-04-25 21:33:18 +02:00
knielsen@ymer.(none)
87a0ffa05f Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb-bug27370 
into  ymer.(none):/usr/local/mysql/mysql-5.0-ndb
 2007-04-25 20:58:36 +02:00
knielsen@ymer.(none)
5dff16eb80 Merge bk-internal:/home/bk/mysql-5.1-telco-gca 
into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
 2007-04-25 20:45:48 +02:00
tsmith@quadxeon.mysql.com
da7bda45d6 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-25 20:29:28 +02:00
df@pippilotta.erinye.com
e0f148d5f0 Fix test case that was broken for builds without InnoDB. 2007-04-25 20:23:19 +02:00
tsmith@quadxeon.mysql.com
9e4cc9e393 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-04-25 20:23:05 +02:00
tsmith@quadxeon.mysql.com
43b4b044f7 Fix for valgrind errors in test: require symlink support for partition_not_windows.test 2007-04-25 20:21:55 +02:00
malff/marcsql@weblab.(none)
10dd997019 code review fix 2007-04-25 11:38:11 -06:00
jonas@perch.ndb.mysql.com
7b215a5762 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-04-25 18:02:40 +02:00
knielsen@ymer.(none)
0faa86bb86 After-merge fixes. 2007-04-25 15:48:12 +02:00
knielsen@ymer.(none)
39914c9b9b Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
 2007-04-25 15:40:13 +02:00
knielsen@ymer.(none)
f1898c0569 Merge bk-internal:/home/bk/mysql-5.1-new-ndb 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
 2007-04-25 15:32:44 +02:00
knielsen@ymer.(none)
db34fffea1 Merge ymer.(none):/usr/local/mysql/mysql-5.0-telco-gca 
into  ymer.(none):/usr/local/mysql/mysql-5.0-ndb
 2007-04-25 15:31:05 +02:00
tomas@whalegate.ndb.mysql.com
e5fb1acdf7 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-25 15:29:50 +02:00
tomas@whalegate.ndb.mysql.com
138264acab Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-25 15:28:56 +02:00
tomas@whalegate.ndb.mysql.com
7d63b2d12c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-04-25 15:25:56 +02:00
tomas@whalegate.ndb.mysql.com
0183b3d399 ndb: added some retry sleep to not get busy loops 2007-04-25 15:25:23 +02:00
tomas@whalegate.ndb.mysql.com
c1d0bbbbe6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-25 15:24:17 +02:00