monty@mysql.com
7538ce70d5
Fixed bug in multiple-table-delete where some rows was not deleted
2005-05-30 20:48:40 +03:00
konstantin@mysql.com
ca6645d852
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-7306-new
2005-05-30 21:47:20 +04:00
lenz@mysql.com
791c936bbd
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-05-30 19:17:42 +02:00
konstantin@mysql.com
e315f903d0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-7306-new
2005-05-30 20:56:11 +04:00
konstantin@mysql.com
2d6a70c42a
Preparatory (and the most problematic) patch for Bug#7306
...
"the server side preparedStatement error for LIMIT placeholder",
which moves all uses of LIMIT clause from PREPARE to OPTIMIZE
and later steps.
After-review fixes.
2005-05-30 20:54:37 +04:00
dlenev@mysql.com
90d97c1d0b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-ttdf
2005-05-30 18:59:24 +04:00
dlenev@brandersnatch.localdomain
abfc5b3903
Added test for bug #5894 "Triggers with altered tables cause corrupt
...
databases" and basic handling of errors which happen in triggers.
(The bug itself was fixed by several previous patches).
Fixed bug in multi-delete which were exposed by these tests.
2005-05-30 18:55:56 +04:00
igor@rurik.mysql.com
f987085aa4
Manual post merge
2005-05-30 05:47:50 -07:00
igor@rurik.mysql.com
e8a6fa4278
sql_select.cc:
...
Post-review modifications for the fix of bug #7894 .
2005-05-30 05:25:12 -07:00
igor@rurik.mysql.com
10cc5a46df
olap.result, olap.test:
...
Added test cases for bug #7894 .
sql_select.cc:
Fixed bug #7894 : GROUP BY queries with ROLLUP returned
wrong results for expressions containing group by columns.
The fix ensured correct results by replacement of all
occurrences of group by fields in non-aggregate expressions
for corresponding ref objects and preventing creation of
fields in temporary tables for expression containing group
by fields.
2005-05-30 03:01:51 -07:00
pem@mysql.com
e496b24304
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-05-30 11:06:31 +02:00
evgen@moonbone.local
329d974df7
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/mysql-5.0-bug-9593
2005-05-30 03:34:20 +04:00
evgen@moonbone.local
077086cd96
Fix bug #9593 "The combination of COUNT, DISTINCT and CONCAT seems to lock the
...
server"
Bug appears only on Windows platform. Freeing memory in
TMP_TABLE_PARAM::cleanup() allocated by new Copy_fields[0] in
setup_copy_fields() results in memory destruction. In test IF used instead
of CONCAT because IF have more stable crash.
2005-05-30 03:32:50 +04:00
serg@serg.mylan
6ef172efb8
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-28 10:44:49 +02:00
patg@radha.local
019288c623
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-5.0
2005-05-28 09:00:29 +02:00
jimw@mysql.com
2f0c098ef5
Fix '%h', '%I', and '%l' format specifiers in TIME_FORMAT()
...
to handle large time values as documented. (Bug #10590 )
2005-05-27 16:41:53 -07:00
serg@serg.mylan
29d6af8d9a
merged
2005-05-28 01:28:18 +02:00
patg@radha.local
d3d727e328
Comment and test changes per review request by Timour. All tests pass on production with this code.
2005-05-27 22:07:46 +02:00
lenz@mysql.com
8e09a3b8d1
- fixed the "test-force" target in the toplevel Makefile.am for systems on which
...
"." is not in the PATH...
2005-05-27 19:20:29 +02:00
msvensson@neptunus.(none)
cf3e568495
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-27 18:30:35 +02:00
lenz@mysql.com
25273706b8
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-05-27 18:18:07 +02:00
msvensson@neptunus.(none)
a07d8b1951
Merge neptunus.(none):/home/msvensson/mysql/bug9993
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-27 17:22:19 +02:00
pem@mysql.comhem.se
4c49970e0f
Fixed BUG#8409: Stored procedure crash if function contains FLUSH
...
by simply disabling FLUSH for stored functions. (I can't really work.)
2005-05-27 16:19:25 +02:00
heikki@hundin.mysql.fi
4ea3ec87f3
ha_innodb.cc:
...
Check in Jan's fix to bug #10746 and also add a note to ::start_stmt() that stored procs in 5.0 call it
2005-05-27 17:04:50 +03:00
gluh@eagle.intranet.mysql.r18.ru
26e9e13c26
Fix for bug #9992 : mysql_next_result hangs on error
...
set net->no_send_error to 0 before execution of each element of
multiquery statement to provide the sending of error to client
2005-05-27 18:01:09 +05:00
pem@mysql.comhem.se
fcb3b0326e
Fixed BUG#9559: Functions: Numeric Operations using -ve value gives incorrect
...
results.
Actually a problem when converting decimal to int for user variables.
2005-05-27 14:48:33 +02:00
serg@serg.mylan
f9e9406b40
forgotten s/__GNUC__/USE_PRAGMA_INTERFACE/ causes compilation faliures
2005-05-27 14:15:08 +02:00
serg@serg.mylan
324c20d41c
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-27 12:48:36 +02:00
dlenev@mysql.com
eaa7f6ab88
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-ttdf
2005-05-27 14:38:34 +04:00
serg@serg.mylan
d21b8d1077
don't downgrade the lock for CREATE ... SELECT (bug#6678)
2005-05-27 12:38:29 +02:00
dlenev@brandersnatch.localdomain
0ef3267251
Fix for trigger.test failure in --debug mode.
...
We can't have Item_trigger_field as aggregated object inside of
sp_instr_set_trigger_field class since in this case its destructor
will be called twice. So instead let us create this Item separately
and store pointer to it in instruction object.
2005-05-27 14:15:17 +04:00
msvensson@neptunus.(none)
3490108235
Add USE_PRAGMA_INTERFACE and USE_PRAGMA_IMPLEMENTATION to files not existsing in 4.1
2005-05-27 12:03:37 +02:00
msvensson@neptunus.(none)
aa99b05be7
Fix rpl_log and rpl_rotate_logs test result
...
- Remove the expected warrnings when "show binary logs" are called on zero size binary log files.
2005-05-27 12:01:41 +02:00
pem@mysql.com
605af1e7dc
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-05-27 11:28:03 +02:00
msvensson@neptunus.(none)
ed6b9812f2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-27 10:10:16 +02:00
lenz@mysql.com
53e49d0521
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-05-27 09:52:03 +02:00
tim@siva.hindu.god
8a77c6f741
scripts/mysqld_safe.sh
...
Only add --defaults-extra-file=$DATADIR/my.cnf if $DATADIR/my.cnf is readable.
2005-05-27 12:44:06 +12:00
monty@mysql.com
f8cb00640f
Fix broken test case (after merge)
2005-05-26 23:33:20 +03:00
msvensson@neptunus.(none)
697cfe7f07
Merge from 4.1
2005-05-26 21:01:55 +02:00
msvensson@neptunus.(none)
90f971ae2c
Include fix to function open_binlog from 4.1
...
- Add O_SHARE when opening file.
2005-05-26 21:01:54 +02:00
sergefp@mysql.com
59db44382b
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2
2005-05-26 21:01:53 +02:00
sergefp@mysql.com
41c8f46160
Post-review fixes: rename SHOW_DOUBLE to SHOW_DOUBLE_STATUS
2005-05-26 20:54:02 +02:00
pem@mysql.comhem.se
3eca4bf22e
Fixed BUG#9937: Crash on call to stored procedure.
...
This only showed up on two known platforms, both ia64 (one HP-UX and one Linux wich icc).
For some reason, they only get half the stack size they are supposed to have, which
makes deep SP recursion overrun the stack before check_stack_overrun() is triggered.
Also made som minor fixes in the check_stack_overrun() definition, supporting variable
margins.
No test case added, but the reason for the bug report was a failed existing test case
on these machines, which now works.
2005-05-26 20:36:14 +02:00
msvensson@neptunus.(none)
dbcf3b3a2e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-26 20:02:21 +02:00
jimw@mysql.com
1cc23599c2
Cleanups to patch for bug #9660 after review by Monty.
2005-05-26 10:01:26 -07:00
bell@sanja.is.com.ua
68899decc2
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-05-26 19:32:58 +03:00
joerg@mysql.com
db8368fdd5
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/M40/mysql-4.0
2005-05-26 18:24:17 +02:00
joerg@mysql.com
55fe5aaa47
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-05-26 18:20:17 +02:00
joerg@mysql.com
5178c84bef
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-05-26 18:12:56 +02:00
bell@sanja.is.com.ua
b186d8b4f9
merge
2005-05-26 18:33:57 +03:00