mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41678 commits 2778 branches 343 tags 1.6 GiB
Commit graph

1496 commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
a460d5f288 ndb - bug#21948 
Fix bug in previous changeset...causing SR problems with disk
 2006-12-08 10:24:48 +01:00
jonas@perch.ndb.mysql.com
ca3d0cf5b0 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-07 15:25:40 +01:00
jonas@perch.ndb.mysql.com
3ab75d971d ndb - bug#21948 & bug#17605 
fix alloc/free extent in undo log
  allow extent to be reused once a lcp is finished (instead of when next lcp starts)
 2006-12-07 15:25:02 +01:00
baker@bk-internal.mysql.com
37f7e29db2 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-06 20:26:10 +01:00
jonas@perch.ndb.mysql.com
4456144c58 ndb - add support for periodic mem-reporting 2006-12-06 14:38:32 +01:00
jonas@perch.ndb.mysql.com
174d561489 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-06 13:28:13 +01:00
jonas@perch.ndb.mysql.com
b7deb4dcec Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-06 13:10:00 +01:00
jonas@perch.ndb.mysql.com
315a4e18c8 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-05 22:45:17 +01:00
msvensson@neptunus.(none)
90226bbc33 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-05 19:19:58 +01:00
msvensson@neptunus.(none)
3ad4878385 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-05 18:52:58 +01:00
msvensson@neptunus.(none)
d8e6f01396 Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-12-05 18:50:46 +01:00
jonas@perch.ndb.mysql.com
d720cd2786 ndb - bug#24664 
1) run lcp snapshot for both MM and DD tables (so I dont have to change restore to use WRITE)
  2) fix >= and > bug in lcp skip/keep handling
  3) very cool test prog for this :-)
 2006-12-05 15:10:56 +01:00
holyfoot/hf@deer.(none)
1409b448ac Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/22634/my51-22634
 2006-12-05 12:52:59 +04:00
mskold/marty@linux.site
2b3789dd5a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-12-05 09:38:12 +01:00
tsmith/tim@siva.hindu.god
97f48ef129 Change ::fileno() to fileno() in ndb/common/util/File.cpp. 
fileno(), and many other stdio functions, may be macros
(at least on *BSD).

Don't explicitly qualify it with global scope (::fileno()),
because it causes syntax errors.

<cstdio> doesn't define *most* of these macros.

It still has a macro for fileno(), however, on FreeBSD 6.1,
so even using <cstdio> isn't a fix for this.  Better to
just avoid ::standard_library_function() in general, in
order to be portable.
 2006-12-04 14:41:08 -07:00
istruewing@chilla.local
70e56f06cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-04 20:56:37 +01:00
msvensson@neptunus.(none)
971c783f7d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-04 19:11:55 +01:00
msvensson@neptunus.(none)
6072b7a4c4 Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-12-04 18:44:14 +01:00
iggy@rolltop.ignatz42.dyndns.org
b70d2b9341 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my51-bug17951 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-12-04 12:38:41 -05:00
iggy@rolltop.ignatz42.dyndns.org
76d43f1fdd Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my50-bug17951 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my51-bug17951
 2006-12-04 12:30:58 -05:00
holyfoot/hf@deer.(none)
d64142e2e6 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/22634/my51-22634
 2006-12-04 20:18:30 +04:00
jonas@perch.ndb.mysql.com
630636a27c ndb - bug#24166 
SR crash if table with disk with hidden primary key...
 2006-12-04 10:06:51 +01:00
baker@bk-internal.mysql.com
dbe5f0acc5 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-03 21:19:35 +01:00
brian@zim.(none)
31d67280f7 This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h 2006-12-01 17:26:52 -08:00
patg@radha.tangent.org
a3e85cce4e WL# 3031 
Backport of functionality in private 5.2 tree. 

Added new language to parser, new mysql.servers table and associated code
to be used by the federated storage engine to allow central connection information
per WL entry.
 2006-12-01 19:47:45 -05:00
istruewing@chilla.local
f7657f47c5 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-01 23:01:33 +01:00
istruewing@chilla.local
cc4e2a85c6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-01 22:59:51 +01:00
istruewing@chilla.local
fe206c71a7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-01 22:56:43 +01:00
mskold/marty@linux.site
6f0e7a2631 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-01 21:12:13 +01:00
mskold/marty@linux.site
9e56779f97 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-12-01 16:44:50 +01:00
mskold/marty@linux.site
93b7491421 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-01 16:37:13 +01:00
andrey@example.com
8fcf14210d Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  example.com:/work/bug24395-v2/my51
 2006-12-01 16:27:48 +01:00
mskold/marty@mysql.com/linux.site
cde79e4f79 Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
jonas@perch.ndb.mysql.com
7a0179e178 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-01 14:06:15 +01:00
jonas@perch.ndb.mysql.com
764304031d ndb - bug#24655 
Handle events "differently" so that dict doesnt get lock too often
 2006-12-01 14:04:06 +01:00
jonas@perch.ndb.mysql.com
fc09c8a62d Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 13:58:24 +01:00
andrey@example.com
afb930947d Merge example.com:/work/bug24395-v2/my50 
into  example.com:/work/bug24395-v2/my51
 2006-12-01 11:37:33 +01:00
jonas@perch.ndb.mysql.com
32c67ca05f Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-01 11:32:52 +01:00
jonas@perch.ndb.mysql.com
37f97b29c0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 11:25:08 +01:00
jonas@perch.ndb.mysql.com
13c44a9197 ndb - bug#24717 
fixes to testprogram to test new impl. in 5.1
 2006-12-01 11:08:53 +01:00
jonas@perch.ndb.mysql.com
75467cc9f1 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 10:33:28 +01:00
jonas@perch.ndb.mysql.com
f1722c76a0 ndb - 
fix merge error
 2006-12-01 10:29:45 +01:00
pekka@orca.ndb.mysql.com
b304b3f8e1 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
 2006-12-01 10:10:22 +01:00
jonas@perch.ndb.mysql.com
b20c6e69ad ndb - bug#24717 
5.1 version
  remove 5.0 version
  add general routing signal
  send tckeyref routed if needed...
 2006-12-01 09:37:17 +01:00
jonas@perch.ndb.mysql.com
8f4dc87d98 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 09:14:12 +01:00
jonas@perch.ndb.mysql.com
3bf0a9d311 ndb - bug#24476 
Fix typo that yeilded rare crash in ACC
 2006-12-01 08:54:28 +01:00
gni/root@ts3-168.ts.cn.tlan
dfd2c8f4fb For merging mysql-5.1-new-ndb-bj tree into mysql-5.1-new-ndb tree 2006-12-01 12:16:25 +08:00
gni/root@ts3-168.ts.cn.tlan
24b1feea03 Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
 2006-12-01 11:35:05 +08:00
pekka@orca.ndb.mysql.com
6758c1679c ndb - bug#21690: fix typo which changed blob parts distribution 2006-12-01 02:06:37 +01:00
monty@narttu.mysql.fi
693b906f6e Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-30 23:27:16 +02:00