heikki@hundin.mysql.fi
7ec0b37c3c
ha_innodb.cc:
...
Fix typo
2005-08-25 16:57:13 +03:00
sergefp@mysql.com
c78ce16681
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
2005-08-25 17:39:02 +04:00
sergefp@mysql.com
95c3afc5d9
Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.
...
"Interleaved SPs execution is now binlogged properly, "SELECT spfunc()" is binlogged too.
The known remaining issue is binlogging/replication of "a routine is deleted while it is executed" scenario.
2005-08-25 17:34:34 +04:00
petr@mysql.com
db5acc18ed
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
2005-08-25 16:06:49 +04:00
petr@mysql.com
8dfa469729
Fix Bug#11333 "Stored Procedure: Memory blow up on repeated SELECT ... INTO query"
2005-08-25 15:34:14 +04:00
osku@127.(none)
ce22788bdd
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql-5.0
2005-08-25 14:15:31 +03:00
joerg@mysql.com
fea0745ba8
Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/push-5.0
2005-08-25 11:46:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 12:08:26 +03:00
monty@mishka.mysql.com
848c936693
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.mysql.com:/home/my/mysql-5.0
2005-08-25 10:44:08 +03:00
andrey@lmy004.
d4a25c1b36
Merge lmy004.:/work/mysql-5.0-clean
...
into lmy004.:/work/mysql-5.0-bug12533-2
2005-08-25 09:38:59 +02:00
andrey@lmy004.
dde57f082b
fix for bug #12533 (crash on DESCRIBE <view> after renaming base table column)
2005-08-25 09:24:21 +02:00
monty@mishka.local
b90d7fe3b6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-25 09:40:40 +03:00
monty@mishka.local
f16c7b3c5c
After merge fixes
2005-08-25 09:38:06 +03:00
georg@lmy002.wdf.sap.corp
adc603a930
Merge lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0_5501
2005-08-25 07:02:37 +02:00
monty@mishka.local
f384e08277
Merge mishka.local:/home/my/mysql-4.1
...
into mishka.local:/home/my/mysql-5.0
2005-08-25 06:55:48 +03:00
jimw@mysql.com
27b6d59db2
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-24 17:09:44 -07:00
kent@mysql.com
96dc373650
ha_tina.cc:
...
Some lack madvice()
2005-08-25 01:02:40 +02:00
jimw@mysql.com
6964b7491e
Merge mysql.com:/home/jimw/my/mysql-5.0-11680
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-24 15:54:23 -07:00
jimw@mysql.com
56dfc1bf18
Merge mysql.com:/home/jimw/my/mysql-5.0-12562
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-24 15:52:58 -07:00
jimw@mysql.com
9e4a9e23c6
Make SYSDATE() behave as in Oracle: always the current datetime, not the
...
datetime of when the current statement began. This also makes SYSDATE()
not safe in replication. (Bug #12562 )
2005-08-24 15:50:58 -07:00
monty@mishka.local
05ee47a80d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-25 00:22:59 +03:00
monty@mishka.local
bb7289b7d2
Cleanups during review of new code
...
Removed ASSERT that can obviously never be wrong
2005-08-25 00:21:47 +03:00
serg@sergbook.mysql.com
714b27c71c
merged
2005-08-25 00:08:02 +04:00
dlenev@mysql.com
dc1df41b3f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0.12
2005-08-24 23:54:53 +04:00
dlenev@mysql.com
2a880905c4
Correction of fix for bug #12280 "Triggers: crash if flush tables".
...
We should not assume that "thd" argument of reload_acl_and_cache() is
non-zero. Failure to do so will cause server to crash when one sends
SIGHUP to it.
2005-08-24 23:44:42 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0
Several fixes for Netware.
2005-08-24 22:03:34 +03:00
monty@mishka.local
17654cd7af
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-24 20:55:54 +03:00
monty@mishka.local
842de6ea45
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-24 19:53:40 +03:00
monty@mishka.local
8e6aa0e7ea
Review fixes
2005-08-24 19:37:27 +03:00
jimw@mysql.com
006e5b770b
Merge mysql.com:/home/jimw/my/mysql-4.1-12302
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-24 08:50:12 -07:00
igor@rurik.mysql.com
b610c0972f
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-24 08:19:02 -07:00
heikki@hundin.mysql.fi
2310ef6938
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-08-24 17:30:25 +03:00
heikki@hundin.mysql.fi
9f72d504b4
ha_innodb.cc:
...
Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain
2005-08-24 17:27:46 +03:00
georg@lmy002.wdf.sap.corp
254db48603
Fix for bug#5501 (SHOW TABLE STATUS should show "view" in upper case)
2005-08-24 12:51:00 +02:00
lars@mysql.com
f34398ba65
BUG#12532: Fix for the case when my_malloc is macro
2005-08-24 11:14:41 +02:00
msvensson@neptunus.(none)
9af0f156a5
Improve default error message for optimize/repair table
2005-08-24 10:41:44 +02:00
timour@mysql.com
5d736f1063
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-24 10:52:30 +03:00
timour@mysql.com
04a6a8e011
Post-fix for BUG#6276.
2005-08-24 10:51:28 +03:00
osku@127.(none)
55c752fb37
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql-5.0
2005-08-24 09:25:32 +03:00
igor@rurik.mysql.com
4adc90bdd6
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-23 23:22:52 -07:00
petr@mysql.com
adb8244163
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usersnfs/pchardin/mysql-5.0-virgin
2005-08-24 02:50:23 +02:00
petr@mysql.com
659809d30f
fix compilation failure appeared after monty's cleanup
2005-08-24 02:46:13 +02:00
lars@mysql.com
f98f46c471
BUG#12532: Fixes after review
2005-08-24 01:45:15 +02:00
lars@mysql.com
d8df765913
Merge mysql.com:/users/lthalmann/ltx/root/mysql-5.0
...
into mysql.com:/users/lthalmann/ltx/dev/mysql-5.0-bug12532
2005-08-24 00:16:58 +02:00
bell@sanja.is.com.ua
144c847da6
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
2005-08-23 23:17:36 +03:00
jimw@mysql.com
cf5dd176c0
Fix build using --without-server. (Bug #11680 )
2005-08-23 11:25:24 -07:00
timour@mysql.com
9a6aefab3a
Fix for BUG#6276.
2005-08-23 20:03:32 +03:00
kent@mysql.com
4d2cc6e503
Merge
2005-08-23 18:06:24 +02:00
timour@mysql.com
bf8563ae1d
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-23 18:15:51 +03:00
timour@mysql.com
e040300393
WL#2486 - natural and using join according to SQL:2003
...
* Provide backwards compatibility extension to name resolution of
coalesced columns. The patch allows such columns to be qualified
with a table (and db) name, as it is in 4.1.
Based on a patch from Monty.
* Adjusted tests accordingly to test both backwards compatible name
resolution of qualified columns, and ANSI-style resolution of
non-qualified columns.
For this, each affected test has two versions - one with qualified
columns, and one without.
2005-08-23 18:08:04 +03:00