mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30653 commits 2784 branches 343 tags 1.6 GiB
Commit graph

30653 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
evgen@moonbone.local
147961bc59 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt
 2006-06-12 15:56:21 +04:00
evgen@moonbone.local
e831704a33 Merge moonbone.local:/work/16716-bug-4.1-mysql 
into moonbone.local:/work/16716-bug-4.1-opt-mysql
 2006-06-12 15:50:59 +04: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
igor@rurik.mysql.com
bb94b35f2f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-06-11 13:45:18 -07: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
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
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
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
evgen@moonbone.local
9743628758 Fixed bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled. 
The st_lex::which_check_option_applicable() function controls for which 
statements WITH CHECK OPTION clause should be taken into account. REPLACE and
REPLACE_SELECT wasn't in the list which results in allowing REPLACE to insert
wrong rows in a such view.

The st_lex::which_check_option_applicable() now includes REPLACE and 
REPLACE_SELECT in the list of statements for which WITH CHECK OPTION clause is
applicable.
 2006-06-07 16:17:56 +04: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
evgen@moonbone.local
d027dd7c0d Fixed bug#15962: CONCAT() in UNION may lead to a data trucation. 
To calculate its max_length the CONCAT() function is simply sums max_lengths
of its arguments but when the collation of an argument differs from the 
collation of the CONCAT() max_length will be wrong. This may lead to a data
truncation when a tmp table is used, in UNIONS for example.

The Item_func_concat::fix_length_and_dec() function now recalculates the 
max_length of an argument when the mbmaxlen of the argument differs from the
mbmaxlen of the CONCAT().
 2006-06-07 01:10:23 +04: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
ramil@mysql.com
19e312af08 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b16546
 2006-06-06 09:10:28 +05:00
anna@hasky.mysql.fi
194c447b1b Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hasky.mysql.fi:/home/anjuta/my/mysql-5.0
 2006-06-05 21:53:06 +03:00
msvensson@devsrv-b.mysql.com
560ec64f1d Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/users/msvensson/my50-yassl
 2006-06-05 17:45:20 +02:00
msvensson@shellback.(none)
5ae586d946 Import patch for yassl 1.35 
- Better check of required buffer size when processing incoming record headers
 2006-06-05 15:41:29 +02:00
anjuta@arthur.local
a885c2e6f2 Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  arthur.local:/home/my/mysql-5.0
 2006-06-05 12:19:53 +03:00
anjuta@arthur.local
a83580b33a Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  arthur.local:/home/my/mysql-5.0-clean
 2006-06-05 11:59:44 +03:00
anjuta@arthur.local
29615ac8fd BUG#19479: mysqldump creates invalid dump 
Moved the test case to separate non-windows specific file.
 2006-06-04 21:27:41 +03:00
igor@rurik.mysql.com
f1afd17821 Cleanup for the fix of bug 18206. 2006-06-02 19:15:32 -07:00
igor@rurik.mysql.com
5ade9e75dc Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-06-02 17:06:10 -07:00
igor@rurik.mysql.com
d02f254eaa Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-4.1-opt
 2006-06-02 14:16:22 -07:00
igor@rurik.mysql.com
37e049db01 Fixed bug #18206. 
The bug report revealed two problems related to min/max optimization:
1. If the length of a constant key used in a SARGable condition for
for the MIN/MAX fields is greater than the length of the field an 
unwanted warning on key truncation is issued;
2. If MIN/MAX optimization is applied to a partial index, like INDEX(b(4))
than can lead to returning a wrong result set.
 2006-06-02 14:14:57 -07:00