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
24950 commits 2861 branches 349 tags 1.7 GiB
Commit graph

24950 commits

Author SHA1 Message Date
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 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 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
joreland@mysql.com
5317b349b0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-20 14:27:44 +02:00
joreland@mysql.com
96272a6c52 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-4.1-push
 2005-07-20 14:25:46 +02:00
georg@lmy002.wdf.sap.corp
dc0645f7cf Merge grichter@bk-internal.mysql.com:/home/bk/mysql-4.1 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1
 2005-07-20 13:32:43 +02:00
joreland@mysql.com
07aab2139b Merge mysql.com:/home/jonas/src/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-4.1-push
 2005-07-20 13:32:20 +02:00
georg@lmy002.wdf.sap.corp
3468c8485d cs fixes from last commit 2005-07-20 13:31:45 +02:00
joreland@mysql.com
b2486b81df Merge mysql.com:/home/jonas/src/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-20 13:29:45 +02:00
joreland@mysql.com
1e8380df96 Merge mysql.com:/home/jonas/src/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-5.0
 2005-07-20 13:25:52 +02:00
joreland@mysql.com
bb73ba0902 bug#11942 - ndb backup 
fix error code to avoid clash with 5.0/5.1
 2005-07-20 13:21:49 +02:00
joreland@mysql.com
884559e3bf bug#11942 - ndb backup with parallell DDL 
add testcase to autotest
 2005-07-20 12:39:45 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
0f7639ba15 Added some missing casts and changed a define for alloca(). 2005-07-20 13:27:57 +03:00
konstantin@mysql.com
4570ace8fb Fix warnings/compilation failures reported by Jan Lindstrom 2005-07-20 14:17:06 +04:00
hf@deer.(none)
38d562ccc1 Fix for bug (myisamchk -rq crashes on spatial field) 2005-07-20 14:51:42 +05:00
joreland@mysql.com
9f707b6734 bug#11942 2005-07-20 11:48:48 +02:00
pekka@mysql.com
4b4b2ab6cb Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2005-07-20 11:29:26 +02:00
bar@mysql.com
8724c21bb3 Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-20 13:40:18 +05:00
pekka@mysql.com
e0c23a34d9 Merge mysql.com:/space/pekka/ndb/version/my50 
into  mysql.com:/space/pekka/ndb/version/my50-ndb
 2005-07-20 10:37:17 +02:00
bar@mysql.com
8564322500 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.innolike
 2005-07-20 11:00:33 +05:00
stewart@mysql.com
5b9e8da534 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-07-20 14:04:48 +10:00
jimw@mysql.com
d4e0d60156 Clean up after merge of bug fixes 2005-07-19 19:59:36 -07:00
jimw@mysql.com
82a7a31cde Merge mysql.com:/home/jimw/my/mysql-5.0-11954 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 19:59:35 -07:00
jimw@mysql.com
d7fbff3ec5 Merge mysql.com:/home/jimw/my/mysql-5.0-5906 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 19:59:34 -07:00
jimw@mysql.com
39efcdcf7c Merge mysql.com:/home/jimw/my/mysql-5.0-11822 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 19:59:33 -07:00
jimw@mysql.com
2a06e5756e Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 19:59:32 -07:00
evgen@moonbone.local
ef1d27e02a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-bug-11760
 2005-07-20 06:59:31 +04:00
evgen@moonbone.local
6b25219fea Fix bug Typo in Item_func_add_time::print() results in NULLs returned 
by subtime() in view

Item_func_add_time::print() were printing arg[0] instead of arg[1] which
results in wrongly created view. Functions addtime() and subtime were
affected by this bug.
 2005-07-20 06:55:51 +04:00