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

32942 commits

This branch
This branch
All branches
Author SHA1 Message Date
jonas@perch.ndb.mysql.com
e5de83a62e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-04-08 11:03:46 +02:00
ingo@mysql.com
26c4e82fee Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-aid
 2006-04-08 10:48:33 +02:00
kent@mysql.com
91d28a6d36 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
 2006-04-08 04:37:59 +02:00
kent@mysql.com
f957d8e282 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
 2006-04-08 04:29:17 +02:00
igor@rurik.mysql.com
2e662287ce Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-07 17:56:33 -07:00
ingo@mysql.com
ddf81838a7 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-aid
 2006-04-07 23:39:01 +02:00
aelkin@dl145j.mysql.com
61377e953d Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145j.mysql.com:/tmp/5.0.21-bug17284-temp_table
 2006-04-07 22:42:55 +02:00
serg@serg.mylan
5eefa6ec1f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-04-07 22:38:53 +02:00
serg@serg.mylan
c17d3a5148 plugin/fulltext/configure.in 
no sense in building static library version of a plugin
plugin/fulltext/plugin_example.c
    comments clarified. everything local to a plugin was declared static
 2006-04-07 22:36:04 +02:00
igor@rurik.mysql.com
0d2e911204 Merge rurik.mysql.com:/home/igor/mysql-5.1 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-04-07 13:22:07 -07:00
igor@rurik.mysql.com
fb3b768205 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-04-07 13:07:40 -07:00
aivanov@mysql.com
612266ec90 Fixed BUG#15758: "Holding adaptive search latch in 
innobase_query_caching_of_table_permitted()".
 Applied the patch due to Heikki Tuuri.
 Also removed superfluous #ifdefs.
 2006-04-07 23:58:17 +04:00
joerg@mysql.com
a0c3f51c10 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mtr-5.0
 2006-04-07 20:26:12 +02:00
aelkin@mysql.com
bfbd922eb8 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.21-bug17284-temp_table
 2006-04-07 21:21:23 +03:00
joerg@mysql.com
e246f0402f Merge mysql.com:/M50/mtr-5.0 into mysql.com:/M51/clone-5.1 2006-04-07 19:56:23 +02:00
joerg@mysql.com
4a5985e694 Manual merge. 2006-04-07 19:50:07 +02:00
aelkin@mysql.com
d881fb36b9 Bug#17284 erroneous temp table cleanup on slave. 
Idea of the fix is for master to send FD event with `created' as 0
     to reconnecting slave (upon slave_net_timeout, no master crash) to avoid destroying temp tables.
     In a case of a connect by slave to the master after its crash temp tables have been already
     cleaned up so that slave can not keep `orphan' temp tables.
 2006-04-07 20:44:37 +03:00
joerg@mysql.com
657d1bd182 Manual merge. 2006-04-07 19:42:46 +02:00
joerg@mysql.com
a7edbc647e mysql-test/mysql-test-run.sh : Provide info about the options used. 2006-04-07 19:27:19 +02:00
igor@rurik.mysql.com
f053b7c9d0 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-04-07 10:19:09 -07:00
jonas@perch.ndb.mysql.com
739b0d676b ndb - bug#11034 
fix mem leak (not during running of transactions, but a few bytes when shutting down)
 2006-04-07 17:10:56 +02:00
joerg@mysql.com
06cba02907 Merge mysql.com:/M50/clone-5.0 into mysql.com:/M51/mysql-5.1 2006-04-07 16:45:47 +02:00
joerg@mysql.com
86715aa8ea Merge mysql.com:/M50/clone-5.0 into mysql.com:/M51/clone-5.1 2006-04-07 16:38:51 +02:00
jonas@perch.ndb.mysql.com
7cd90d0081 ndb - bug#11033 
silent valgrind warnings 5.0, ndb_autodiscover
 2006-04-07 15:48:13 +02:00
bpontz@shasta.mysql.com
1ec9119308 configure.in: 
increase version number for clone
 2006-04-07 08:54:16 -04:00
ingo@mysql.com
2697018c5b Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-aid
 2006-04-07 14:39:49 +02:00
msvensson@neptunus.(none)
0d98d97170 Remove #if 0 2006-04-07 14:21:00 +02:00
joerg@mysql.com
a663acb13f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/merge-5.1
 2006-04-07 14:05:49 +02:00
joerg@mysql.com
24bf40caec Null-merge, as the changes in question were backports from 5.1. 2006-04-07 13:58:45 +02:00
joerg@mysql.com
945599f3cf Manual merge. 2006-04-07 13:44:43 +02:00
joerg@mysql.com
65f4595e9a mysql-test/mysql-test-run.pl : Add option "with-ndbcluster-only" (ignored). 2006-04-07 13:34:39 +02:00
joerg@mysql.com
df09a0cedc Manual merge. 2006-04-07 13:16:40 +02:00
joerg@mysql.com
7e4d41de58 Perl test script: Avoid some aborts, which made the whole build/test process terminate. 2006-04-07 13:02:15 +02:00
jonas@perch.ndb.mysql.com
452a2fb1bf Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-07 12:56:25 +02:00
jonas@perch.ndb.mysql.com
26b94adca6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-04-07 12:53:23 +02:00
serg@serg.mylan
8db57d7b3d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-04-07 12:42:57 +02:00
serg@serg.mylan
1620426482 rpl_ndb_delete_nowhere.test requires ndb 2006-04-07 12:38:38 +02:00
andrey@lmy004.
1d816d2cf3 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug17494-real
 2006-04-07 12:29:32 +02:00
joerg@mysql.com
a0541800aa mysql-test/mysql-test-run.sh : Add option "--with-ndbcluster-only" (backport from 5.1) 2006-04-07 12:22:55 +02:00
msvensson@neptunus.(none)
b13c7d2027 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-07 12:16:57 +02:00
msvensson@neptunus.(none)
042e2f811e Merge neptunus.(none):/home/msvensson/mysql/bug13228/my51-bug13228 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-07 12:13:48 +02:00
serg@serg.mylan
a5ed8bf668 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-04-07 12:13:42 +02:00
jonas@perch.ndb.mysql.com
878ce564f4 Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-04-07 12:01:09 +02:00
jonas@perch.ndb.mysql.com
2d284fe0ed Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
 2006-04-07 12:01:08 +02:00
tomas@poseidon.ndb.mysql.com
d202d89c0a multi node shutdown adabtions for restart of management servers 2006-04-07 12:01:07 +02:00
msvensson@neptunus.(none)
c2f1259834 Merge neptunus.(none):/home/msvensson/mysql/bug13228/my50-bug13228_minimal 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-07 11:46:22 +02:00
msvensson@neptunus.(none)
bed57fcf7e Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-07 11:36:28 +02:00
andrey@lmy004.
bdfdd38f60 update tests 2006-04-07 11:29:15 +02:00
msvensson@neptunus.(none)
98904a8caa Add new function mysql_get_ssl_cipher to libmysl and use it from client to avoid dependency on SSL libs from mysql client. 2006-04-07 11:26:21 +02:00
hartmut@mysql.com
4a4c459fa3 Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
 2006-04-07 11:23:55 +02:00