tulin@mysql.com
264de67fc6
Bug #10838 CREATE TABLE produces strange DEFAULT value
2005-05-25 17:54:36 +02:00
msvensson@neptunus.(none)
0ed2e57731
Use one err file for each master
2005-05-25 11:10:10 +02:00
joreland@mysql.com
4bedcb7cab
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-25 09:27:46 +02:00
joreland@mysql.com
c448ab53d6
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-25 09:26:59 +02:00
patg@radha.local
a6af23a046
changes to fix joins not working (bug #10848 ). New tests, as well as table->status being set in index_read_idx
2005-05-25 02:15:09 +02:00
acurtis@xiphis.org
248a6934bb
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into xiphis.org:/usr/home/antony/work2/p3-bug7241.6
2005-05-24 22:51:02 +01:00
acurtis@xiphis.org
9c8b4c93bb
Fix after merge
2005-05-24 22:31:57 +01:00
Sinisa@sinisa.nasamreza.org
e94f4fa8e0
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-05-24 22:44:18 +03:00
jimw@mysql.com
bbdfea15da
Increase limit of partial key length in MEMORY storage engine
...
to the same as a full key. (Bug #10566 )
2005-05-24 12:21:15 -07:00
mskold@mysql.com
bf7f0508e2
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-24 21:18:07 +02:00
dlenev@mysql.com
1449d44e1c
Manual merge of patch fixing several trigger related bugs with main tree.
2005-05-24 22:35:41 +04:00
dlenev@brandersnatch.localdomain
007a205918
Fix for bugs:
...
#5860 "Multi-table UPDATE does not activate update triggers"
#6812 "Triggers are not activated for INSERT ... SELECT"
#8755 "Trigger is not activated by LOAD DATA".
This patch also implements proper handling of triggers for special forms
of insert like REPLACE or INSERT ... ON DUPLICATE KEY UPDATE.
Also now we don't call after trigger in case when we have failed to
inserted/update or delete row. Trigger failure should stop statement
execution.
I have not properly tested handling of errors which happen inside of
triggers in this patch, since it is simplier to do this once we will be
able to access tables from triggers.
2005-05-24 22:19:33 +04:00
brian@zim.(none)
46a3eef67d
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-05-24 10:48:03 -07:00
Sinisa@sinisa.nasamreza.org
df53be3dfe
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-05-24 19:47:18 +03:00
jani@ua141d10.elisa.omakaista.fi
ed2e508bdd
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-05-24 18:23:31 +03:00
joreland@mysql.com
6132b0a528
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-24 17:05:20 +02:00
joreland@mysql.com
4d06497f50
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-24 17:03:43 +02:00
acurtis@xiphis.org
4a77febaab
Merge
2005-05-24 15:52:48 +01:00
jani@ua141d10.elisa.omakaista.fi
5254d52cb6
Added a test case for Bug#8009.
2005-05-24 17:50:17 +03:00
joreland@mysql.com
3979bd6da7
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-24 16:50:01 +02:00
joreland@mysql.com
66407729fb
ndb - mysqltestrun
...
run ndb_select_all --no-defaults
2005-05-24 16:48:56 +02:00
reggie@mdk10.(none)
0f43a4719e
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/41test2
2005-05-24 09:02:56 -05:00
reggie@mdk10.(none)
6726b9fd09
removed unneeded reserved_win_names testcase
2005-05-24 09:01:06 -05:00
acurtis@xiphis.org
565c20ecbf
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into xiphis.org:/usr/home/antony/work2/p3-bug7241.5
2005-05-24 13:40:25 +01:00
acurtis@xiphis.org
a6a589ef76
Bug#7241 - Invalid response when DELETE .. USING and LOCK TABLES used.
...
Only acquire necessary write lock for multi-delete
2005-05-24 11:44:34 +01:00
gluh@mysql.com
ce5d59d380
Merge gluh@gluh:/home/gluh/release/mysql-5.0-build
...
into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0
2005-05-24 15:35:24 +05:00
gluh@gluh.mysql.r18.ru
077346c746
Fix for bug #10659 : information_schema_db fail on Mac OS
2005-05-24 14:35:23 +04:00
lars@mysql.com
93565c8e7d
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1
2005-05-24 01:09:23 +02:00
gbichot@bk-internal.mysql.com
a49ccfe6f0
Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0
2005-05-24 00:31:28 +02:00
reggie@mdk10.(none)
3384ecc988
BUG# 9148 Denial of service
...
fixups of test case and comment formatting
2005-05-23 14:48:25 -05:00
lars@mysql.com
4e2766ffc7
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1
2005-05-23 16:23:05 +02:00
mskold@mysql.com
82490f1492
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-23 07:26:55 +02:00
igor@rurik.mysql.com
2433210829
join_outer.test, join_outer.result:
...
Added test cases for bug #9938 .
item.h:
Fixed bug #9938 : missing method not_null_tables for Item_ref.
2005-05-21 08:44:50 -07:00
igor@rurik.mysql.com
fdb6c661a3
range.result, range.test:
...
Added test cases for optimization request #10561 .
opt_range.cc, sql_select.cc:
Fixed bug #10561 : an optimization request to allow
range analysis for NOT IN and NOT BETWEEN.
2005-05-21 06:11:44 -07:00
reggie@mdk10.(none)
21133df02a
fixed conflicts
2005-05-20 16:34:59 -05:00
reggie@mdk10.(none)
48c584537d
BUG# 9148: Denial of service
...
The problem was that on Windows the access method indicates that access to file
such as "com1" and "lpt1" is allowed (since they are device names) and
this causes mysql to attempt to open them as databases or tables.
The fix was to write our own my_access method that uses other Win32 functions
to determine if the given argument is indeed a file and has to requested
mode.
2005-05-20 16:04:10 -05:00
pem@mysql.comhem.se
4c69f7fb4e
Fixed BUG#10537: Server crashes while loading data file into table through
...
procedure.
by simply disabling 'load' in stored procedures, like it's already disabled
for prepared statements. (They must be made "re-execution" safe before
working with either PS or SP.)
2005-05-20 17:47:08 +02:00
monty@mysql.com
f5f92ce146
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-05-20 17:32:35 +03:00
gluh@gluh.mysql.r18.ru
d3833fa4ff
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0
2005-05-20 18:32:34 +04:00
brian@zim.(none)
6182241268
Additions for --add-drop-database
2005-05-20 06:56:02 -07:00
monty@mysql.com
2229d9a964
Add missing test result
2005-05-20 16:31:46 +03:00
bell@sanja.is.com.ua
77735f2f35
do not try to use equal field from outer query as field of local join (BUG#6384)
2005-05-20 16:01:41 +03:00
gluh@gluh.mysql.r18.ru
075a730328
Merge gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0-build
...
into gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0
2005-05-20 16:55:00 +04:00
gluh@gluh.mysql.r18.ru
68317fcb0c
addition of "REFERENCED_TABLE_SCHEMA",
...
"REFERENCED_TABLE_NAME", "REFERENCED_COLUMN_NAME" fields into
KEY_COLUMN_USAGE table
2005-05-20 16:39:28 +04:00
msvensson@neptunus.(none)
720b8f4242
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-20 00:05:24 +02:00
msvensson@neptunus.(none)
2849769fbe
Merge mysqldev@production.mysql.com:my/mysql-5.0-build
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build
2005-05-19 22:23:59 +02:00
ramil@mysql.com
b06181bccd
hf's fix for bug #9060 (FORMAT returns incorrect result)
...
we need proper rounding there
2005-05-20 01:04:08 +05:00
serg@serg.mylan
ade7854b4a
after merge
2005-05-19 20:54:37 +02:00
msvensson@neptunus.(none)
920c16c055
BUG#9626 valgrind warnings
...
- after review fixes
2005-05-19 20:38:48 +02:00
serg@serg.mylan
23a59c9857
merged
2005-05-19 15:20:10 +02:00