mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30598 commits 2790 branches 343 tags 1.7 GiB
Commit graph

30598 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@devsrv-b.mysql.com
94c9e172d8 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
 2006-06-14 22:14:59 +02:00
tomas@poseidon.ndb.mysql.com
476caec5ef Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-14 22:11:38 +02:00
msvensson@neptunus.(none)
4fcf32909a Bug#19191 Repeated crashes on OpenBSD for ssl test cases 
- Import patch from yaSSL
 2006-06-14 21:30:49 +02:00
tomas@poseidon.ndb.mysql.com
0c805b3f0d Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-14 20:27:32 +02:00
tomas@poseidon.ndb.mysql.com
01046bb756 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-06-14 20:25:51 +02:00
tomas@poseidon.ndb.mysql.com
47271c6bb1 Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL 
- correction of backport error
 2006-06-14 20:22:03 +02:00
tomas@poseidon.ndb.mysql.com
2fcf737feb Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL 
- make sure to disable bulk insert when check for duplicate key is needed
 2006-06-14 20:16:32 +02:00
joerg@mysql.com
1592670959 Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M50/mysql-5.0 2006-06-14 18:25:09 +02:00
joerg@mysql.com
6448fca67a Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M50/bug18810-5.0 2006-06-14 18:13:36 +02:00
joerg@mysql.com
054cc44ede support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + bug#20118 2006-06-14 16:54:54 +02:00
tomas@poseidon.ndb.mysql.com
941ddafd48 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-14 13:01:32 +02:00
tomas@poseidon.ndb.mysql.com
88373a025a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-06-14 13:00:15 +02:00
tomas@poseidon.ndb.mysql.com
7e2323ed7e Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to 
corrupt
  - add infinite retry on drop table temporary error
 2006-06-14 12:54:28 +02:00
pekka@clam.ndb.mysql.com
e071bbcb0b ndb - bug#20406 multi-platform testing - not FIX 2006-06-14 00:38:34 +02:00
gkodinov@mysql.com
df358201e8 Merge mysql.com:/home/kgeorge/mysql/5.0/clean 
into  mysql.com:/home/kgeorge/mysql/5.0/B20363
 2006-06-12 18:28:04 +03:00
gkodinov@mysql.com
eb693dcc7b Bug #20363: Create view on just created view is now denied 
There was a wrong determination of the DB name (witch is 
not always the one in TABLE_LIST because derived tables
may be calculated using temp tables that have their db name
set to "").
The fix determines the database name according to the type 
of table reference, and calls the function check_access() 
with the correct db name so the correct set of grants is found.
 2006-06-12 18:15:08 +03:00
mskold@mysql.com
69d52db924 Added order by 2006-06-12 15:36:12 +02:00
mskold@mysql.com
4242beb31d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-12 15:36:10 +02:00
tomas@poseidon.ndb.mysql.com
a590e5dc82 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-12 15:36:09 +02:00
tomas@poseidon.ndb.mysql.com
8d8081ff3d Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-12 13:11:37 +02:00
tomas@poseidon.ndb.mysql.com
ccd0b3e3ca Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-06-12 13:08:04 +02:00
tomas@poseidon.ndb.mysql.com
697db8f043 Bug #20336 CLUSTERLOG commands have no effect 
- always calculate max log level on node start
- send event subscribe uncond
 2006-06-12 13:06:56 +02:00
mskold@mysql.com
d17c3d3c7c Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans 2006-06-12 10:40:56 +02:00
mskold@mysql.com
58f686f985 Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Added missing parameter for readTuples in index scan 2006-06-12 10:22:32 +02:00
mskold@mysql.com
b93ba41e68 Merge mysql.com:/home/marty/MySQL/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-12 09:42:20 +02:00
mskold@mysql.com
e7c1a57f3d Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes 2006-06-12 09:37:19 +02:00
mskold@mysql.com
b89f17912c Added lock test on index scan 2006-06-12 09:28:27 +02:00
mskold@mysql.com
030f63fdab Moved back comment to correct method 2006-06-12 09:27:04 +02:00
ingo@mysql.com
76f066aa32 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-amerge
 2006-06-10 12:24:44 +02:00
igor@rurik.mysql.com
60620b31fe Post-merge fixes 2006-06-09 19:29:39 -07:00
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
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
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
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
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
tomas@poseidon.ndb.mysql.com
50bb4b6cb0 Bug #20336 CLUSTERLOG commands have no effect 2006-06-08 17:26:56 +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
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
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
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
svoj@may.pils.ru
d14e190ce8 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 13:58:23 +05:00
kent@mysql.com
c73ca30d71 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/mysqldev/my/mysql-5.0
 2006-06-06 22:12:14 +02:00
igor@rurik.mysql.com
950a000503 Fixed some problems for Windows build 2006-06-06 09:59:45 -07:00
gluh@eagle.intranet.mysql.r18.ru
8acb6eeb80 Bug#18035 Information Schema: Output is not Sorted 
added 'order by' to avoid result order difference
 2006-06-06 12:57:50 +05:00
gluh@eagle.intranet.mysql.r18.ru
b1892278c7 Bug#19599 duplication of information_schema column value in a CONCAT expr with user var 
mark result string using String::mark_as_const()
which prevents CONCAT from reusing it as a buffer
for concatenation result.
 2006-06-06 12:51:04 +05:00
gluh@eagle.intranet.mysql.r18.ru
03d8717ac8 Bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1 
fix: return db name for I_S.TABLES(and others) in original letter case.
if mysql starts with lower_case_table_names=1 | 2 then original db name is converted
to lower case(for I_S tables). It happens when we perform add_table_to_list. 
to avoid this we make a copy of original db name and use the copy hereafter.
 2006-06-06 11:25:31 +05:00