mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35136 commits 2794 branches 343 tags 1.5 GiB
Commit graph

35136 commits

This branch
This branch
All branches
Author SHA1 Message Date
igor@rurik.mysql.com
940fe6fea6 Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-06-09 17:56:08 -07:00
igor@rurik.mysql.com
bcc898f71b Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-06-09 15:39:10 -07:00
kent@mysql.com
3744b46a1d Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/data0/mysqldev/my/mysql-4.1
 2006-06-09 22:42:34 +02:00
konstantin@mysql.com
5579fc230d Disable im_life_cycle test 2006-06-10 00:35:44 +04:00
kent@mysql.com
a5bc38a0d3 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/mysqldev/my/mysql-5.0
 2006-06-09 22:34:21 +02:00
igor@rurik.mysql.com
3d6899948b Merge rurik.mysql.com:/home/igor/mysql-5.1 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-06-09 12:31:15 -07:00
igor@rurik.mysql.com
e6e4462d68 Post-merge fixes 2006-06-09 12:27:28 -07:00
sergefp@mysql.com
a0676542a7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1 
into mysql.com:/home/psergey/mysql-5.1-bug19684
 2006-06-09 20:38:53 +04:00
ingo@chilla.local
091401e7a8 Merge mysql.com:/home/mydev/mysql-5.1--main 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-06-09 18:20:10 +02:00
ingo@chilla.local
f991b573c5 Merge mysql.com:/home/mydev/mysql-5.1--main 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-06-09 17:32:23 +02:00
holyfoot@mysql.com
c2df72d6cb Merge 2006-06-09 19:09:42 +05:00
joerg@trift2.mysql.com
44c0053a44 Merge trift2.mysql.com:/M41/bug20303-4.1 
into trift2.mysql.com:/M41/mysql-4.1
 2006-06-09 14:37:24 +02:00
joerg@trift2.mysql.com
4b9a1a8bbb Merge trift2.mysql.com:/M50/bug20303-5.0 
into trift2.mysql.com:/M50/mysql-5.0
 2006-06-09 14:13:01 +02:00
joerg@trift2.
7987ef89fd Merge mysql.com:/M51/bug20303-5.1 into mysql.com:/M51/mysql-5.1 2006-06-09 13:56:29 +02:00
ingo@mysql.com
0ae24af51b Merge mysql.com:/home/mydev/mysql-5.1--main 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-06-09 13:51:41 +02:00
joerg@mysql.com
98b80d12cd Merge mysql.com:/M50/bug20303-5.0 into mysql.com:/M51/bug20303-5.1 2006-06-09 13:49:10 +02:00
tomas@poseidon.ndb.mysql.com
6e68423db6 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-09 12:40:10 +02:00
tomas@poseidon.ndb.mysql.com
5af1d8de07 Bug #13266 Online adding of MySQLD causes cluster to crash 
- check node type, if configuration has not bee updated, type will be undefined, and conenction will be refused
 2006-06-09 12:30:04 +02:00
jonas@perch.ndb.mysql.com
246d76f154 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
 2006-06-09 12:17:00 +02:00
mskold@mysql.com
22fea185bd Merge mysql.com:/home/marty/MySQL/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-09 12:07:04 +02:00
jonas@mc01.ndb.mysql.com
4a8dbd3f7b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas 
into mc01.ndb.mysql.com:/space/jonas/mysql-5.1-jonas
 2006-06-09 11:40:38 +02:00
jonas@mc01.ndb.mysql.com
9064f067e8 ndb - fix 5.1 scan error handling problem 
Make sure that error gets set corretly also
    when error code directly after taking mutex
 2006-06-09 11:39:27 +02:00
igor@rurik.mysql.com
9ec346b980 Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-06-09 00:48:51 -07:00
igor@rurik.mysql.com
70ee1c2c6e Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-06-09 00:23:59 -07:00
jonas@perch.ndb.mysql.com
e3323e7b90 ndb - 
restore --with-ndb-ccflags functionality
 2006-06-09 09:06:43 +02:00
knielsen@mysql.com
6d40321bac Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1. 2006-06-09 08:40:21 +02:00
jonas@perch.ndb.mysql.com
e576b2460b ndb - testframework 
impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases
 2006-06-09 08:22:50 +02:00
joerg@mysql.com
1cd78f7a2b Merge mysql.com:/M41/bug20303-4.1 into mysql.com:/M50/bug20303-5.0 2006-06-08 19:57:26 +02:00
joerg@mysql.com
a26c9c31a1 mysql-test/mysql-test-run.pl : Output the usage error if one is given. (Found when fixing bug#20303) 2006-06-08 19:55:22 +02:00
joerg@mysql.com
47f37f4d45 Merge mysql.com:/M41/bug20303-4.1 into mysql.com:/M50/bug20303-5.0 2006-06-08 19:32:25 +02:00
tomas@poseidon.ndb.mysql.com
b9d43d7400 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-08 17:57:55 +02:00
tomas@poseidon.ndb.mysql.com
a6294a33cf Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-06-08 17:55:44 +02:00
knielsen@mysql.com
acf3a19382 Add trigger to protect against changesets from crashed tree 2006-06-08 17:37:43 +02:00
tomas@poseidon.ndb.mysql.com
fec7fd18f0 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-06-08 17:28:01 +02:00
tomas@poseidon.ndb.mysql.com
50bb4b6cb0 Bug #20336 CLUSTERLOG commands have no effect 2006-06-08 17:26:56 +02:00
jonas@mc01.ndb.mysql.com
b7ce47b28e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas 
into mc01.ndb.mysql.com:/space/jonas/mysql-5.1-jonas
 2006-06-08 16:33:17 +02:00
mskold@mysql.com
597e1444aa Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked 2006-06-08 16:12:38 +02:00
jonas@mc01.ndb.mysql.com
20903f8e49 merge 2006-06-08 16:11:55 +02:00
jonas@perch.ndb.mysql.com
25dc68e9f9 ndb - hugo 
Print (and optionally specify) random seed
 2006-06-08 15:43:41 +02:00
joerg@mysql.com
5091df1333 mysql-test/mysql-test-run.pl : A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument" 2006-06-08 14:52:33 +02:00
gkodinov@mysql.com
c9bb9413ab Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean 
into  mysql.com:/home/kgeorge/mysql/5.0/B15355
 2006-06-08 14:26:02 +03:00
jonas@mc01.ndb.mysql.com
340e5ce138 ndb - bug#20334 
fix bug in tup scan wrt LCP
 2006-06-08 12:41:06 +02:00
gkodinov@mysql.com
395affb8e9 Bug #15355: Common natural join column not resolved in prepared statement nested 
query
Problem:
There was a wrong context assigned to the columns that were added in insert_fields()
when expanding a '*'. When this is done in a prepared statement it causes 
fix_fields() to fail to find the table that these columns reference.
Actually the right context is set in setup_natural_join_row_types() called at the 
end of setup_tables(). However when executed in a context of a prepared statement
setup_tables() resets the context, but setup_natural_join_row_types() was not
setting it to the correct value assuming it has already done so.

Solution:
The top-most, left-most NATURAL/USING join must be set as a 
first_name_resolution_table in context even when operating on prepared statements.
 2006-06-08 13:34:03 +03:00
petr@mysql.com
9669d3ae58 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-logs-final
 2006-06-07 23:58:08 +04:00
stewart@mysql.com
3e1a5169c7 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/jonas 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue
 2006-06-08 02:40:16 +10:00
stewart@mysql.com
d8ab58e304 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug20016 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue
 2006-06-08 02:33:25 +10:00
stewart@mysql.com
60e15a24f4 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug19932 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue
 2006-06-08 02:32:33 +10:00
svoj@may.pils.ru
9b3fdd0b4c Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  may.pils.ru:/home/svoj/devel/mysql/BUG19192/mysql-5.0
 2006-06-07 19:57:48 +05:00
jonas@mc01.ndb.mysql.com
2b82420a6c ndb - 
fix release compile error
 2006-06-07 16:02:37 +02:00
msvensson@neptunus.(none)
e4d3341d35 Import from yaSSL to fix bild problems on AIX(already fixed but was lost during last import) 2006-06-07 14:46:10 +02:00