database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity
26,384 Commits 3,346 Branches 1,099 Tags
bd3b8a495ed1e65f69dc6d7ac9eefa968a48573b
Commit Graph

26384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
serg@serg.mylan
bd3b8a495e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-15 21:09:33 +02:00
serg@serg.mylan
db896a66ca bad merge fixed 2005-09-15 21:05:42 +02:00
SergeyV@selena.
94f987f205 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/fin-mysql-5.0
 2005-09-15 22:07:54 +04:00
evgen@moonbone.local
d693323b69 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/11416-bug-5.0-mysql
 2005-09-15 21:24:41 +04:00
evgen@moonbone.local
fcfcc016bd Merge 2005-09-15 20:50:10 +04:00
SergeyV@selena.
3a7acc92ff Merge selena.:H:/MYSQL/src/fin-mysql-4.1 
into  selena.:H:/MYSQL/src/fin-mysql-5.0
 2005-09-15 19:35:37 +04:00
monty@mysql.com
10a4a16654 Turn off EOLN_NATIVE flag of some test files 2005-09-15 17:59:01 +03:00
monty@mysql.com
9727fe5abf Merge mysql.com:/home/my/mysql-4.0 
into  mysql.com:/home/my/mysql-4.1
 2005-09-15 17:17:26 +03:00
monty@mysql.com
444dbfaf17 Turn off EOLN_NATIVE flag for all test files 
Ignored some generated files
 2005-09-15 17:14:39 +03:00
bell@sanja.is.com.ua
cc2ae4e55f Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
 2005-09-15 17:11:00 +03:00
pekka@mysql.com
233f6d99d6 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/export/space/pekka/ndb/version/my50
 2005-09-15 15:05:52 +02:00
pekka@mysql.com
275e520dda Merge mysql.com:/export/space/pekka/ndb/version/my41 
into  mysql.com:/export/space/pekka/ndb/version/my50
 2005-09-15 15:01:38 +02:00
lenz@mysql.com
c87080877c - bumped up version number to 5.0.14-rc in the main tree (5.0.13-rc has 
been branched off)
 2005-09-15 14:57:50 +02:00
lenz@mysql.com
d8bd92895d - bumped up version number from 5.0.13-beta to 5.0.13-rc 
- tagged this ChangeSet as "clone-5.0.13-build"
 2005-09-15 14:53:38 +02:00
pekka@mysql.com
af1ddc205b ndb - bug#9994 backpatch fixes from 5.0 
IGNORE on merge 4.1->5.0
 2005-09-15 14:48:49 +02:00
bell@sanja.is.com.ua
ff994c326e Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
 2005-09-15 15:39:44 +03:00
msvensson@neptunus.(none)
a9b3767874 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug13029/my50-bug13029
 2005-09-15 11:24:28 +02:00
msvensson@neptunus.(none)
d61645fe62 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
 2005-09-15 11:16:13 +02:00
bell@sanja.is.com.ua
630cdd7d0c Information schema fix for WL#2787 2005-09-15 11:56:06 +03:00
msvensson@neptunus.(none)
872d85dabe Bug #13029 YaSSL not compatibile w/ JSSE (Java implementation of SSL) 
-Applied patch from Todd
 2005-09-15 09:46:10 +02:00
msvensson@neptunus.(none)
ae89da95fe Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
 2005-09-15 09:12:52 +02:00
ingo@mysql.com
6712aa1a7d Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-15 09:02:26 +02:00
msvensson@neptunus.(none)
95197f39a2 Bug #12526 yassl: Crashes in "integer.cpp" 
- Disable inlining in integer.cp for sparc solaris Cun C++ 5.6
 2005-09-15 08:59:29 +02:00
dlenev@mysql.com
ff4a6e139e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg12704-2
 2005-09-15 05:06:54 +04:00
dlenev@mysql.com
2a96aa110f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg12704-2
 2005-09-15 03:57:59 +04:00
dlenev@mysql.com
e231ebe5fb Fix for bug #12704 "Server crashes during trigger execution". 
This bug occurs when some trigger for table used by DML statement is created
or changed while statement was waiting in lock_tables(). In this situation
prelocking set which we have calculated becames invalid which can easily lead
to errors and even in some cases to crashes.

With proposed patch we no longer silently reopen tables in lock_tables(),
instead caller of lock_tables() becomes responsible for reopening tables and
recalculation of prelocking set.
 2005-09-15 03:56:09 +04:00
eric@mysql.com
b4c9c778c3 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/eric/mysql-5.0-fed-err
 2005-09-14 14:46:07 -07:00
eric@mysql.com
92e2936fb9 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/eric/mysql-5.0-fed-err
 2005-09-14 13:52:43 -07:00
elliot@mysql.com
f3030c3411 Updated test results for view test. 2005-09-14 16:27:55 -04:00
elliot@mysql.com
588af40cda Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
 2005-09-14 16:16:04 -04:00
bell@sanja.is.com.ua
87a8fb4807 fixed portability 2005-09-14 23:12:01 +03:00
evgen@moonbone.local
ac32450609 Fix bug #11416 Server crash if using a view that uses function convert_tz 
When parser parses function convert_tz it loads available timezone tables in
thd->lex->time_zone_tables_used. But view have another lex that main query.
Thus time_zone_tables_used of main query left uninitialized.
When Item_func_conver_tz is fixed it takes timezone tables from main query
and later when it executed it assumes that timezone tables are loaded and
failed that assertion.
 2005-09-15 00:08:12 +04:00
ingo@mysql.com
39ae05dfc9 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-14 20:57:45 +02:00
elliot@mysql.com
86882cc8f9 Merge mysql.com:/home/emurphy/src/work/mysql-5.0-bug-12870 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
 2005-09-14 14:44:48 -04:00
elliot@mysql.com
8e7e17166c BUG#12870 (CREATE PROCEDURE followed by ROLLBACK is not replicated) 
Fixed by making CREATE/ALTER/DROP PROCEDURE cause implicit commit.
 2005-09-14 14:42:39 -04:00
eric@mysql.com
63961bcbe9 Per LenZ, changed calculated buffer size to constant and removed some unused variables. 2005-09-14 11:02:33 -07:00
aivanov@mysql.com
a42b5000ca Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-13000
 2005-09-14 20:32:59 +04:00
aivanov@mysql.com
53e90b53bc Fixed BUG#12963, BUG#13000: wrong VIEW creation with DAYNAME(), 
DAYOFWEEK(), and WEEKDAY().
 2005-09-14 20:25:00 +04:00
ingo@mysql.com
e0d668baa3 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-14 18:22:43 +02:00
tulin@dl145c.mysql.com
129c98179b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-09-14 17:27:01 +02:00
bell@sanja.is.com.ua
c41970ab75 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
 2005-09-14 17:36:09 +03:00
tulin@dl145c.mysql.com
63e187b88f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-09-14 16:32:44 +02:00
stewart@mysql.com
e51ec754b8 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug13136
 2005-09-15 00:31:13 +10:00
ingo@mysql.com
410043a8b4 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-09-14 16:30:48 +02:00
ingo@mysql.com
e564b723cb Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-14 16:30:32 +02:00
bell@sanja.is.com.ua
d1c4241aa5 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
 2005-09-14 17:28:28 +03:00
bell@sanja.is.com.ua
2fce07b08b postmerge fix 2005-09-14 17:27:33 +03:00
stewart@mysql.com
9e5e9603b5 BUG#13136 NdbTCP.cpp compile failure on OSX 10.2 
use select if poll is unavailable.
 2005-09-15 00:21:25 +10:00
tulin@dl145c.mysql.com
e1383ab4c4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-09-14 15:47:15 +02:00
tulin@dl145c.mysql.com
a8eb0f176b enabled mysqldump hex-blob option for bit fields 2005-09-14 15:46:31 +02:00