mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24752 commits 2793 branches 343 tags 1.7 GiB
Commit graph

24752 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
georg@lmy002.wdf.sap.corp
3468c8485d cs fixes from last commit 2005-07-20 13:31: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
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
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 #11760 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
jimw@mysql.com
63c6ece728 Cleanups after merge from 4.1. 2005-07-19 16:32:38 -07:00
konstantin@mysql.com
5f5e10ed25 Fix a compilation failure. 2005-07-20 01:17:16 +04:00
pekka@mysql.com
f3ba8ea289 Merge mysql.com:/space/pekka/ndb/version/my50 
into  mysql.com:/space/pekka/ndb/version/my50-ndb
 2005-07-19 23:07:41 +02:00
elliot@mysql.com
d347568a12 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/emurphy/src/mysql-5.0
 2005-07-19 22:32:08 +02:00
elliot@mysql.com
7e4179ea02 ha_ndbcluster.cc: 
BUG#12040 Fixed compile failure by using %p instead of %x to print a pointer in DBUG_PRINT
 2005-07-19 22:04:43 +02:00
konstantin@mysql.com
15ef68df0f Ignore mysql-test/var (I'm pushing it for the second time already :(() 2005-07-20 00:02:49 +04:00
konstantin@mysql.com
7651ca7595 .del-var~62c955ccf2da1a21: 
Delete: mysql-test/var
 2005-07-19 21:55:39 +02:00
konstantin@mysql.com
e3af1b6ec6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kostja/mysql/mysql-5.0-10760-new
 2005-07-19 22:22:12 +04:00
konstantin@mysql.com
14344b658a A fix and a test case for Bug#10760 and complementary cleanups. 
The idea of the patch
is that every cursor gets its own lock id for table level locking.
Thus cursors are protected from updates performed within the same 
connection. Additionally a list of transient (must be closed at
commit) cursors is maintained and all transient cursors are closed
when necessary. Lastly, this patch adds support for deadlock
timeouts to TLL locking when using cursors.
+ post-review fixes.
 2005-07-19 22:21:12 +04:00
jimw@mysql.com
80c1c6b33f Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 11:05:49 -07:00
dlenev@mysql.com
a0170139a7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-tn
 2005-07-19 22:02:53 +04:00
dlenev@mysql.com
8ad9af446b After merge fix. 2005-07-19 21:38:12 +04:00
jimw@mysql.com
bb6918e312 Merge mysql.com:/home/jimw/my/mysql-4.1-7249 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-19 10:35:15 -07:00
dlenev@mysql.com
b141437ad3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-tn
 2005-07-19 20:55:09 +04:00
monty@mishka.local
292aefeeca Fixed some test cases that was not forgotten in a recent patch 2005-07-19 19:47:54 +03:00
monty@mishka.local
29d9aa65f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-07-19 19:28:26 +03:00
monty@mishka.local
7e83d09ce7 Simple fixes during review of new code 2005-07-19 19:25:05 +03:00
jimw@mysql.com
f40ac0bb99 Merge mysql.com:/home/jimw/my/mysql-5.0-readline 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 09:15:22 -07:00
dlenev@mysql.com
8a3e723b74 Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch) 
"Triggers have the wrong namespace"
  "Triggers: duplicate names allowed"
  "Triggers: CREATE TRIGGER does not accept fully qualified names"
  "SHOW TRIGGERS"
 2005-07-19 20:06:49 +04:00
georg@lmy002.wdf.sap.corp
3e1ae2633a fix for bug#12001 2005-07-19 17:31:18 +02:00
georg@lmy002.wdf.sap.corp
21a88afeed minor fix (backport from 5.0) - changed function prototype/definition 2005-07-19 17:12:00 +02:00
tulin@dl145b.mysql.com
c9abae2ce2 printout of cluster config to use same tokens as documentation 2005-07-19 16:34:56 +02:00
tulin@dl145b.mysql.com
2f01676b37 ConfigInfo.cpp: 
BUG#12028, cannot use default section for hostname in cluster config
  made clearer error message
 2005-07-19 15:25:55 +02:00
tulin@dl145b.mysql.com
74438e6683 BUG#12028, cannot use default value for HostName in cluster config 
+ added switch --print-full-config
+ removed unused REP configuration
 2005-07-19 14:33:38 +02:00