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
serg@sergbook.mysql.com
909247a95f
memroot: trash the memory in free_root()
2005-08-24 23:07:06 +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
igor@rurik.mysql.com
17d6c734f4
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-24 08:15:46 -07:00
heikki@hundin.mysql.fi
10adc6b562
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-08-24 18:07:52 +03:00
heikki@hundin.mysql.fi
4bedb3091c
subselect2.result:
...
Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different
2005-08-24 18:05:54 +03:00
joerg@mysql.com
8e756ecc4c
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-08-24 16:30:26 +02: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
joerg@mysql.com
bf000026b9
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-08-24 16:13:48 +02:00
joerg@mysql.com
d8078165b0
Merge
2005-08-24 16:11:38 +02:00
joerg@mysql.com
6fcc98ddb5
Increase version number (but leave status still at "beta").
2005-08-24 13:41:34 +02: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
petr@mysql.com
bc2453cf73
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-08-24 14:21:35 +04:00
lars@mysql.com
f34398ba65
BUG#12532: Fix for the case when my_malloc is macro
2005-08-24 11:14:41 +02:00
petr@mysql.com
2df4914e11
fix test for a bug to use correct tables
2005-08-24 12:25:57 +04: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
igor@rurik.mysql.com
5810291c2f
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-23 23:19:45 -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
jimw@mysql.com
c2cb759003
Fix typo in mysql_fix_privilege_tables.sql (Bug #12705 )
2005-08-23 16:37:21 -07: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
timour@mysql.com
f58315f80a
Test for BUG#6495.
...
The bug itself is fixed by WL#2486.
2005-08-23 22:29:05 +03:00
jimw@mysql.com
cf5dd176c0
Fix build using --without-server. (Bug #11680 )
2005-08-23 11:25:24 -07:00
timour@mysql.com
5f9d05d306
Test for BUG#4889 - inconsistent resilts of more than 2-way natural join
...
due to incorrect transformation to JOIN ... ON.
The bug itself is fixed by WL#2486.
2005-08-23 20:24:29 +03:00
joerg@mysql.com
c5e51b7c27
Add the "test-force" target to "Makefile.am".
2005-08-23 19:16:43 +02: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
2f2347e556
Test case for BUG#10972 - Natural join of view and underlying table gives wrong result.
...
The bug itself is fixed by WL#2486.
2005-08-23 19:00:28 +03:00
timour@mysql.com
f5655423aa
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-23 18:43:12 +03:00
timour@mysql.com
b87154fc02
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-08-23 18:40:57 +03: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
andrey@lmy004.
8f04f71d81
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-clean
2005-08-23 16:41:28 +02:00
andrey@lmy004.
398392cdcc
tests fixes
2005-08-23 13:57:12 +02:00
tomas@poseidon.ndb.mysql.com
83664a8365
configure.in:
...
fixed build bug with ndb grep block
2005-08-23 13:01:46 +02:00