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

24925 commits

This branch
This branch
All branches
Author SHA1 Message Date
petr@mysql.com
49a1156c52 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-07-21 22:59:32 +04:00
petr@mysql.com
2624bf5290 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-07-21 22:51:15 +04:00
petr@mysql.com
9644bc3e2b Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads and alters one config file only." 2005-07-21 22:40:53 +04:00
kent@mysql.com
b598c67eba sync0sync.c, sync0sync.h: 
Declare 'mutex_list' and 'mutex_list_mutex' extern,
  to avoid link error on OS X and gcc flag "-fno-common"
 2005-07-21 18:05:10 +02:00
gluh@eagle.intranet.mysql.r18.ru
c1c504abf4 merge fix 2005-07-21 18:43:55 +05:00
gluh@mysql.com
d0086f7db0 Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2005-07-21 17:55:16 +05:00
stewart@mysql.com
1ca53ebc17 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-07-21 22:54:28 +10:00
hf@deer.(none)
ea81d5eaa3 Fix for bug #12042 (User breakpoints calling free() in embedded library) 2005-07-21 17:17:46 +05:00
bar@mysql.com
bd35a72d8a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b11216
 2005-07-21 16:43:06 +05:00
hf@deer.(none)
1b3df54188 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.10839
 2005-07-21 16:40:22 +05:00
joreland@mysql.com
d9f7fbe73f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-4.1-push
 2005-07-21 13:27:09 +02:00
bar@mysql.com
6d912fb2ac ctype-latin1.c: 
removing extra empty line
  ,
 2005-07-21 16:19:08 +05:00
bar@mysql.com
6a97af8a02 Bug#11216: 'show character set' describes latin1 incorrectly 
Index.xml:
  Fixing latin1 comment:
  it is actually cp1252, not iso-8859-1
ctype_latin1.result:
  changeing test results accordingly.
ctype-latin1.c:
  Fixed to- and from-Unicode conversion maps
  for better Unicode round trip of undefined
  characters.
 2005-07-21 16:05:19 +05:00
hf@deer.(none)
2d5cd49143 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.10839
 2005-07-21 15:56:22 +05:00
lenz@mysql.com
7f758438c8 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-07-21 12:55:39 +02:00
lenz@mysql.com
7a66261449 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-07-21 12:49:31 +02:00
hf@deer.(none)
1d11e8891e Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.10839
 2005-07-21 15:47:57 +05:00
joreland@mysql.com
12d6820834 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-4.1-push
 2005-07-21 12:43:38 +02:00
lenz@mysql.com
6efc5da029 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-07-21 12:29:27 +02:00
petr@mysql.com
b9fcdfbb0f WL #2713 Change IM behaviour so, that it only reads and alters one config file only. 
Implemented on brian's request.
 2005-07-21 14:21:23 +04:00
joreland@mysql.com
328f06bf0e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-21 11:33:25 +02:00
joreland@mysql.com
8b0a798c10 Merge mysql.com:/home/jonas/src/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-21 11:25:40 +02:00
joreland@mysql.com
5faa698eef Merge mysql.com:/home/jonas/src/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-5.0
 2005-07-21 11:22:21 +02:00
joreland@mysql.com
5939b37f29 Merge mysql.com:/home/jonas/src/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-4.1-push
 2005-07-21 11:15:44 +02:00
joreland@mysql.com
a7830ed93c bug#11942 - ndb - backup during DDL 
fix bug introduced in alter table
 2005-07-21 11:13:07 +02:00
lenz@mysql.com
9f5e591f37 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/space/my/mysql-4.0
 2005-07-21 10:15:28 +02:00
lenz@mysql.com
1a305963b7 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-07-21 10:15:08 +02:00
bar@mysql.com
568786a99e Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-21 13:13:11 +05:00
bar@mysql.com
b11e78381a ctype-cp932.c: 
After backporting from 5.0 fix.
  There is no an extra argument in 4.1.
 2005-07-21 13:10:27 +05:00
joreland@mysql.com
99744a9fd8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-4.1-push
 2005-07-21 09:35:42 +02:00
joreland@mysql.com
121d087d5d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-21 09:35:06 +02:00
joreland@mysql.com
faff193517 Merge mysql.com:/home/jonas/src/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-21 09:23:42 +02:00
lenz@mysql.com
805ff29108 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-07-21 09:12:49 +02:00
joreland@mysql.com
a5c6ab3c22 merge 2005-07-21 09:10:44 +02:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
5cdaf46362 Fix merge mistake 2005-07-21 01:38:42 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
6026054ead Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
 2005-07-21 01:29:57 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ac6623f08f Fix merge 2005-07-20 22:30:34 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
9663b9a974 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
 2005-07-20 21:58:33 -04:00
lenz@mysql.com
e259d9e96b Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0-build
 2005-07-20 22:41:53 +02:00
lenz@mysql.com
64e4c5ff98 - Manually merged fixes for BUG#12057 (*.plist (Mac OS X) files are installed on Linux) 2005-07-20 21:47:10 +02:00
mronstrom@mysql.com
4cb963439a Bug #10600 After review fixes 2005-07-20 21:19:01 +02:00
jimw@mysql.com
69a3209275 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-20 10:31:33 -07:00
jimw@mysql.com
93ae805db3 Fix date conversion on 32-bit machines. 2005-07-20 10:16:43 -07:00
lenz@mysql.com
ca9087a82c - don't install the Mac OS X support files when running "make install" - 
they're not needed outside of the source tree (BUG#12057)
- Removed some more unneeded files from "make install" along the way
 2005-07-20 19:15:48 +02:00
tomas@poseidon.ndb.mysql.com
3d0d5eb25b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-07-20 18:58:51 +02:00
tomas@poseidon.ndb.mysql.com
6ca09e8b8f Bug #12055 NDB temp tables created by ALTER TABLE are usable 
- do not discover temporary files and make them visible
 2005-07-20 18:40:55 +02:00
joerg@mysql.com
58a6214560 Upgraded the version number, as 5.0.10 is cloned off. 
This push includes the clone tag.
 2005-07-20 18:31:33 +02:00
konstantin@mysql.com
21957c423e Implement MySQL framework to support consistent read views in 
cursors. This should fix Bug#11813 when InnoDB part is in 
(tested with a draft patch).
The idea of the patch is that if a storage engine supports
consistent read views, we open one when open a cursor,
set is as the active view when fetch from the cursor, and close
together with cursor close.
 2005-07-20 20:02:36 +04:00
joreland@mysql.com
7482389227 Merge mysql.com:/home/jonas/src/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-20 16:10:41 +02:00
joreland@mysql.com
1ca398f6b9 merge 2005-07-20 16:09:22 +02:00