gluh@eagle.intranet.mysql.r18.ru
8574ed6fc6
Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message
...
generate proper error message if we use SET ... = NULL for 'set'
variables
2005-06-09 14:39:29 +05:00
hf@deer.(none)
1fdc59ac33
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.8482
2005-06-09 13:31:29 +05:00
hf@deer.(none)
cc007a5c09
Fix for bug #8482 (Incorrect rounding)
2005-06-09 12:44:44 +05:00
joreland@mysql.com
5c9dee551a
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-06-09 08:12:14 +02:00
dlenev@mysql.com
207ac74905
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bgmd
2005-06-09 01:54:18 +04:00
konstantin@mysql.com
9b2e653af0
Disable dynamic SQL in stored routines.
...
This is to close Bug#10975, Bug#7115, Bug#10605
This feature will be implemented in a future release.
2005-06-09 01:46:30 +04:00
jimw@mysql.com
495ee34be0
Fix problem with handling of lower_case_table_name == 2 when
...
the case in the FROM and WHERE clauses didn't agree. (Bug #9500 )
2005-06-08 14:35:16 -07:00
dlenev@mysql.com
fae0b7f7af
Manual merge
2005-06-09 01:13:20 +04:00
dlenev@brandersnatch.localdomain
5394a1a4bd
Fix for bug #11158 "Can't perform multi-delete in stored procedure".
...
In order to make multi-delete SP friendly we need to have all table
locks for the elements of main statement table list properly set
at the end of parsing.
Also performed small cleanup: We don't need relink_tables_for_multidelete()
any longer since the only case now when TABLE_LIST::correspondent_table
is non-zero are tables in auxilary table list of multi-delete and these
tables are handled specially in mysql_multi_delete_prepare().
2005-06-09 01:07:52 +04:00
hf@deer.(none)
a881e00aaf
Fix for bug #10896 (0.00 > -0.00)
2005-06-08 21:56:22 +05:00
kent@mysql.com
27591e68ce
ps_7ndb.result, ps_6bdb.result:
...
Updated result files
2005-06-08 17:45:18 +02:00
hf@deer.(none)
6c148a7969
Fix for bug #9764 (DISTINCT IFNULL truncates data)
2005-06-08 20:35:37 +05:00
msvensson@neptunus.(none)
8771c73258
BUG#10365 Cluster handler uses non-standard error codes
...
- Added better error messages when trying to open a table that can't be discovered or unpacked. The most likely cause of this is that it does not have any frm data, probably since it has been created from NdbApi or is a NDB system table.
- Separated functionality that was in ha_create_table_from_engine into two functions. One that checks if the table exists and another one that tries to create the table from the engine.
2005-06-08 13:31:59 +02:00
holyfoot@mysql.com
730c3a260f
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.8459
2005-06-08 15:53:07 +05:00
holyfoot@hf-ibm.(none)
ff9951f221
Fix for bug #8429 (FORMAT returns incorrect result)
2005-06-08 15:49:36 +05:00
lenz@mysql.com
0c4a1a6af4
Merge mysql.com:/space/my/mysql-5.0.7-clone
...
into mysql.com:/space/my/mysql-5.0
2005-06-08 12:27:52 +02:00
lars@mysql.com
d33ba0193e
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/home/bk/mysql-5.0
2005-06-08 12:17:42 +02:00
lenz@mysql.com
024010e562
- make sure to include mysql-test/t/*.sql files in the binary distributions and when
...
"make install" is called (mysql_delimiter.sql was missing)
2005-06-08 11:49:24 +02:00
hf@deer.(none)
71f06aa778
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.9894
2005-06-08 14:17:42 +05:00
hf@deer.(none)
732fb06e13
Fix for bug #8425 (Insufficient precision in the '/' operation)
...
As the bug was already fixed, just testcase added here
2005-06-08 13:11:04 +05:00
hf@deer.(none)
935b5ec4b4
Fix for bug #9894 (Negative numbers are allowed to 'unsigned' column)
2005-06-08 12:25:57 +05:00
konstantin@mysql.com
51400b9a79
Fix failing ps_6bdb and ps_7ndb tests.
...
The changes are similar to those pushed with a fix for Bug#9899,
so my guess is that ps_6dbd and ps_7ndb tests were simply not run then.
2005-06-08 10:59:40 +04:00
konstantin@mysql.com
99c637477f
Fix ps_7ndb.result wrt working LIMIT clause (due to porting
...
missed ityesterday :()
2005-06-08 10:44:58 +04:00
serg@serg.mylan
b95c7afcda
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-06-07 22:45:01 +02:00
serg@serg.mylan
30d81b75ff
bug#5373: handler READ NEXT w/o HANDLER READ [FIRST]
...
check table->file->inited to catch incorrect calling sequence.
2005-06-07 22:43:25 +02:00
dlenev@brandersnatch.localdomain
620d42318b
Enabling back part of sp.test which no longer fails in --ps-protocol mode
...
(Bug which caused its failure before was fixed in the beginning of March
by the ChangeSet that introduced improved SP-locking).
2005-06-07 22:22:27 +04:00
igor@rurik.mysql.com
c9c52df80b
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 08:23:46 -07:00
monty@mysql.com
eb9e5777ee
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-06-07 18:23:04 +03:00
lars@mysql.com
71c9b0ac34
Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0
2005-06-07 17:20:08 +02:00
lars@mysql.com
53085bb443
Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0
2005-06-07 16:48:38 +02:00
lars@mysql.com
b6402bd4e4
BUG#6883: Merge fixes
2005-06-07 16:43:43 +02:00
lars@mysql.com
f952a0d6f1
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b6883-mysql-4.1
2005-06-07 16:31:10 +02:00
igor@rurik.mysql.com
5514c94865
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-07 06:48:21 -07:00
igor@rurik.mysql.com
c963b12fd3
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 06:38:05 -07:00
igor@rurik.mysql.com
d3f3cc617d
Many files:
...
Fixed bug #9899 : erronious NOT_NULL flag for some attributes
in the EXPLAIN table.
2005-06-07 06:34:13 -07:00
monty@mysql.com
543691ab15
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
2005-06-07 16:34:10 +03:00
joreland@mysql.com
e6dfe6aa36
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-06-07 15:25:21 +02:00
igor@rurik.mysql.com
a2f7b552b0
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-06-07 06:00:37 -07:00
monty@mysql.com
47c3261375
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-06-07 15:42:35 +03:00
konstantin@mysql.com
8c0767cef5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-7306-final
2005-06-07 16:28:08 +04:00
monty@mysql.com
1c725ff797
Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites
...
Fix instead wrong call to ha_key_cmp
This is related to bug #10741 Inserting double value into utf8 column crashes server
2005-06-07 15:09:49 +03:00
igor@rurik.mysql.com
5833a5e54a
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 04:31:42 -07:00
lars@mysql.com
0610e204f4
Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0
2005-06-07 13:28:34 +02:00
konstantin@mysql.com
72b4b0b92c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-7306-final
2005-06-07 14:56:06 +04:00
dlenev@mysql.com
054139fc64
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg10015
2005-06-07 14:54:48 +04:00
dlenev@brandersnatch.localdomain
270b695f59
Fix for bug #10015 "Crash in InnoDB if stored routines are used".
...
We should not allow explicit or implicit transaction commits inside
of stored functions or triggers (so in autocommit mode we should not
do commits after execution of sub-statement).
Also since we don't support nested statement transactions in 5.0,
we shouldn't commit or rollback stmt transactions while we are inside
stored functions or triggers. This should be fixed in later (>=5.1)
releases.
2005-06-07 14:53:08 +04:00
heikki@hundin.mysql.fi
96ee8cc0d5
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-06-07 13:50:45 +03:00
konstantin@mysql.com
ac2a9eb699
Manual merge.
2005-06-07 14:50:45 +04:00
lars@mysql.com
96b0f03f78
Merge b6883-mysql-4.1 -> 5.0
2005-06-07 12:30:32 +02:00
igor@rurik.mysql.com
6244353c2a
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-06-07 03:12:12 -07:00