mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
40016 commits 2781 branches 343 tags 1.6 GiB
Commit graph

1305 commits

Author SHA1 Message Date
mskold/marty@linux.site
77a59a1f48 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-11-29 11:55:52 +01:00
msvensson@neptunus.(none)
899dca14ee Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-03 17:53:10 +01:00
cmiller@zippy.cornsilk.net
b074e13483 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-02 17:51:59 -05:00
kostja@bodhi.local
aaeef40e72 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-02 03:30:16 +03:00
kostja@bodhi.local
965669d1f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-02 03:24:11 +03:00
joerg@trift2.
0d27df6f1a Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-01 13:26:03 +01:00
msvensson@shellback.(none)
5a049ba807 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-30 13:45:24 +01:00
jonas@perch.ndb.mysql.com
f6fcb302ab Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-28 00:01:24 +02:00
jonas@perch.ndb.mysql.com
a172a5dc63 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
 2006-10-27 16:38:12 +02:00
jonas@perch.ndb.mysql.com
ebcc594ea3 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-27 16:37:16 +02:00
iggy/Administrator@amd64.
c5960a9818 Post Merge Cleanup 2006-10-26 15:41:47 -04:00
pekka@orca.ndb.mysql.com
0dac23f627 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux
 2006-10-25 17:32:32 +02:00
knielsen@ymer.(none)
e43c5fca48 Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
 2006-10-25 10:44:22 +02:00
jonas@perch.ndb.mysql.com
d9d7c7859a Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-25 08:49:35 +02:00
jonas@perch.ndb.mysql.com
5230dcebcc 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
 2006-10-25 08:45:06 +02:00
petr/cps@owlet.local
eda71e24c3 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-rename-bug
 2006-10-24 17:00:23 +04:00
tsmith/tim@siva.hindu.god
aeced431e3 Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-10-23 23:41:07 -06:00
jonas@perch.ndb.mysql.com
cfd146d911 5.1.12 - release clone 
ndb - revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
 2006-10-23 09:48:36 +02:00
jonas@perch.ndb.mysql.com
79d8773e31 ndb - 
revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
 2006-10-22 08:24:31 +02:00
tsmith/tim@siva.hindu.god
09e094850b Applied InnoDB snapshot 5.1-ss927 
Fixes:
- Bug #23368: crash during insert, table has foreign key pointing into other schema,permission
 2006-10-20 13:44:49 -06:00
tsmith/tim@siva.hindu.god
032f356f7c Apply InnoDB snapshot ss923 
Fixes:
- Bug #18077: InnoDB uses full explicit table locks in stored FUNCTION
 2006-10-20 12:36:15 -06:00
jonas@perch.ndb.mysql.com
bcb92268e7 merge 2006-10-20 16:26:40 +02:00
jonas@perch.ndb.mysql.com
c2dcd9a9f0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-20 16:25:14 +02:00
jonas@perch.ndb.mysql.com
ff05ba5131 ndb - bug#23494 
Fix bug in restore with table with many columns, Compute size of databuffer pool correctly
 2006-10-20 14:37:34 +02:00
jonas@perch.ndb.mysql.com
07c6a601ea ndb - 
Add better error message if getting error in RESTORE
 2006-10-20 14:36:39 +02:00
jonas@perch.ndb.mysql.com
6980a0090f merge 2006-10-20 14:35:22 +02:00
jonas@perch.ndb.mysql.com
4218eb0fde Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-20 14:31:39 +02:00
gkodinov@dl145s.mysql.com
bb0422a0b0 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-10-20 11:12:35 +02:00
svoj@april.(none)
8b01686765 Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
 2006-10-19 19:59:57 +05:00
gkodinov@dl145s.mysql.com
ea8ba03556 Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-10-19 16:00:06 +02:00
pekka@orca.ndb.mysql.com
16ff0ddb4c Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux
 2006-10-19 12:29:24 +02:00
jonas@perch.ndb.mysql.com
d82797ec8f Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-19 11:23:34 +02:00
jonas@perch.ndb.mysql.com
61d7b5ca42 ndb - add temporary tables to hugo 
and use it for testOperations/testTransactions
 2006-10-19 11:20:04 +02:00
jonas@perch.ndb.mysql.com
5f69741462 ndb - bug#22672 
fix another incorrect assertion
 2006-10-19 11:18:04 +02:00
jonas@perch.ndb.mysql.com
5feaf8cafd ndb - fix incorrect assertion 
Dont assert when getting gci=0 in read only transaction
 2006-10-19 10:43:25 +02:00
jonas@perch.ndb.mysql.com
e3d84b36db Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-19 10:29:52 +02:00
istruewing@chilla.local
5af9dfa6ba Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-merge
 2006-10-19 10:15:08 +02:00
jonas@perch.ndb.mysql.com
0192b43927 ndb - bug#23430 
make sure not to release log buffer twice (or several times) in case of abort of multi update
 2006-10-18 20:54:25 +02:00
holyfoot/hf@deer.(none)
33a0e82f6e Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/hf/work/mysql-5.1-release
 2006-10-18 18:53:08 +05:00
stewart@willster.(none)
1d70db173f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
 2006-10-18 22:23:14 +10:00
holyfoot/hf@mysql.com/deer.(none)
b8e31d05f1 bug #23369 (Embedded library can't be linked) 
Problem is that some files moved to storage/*/ still are dependent
on sql/ code (usually use members of THD structure)
that can get different being compiled with another #define-s
Code added to recompile these for the embedded server
 2006-10-18 17:03:37 +05:00
stewart@willster.(none)
71636edc16 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
 2006-10-18 18:51:39 +10:00
stewart@willster.(none)
467903724c Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug21253
 2006-10-18 18:41:43 +10:00
stewart@willster.(none)
73831dad50 Bug #19148 Backup causes cluster down if _really_ early abort happens 
Early abort, failing to allocate buffers, would go down the abort track and
 end up trying to sendDropTriggers (as the standard stop backup does). 
However, it is possible to not have any tables yet defined in the backup 
(due to allocating buffers is before this). Simple check in sendDropTrig 
(and continue to next step). Files may be open, so we continue to close them.

Also updated ERROR_Codes (and added one to test this bug).
 2006-10-18 18:19:16 +10:00
jonas@perch.ndb.mysql.com
5bce99a90b ndb - 
Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)
 2006-10-18 10:07:02 +02:00
cmiller@zippy.cornsilk.net
184467a2cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-10-17 11:23:07 -04:00
jonas@perch.ndb.mysql.com
6439d381a0 ndb - fix some ndb strict-alias problems 
found with gcc 4.0.2 on Itanium2
  (ndb_dd_* failures)
 2006-10-16 23:37:00 +02:00
istruewing@chilla.local
8c6ba6ebb2 Merge chilla.local:/home/mydev/mysql-5.1--team 
into  chilla.local:/home/mydev/mysql-5.1-ateam
 2006-10-16 12:43:03 +02:00
pekka@orca.ndb.mysql.com
6b6cac0ded Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21191
 2006-10-16 11:44:53 +02:00
stewart@willster.(none)
975e2f37b9 BUG#21253 NdbApi.h should not include my_config.h 2006-10-16 17:01:01 +10:00