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

29663 commits

This branch
This branch
All branches
Author SHA1 Message Date
gluh@mysql.com
a87c80080a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Merge/4.1
 2006-03-29 19:53:40 +05:00
gluh@eagle.intranet.mysql.r18.ru
2545c7d414 Fix for bug#15316 SET value having comma not correctly handled 
disallow the use of comma in SET members
 2006-03-29 19:52:26 +05:00
bar@mysql.com
07e21be0fe Additional 5.0 fix for 
Bug#15098: CAST(column double TO signed int), wrong result
which was fixed originally in 4.1.
 2006-03-29 19:31:16 +05:00
kent@mysql.com
0d332aef39 Merge 2006-03-29 15:05:06 +02:00
kent@mysql.com
67f2b0f3bc mysql_config.sh: 
If installed, search built in lib path first, bug#13158
 2006-03-29 14:59:53 +02:00
kent@mysql.com
37b916a728 Makefile.am: 
Added "ndb_error_reporter" script, bug#18421
 2006-03-29 14:18:29 +02:00
kent@mysql.com
ca29e362b5 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
 2006-03-29 14:08:13 +02:00
kent@mysql.com
e5ec09e888 Makefile.am: 
Install "ndb_size.pl" script and template, bug#18421
 2006-03-29 14:07:13 +02:00
dlenev@mysql.com
41a895a1ce Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/mysql-5.0-bg17764
 2006-03-29 14:55:04 +04:00
dlenev@mysql.com
17785d169b Proposed fix for bug #17764 "Trigger crashes MyISAM table" 
A table with an on insert trigger was reported as crashed when the insert
was processed with bulk insert mode on (handler::start_bulk_insert).
The trigger was also selecting from the same table, and that caused
the "crash".
The same problem was present when an insert statement, which was processed
in bulk mode, also used a stored function that was reading the same table.

This fix disables bulk inserts if a statement uses functions or invokes
triggers. Implementing more granular checks will require much more code and
therefore can hardly be done in 5.0
 2006-03-29 14:53:00 +04:00
cmiller@zippy.(none)
de5eea6d2e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug11151
 2006-03-28 17:38:28 -05:00
cmiller@zippy.(none)
d51158fd1d Bug#11151: LOAD DATA INFILE commits transaction in 5.0 
No longer create or commit transactions within the loading of files.
 2006-03-28 17:15:45 -05:00
bar@mysql.com
a586f5a18b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-28 20:04:50 +05:00
pem@mysql.com
6be4db9a6d Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug17015/mysql-5.0-runtime
 2006-03-28 17:03:14 +02:00
pem@mysql.com
cc17bb3404 Removed forgotten comment line in sql_select.cc. 2006-03-28 16:05:06 +02:00
jonas@perch.ndb.mysql.com
48fa5cb63c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-03-28 15:40:08 +02:00
bar@mysql.com
4886c53fbb Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15098
 2006-03-28 18:32:58 +05:00
jonas@perch.ndb.mysql.com
0a9db2a056 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-03-28 15:31:26 +02:00
bar@mysql.com
fc86e304cc cast.result: 
After merge fix.
 2006-03-28 18:21:19 +05:00
pem@mysql.com
e0a2455f19 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug17015/mysql-5.0-runtime
 2006-03-28 15:08:17 +02:00
pem@mysql.com
e51adff01c Review fix for BUG#17015: Routine name truncation not an error 2006-03-28 15:06:06 +02:00
jonas@perch.ndb.mysql.com
4e819b7377 ndb - bug#17729 bug#18406 
Ndbapi can reorder recattr when doing sorted scan (for faster comparision)
    make sure handler maps correct recattr to correct mysql column
 2006-03-28 14:38:16 +02:00
pem@mysql.com
1a1da0e3ef Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug16474/mysql-5.0-runtime
 2006-03-28 14:18:47 +02:00
pem@mysql.com
b310d4fb4d Post review fixes for BUG#16474: SP crashed MySQL. 2006-03-28 14:16:21 +02:00
bar@mysql.com
29b8e09732 Merge mysql.com:/usr/home/bar/mysql-4.1.b15098 
into  mysql.com:/usr/home/bar/mysql-5.0
Bug#15098
 2006-03-28 17:07:26 +05:00
konstantin@mysql.com
71defb7a80 A fix and a test case for Bug#15683 "crash, Function on nested 
VIEWs, Prepared statement": we didn't mark the nested views
as 'prelockng placeholders' when building the prelocking list. 
This resulted in these views being processed (merged, materialized)
before they are actually used.
 2006-03-28 15:06:29 +04:00
mskold@mysql.com
37a6167d6d Post review fix for Bug #15722 Engine_condition_pushdown fails when using blobs(text) 2006-03-28 11:46:35 +02:00
mskold@mysql.com
6e0d4d2d45 Added tests with IGNORE and NULL values 2006-03-28 10:01:23 +02:00
mskold@mysql.com
c76ab0a4f6 Fix for Bug #15722 Engine_condition_pushdown fails when using blobs(text) 2006-03-28 09:59:20 +02:00
igor@rurik.mysql.com
df80048d5f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-03-27 20:16:52 -08:00
igor@rurik.mysql.com
f57e0b3db7 Fixed bug #18386. 
An invalid assertion in Item_direct_view_ref::eq caused 
an assertion abort in the debug version.
 2006-03-27 18:28:55 -08:00
ian@zim.(none)
34b54fa83c Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/ian/workspace/mysql-5.0
 2006-03-27 18:27:57 -08:00
ian@zim.(none)
8607f1df65 Disable udf test 2006-03-27 18:25:35 -08:00
ian@zim.(none)
a66aace3e9 Fix for bug #16855 2006-03-27 17:45:06 -08:00
kent@mysql.com
1da875b233 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-03-28 01:56:24 +02:00
kent@mysql.com
6b51a2c69f Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-03-27 23:08:25 +02:00
kent@mysql.com
04f059c5bf mysql_config.sh: 
Remove Solaris -xc99=none C option as C++ compiler can't handle it
 2006-03-27 23:04:44 +02:00
anozdrin@mysql.com
cc1ee7e48b Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created 
in older version.

The problem is that TRN-files created in "old" versions contain
junk in trigger_table field, which is not acceptable in "new" versions.
 2006-03-28 01:01:51 +04:00
kent@mysql.com
898db8b053 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-03-27 19:37:29 +02:00
kent@mysql.com
35ae639477 mysql_config.sh: 
We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
 2006-03-27 19:25:25 +02:00
monty@mysql.com
25adcb6500 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-03-27 15:23:16 +03:00
pekka@mysql.com
5903a839c9 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-03-27 13:31:33 +02:00
pekka@mysql.com
825f97c7b5 ndb - bug#17380: Missing charset causes NDB Client to crash 2006-03-27 13:16:53 +02:00
monty@mysql.com
aecd1502b1 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-03-27 13:47:13 +03:00
jonas@perch.ndb.mysql.com
72aaf98396 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-03-27 11:52:54 +02:00
gkodinov@mysql.com
b35d97d02a Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct) 
Reproduced in 5.0.16-nt. Tested to work in 5.0.20
 2006-03-27 12:20:25 +03:00
monty@mysql.com
4ab6bc4b43 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-03-27 12:07:59 +03:00
monty@mysql.com
3dcbbb7c4d Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18" 
This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared
library
 2006-03-27 12:02:23 +03:00
jonas@perch.ndb.mysql.com
db7a9b760f Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-03-27 10:43:37 +02:00
jonas@perch.ndb.mysql.com
1c019888c3 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
 2006-03-27 10:34:21 +02:00