holyfoot@mysql.com
bbc26a63b2
merging
2005-11-10 16:32:49 +04:00
pem@mysql.com
b01e7393bf
Fixed BUG#14719: Views DEFINER grammar is incorrect
...
Corrected the syntax for the current_user() case.
(It's "definer = current_user[()]", not just "current_user[()]".)
2005-11-09 16:51:00 +01:00
sergefp@mysql.com
c914a03066
BUG#14480 post-fix: merge to 5.0
2005-11-09 14:47:58 +03:00
sergefp@mysql.com
c6a902f20c
Merge mysql.com:/home/psergey/mysql-4.1-nov08-push
...
into mysql.com:/home/psergey/mysql-5.0-oct08-push
2005-11-09 10:12:58 +03:00
sergefp@mysql.com
f12212f74e
BUG#14480: post-fix: use the default field value from CREATE list too.
2005-11-09 09:34:46 +03:00
sergefp@mysql.com
c5276ebcb0
Merge, will need post-merge fixes.
2005-11-08 11:22:51 +03:00
sergefp@mysql.com
41bc233699
Merge mysql.com:/home/psergey/mysql-4.1-bug13814
...
into mysql.com:/home/psergey/mysql-4.1-nov08-push
2005-11-08 05:36:25 +03:00
sergefp@mysql.com
5656740542
Merge mysql.com:/home/psergey/mysql-4.1-bug14480
...
into mysql.com:/home/psergey/mysql-4.1-nov08-push
2005-11-08 05:34:56 +03:00
petr@mysql.com
63554e10d8
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-11-08 04:04:36 +03:00
petr@mysql.com
0f373f9501
Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-11-08 01:27:15 +03:00
joerg@mysql.com
1bf2462119
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-11-07 23:02:33 +01:00
joerg@mysql.com
024d2b3595
mysql-test/r/connect.result + mysql-test/t/connect.test
...
Replace the full socket path name, not just a directory component. bug#14720
2005-11-07 22:30:44 +01:00
guilhem@mysql.com
517e51f1ed
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0
2005-11-07 13:04:27 +01:00
ingo@mysql.com
1f3df2e669
Bug#14616 - Freshly imported table returns error 124 when using LIMIT
...
Initialized usable_keys from table->keys_in_use instead of ~0
in test_if_skip_sort_order(). It was possible that a disabled
index was used for sorting.
2005-11-07 12:16:49 +01:00
sergefp@mysql.com
edd094b194
BUG#14480, attempt2: In CREATE ... SELECT ..., don't count the same field twice
...
when calculating table->null_fields.
2005-11-07 09:23:43 +03:00
igor@rurik.mysql.com
60a4b4fb16
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-05 22:45:54 -08:00
petr@mysql.com
038b300753
Fix Bug#14672 Bug in deletion
2005-11-06 02:11:12 +03:00
petr@mysql.com
a1f56ea5a6
Fix Bug#13894 Server crashes on update of CSV table
2005-11-05 15:08:15 +03:00
sergefp@mysql.com
33026e5237
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-05 05:46:41 +03:00
igor@rurik.mysql.com
84ad20364d
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-04 15:03:29 -08:00
bell@sanja.is.com.ua
4f42b35bba
avoiding of calling Item::val_* methods family with opt_range mem_root, because its life time is too short. (BUG#14342)
2005-11-04 13:16:46 +02:00
guilhem@mysql.com
cb1d21eeba
sql_parse.cc:
...
SCCS merged
2005-11-04 10:54:51 +01:00
monty@mysql.com
2d39028ef2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-11-04 10:03:31 +02:00
monty@mysql.com
89fdc4f49e
DROP created procedures
...
(Caused sp-security to fail)
2005-11-04 10:02:43 +02:00
sergefp@mysql.com
7dfca7b9ff
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-03 22:35:18 +03:00
jani@ua141d10.elisa.omakaista.fi
fcea95c2e5
Disabled ps_protocol for two statements.
2005-11-03 20:29:21 +02:00
ingo@mysql.com
1b99d30c23
Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
...
Version for 4.0.
It fixes two problems:
1. The cause of the bug was that we did not check the table version for
the HANDLER ... READ commands. We did not notice when a table was
replaced by a new one. This can happen during ALTER TABLE, REPAIR
TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
Though the function comment clearly said it must.
I changed the code so that the locking is done when required. I call
the fix for this problem "the secondary fix".
2005-11-03 18:24:12 +01:00
holyfoot@deer.(none)
a6ada95d1e
test enabled
2005-11-03 21:01:27 +04:00
holyfoot@mysql.com
1d8243c8ed
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 20:58:43 +04:00
holyfoot@mysql.com
a8b38c1d5a
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 19:47:08 +04:00
jani@ua141d10.elisa.omakaista.fi
2940a338c5
Disabled a test temporarily.
2005-11-03 17:39:40 +02:00
jani@ua141d10.elisa.omakaista.fi
cbf8a00c0b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 15:39:55 +02:00
sergefp@mysql.com
0cdaa61a8f
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-03 16:23:47 +03:00
sergefp@mysql.com
749d78fcd4
Merge mysql.com:/home/psergey/mysql-5.0-bug14026-r2
...
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-03 16:21:21 +03:00
jani@ua141d10.elisa.omakaista.fi
3d7d8af3aa
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 15:01:04 +02:00
konstantin@mysql.com
d702915356
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-14210
2005-11-03 15:24:55 +03:00
holyfoot@mysql.com
bac54a7774
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 16:19:46 +04:00
holyfoot@deer.(none)
e529fdc5ee
Merging
2005-11-03 16:17:11 +04:00
konstantin@mysql.com
7e3f757f2d
A fix and a test case for Bug#14210 "Simple query with > operator on
...
large table gives server crash": make sure that when a MyISAM temporary
table is created for a cursor, it's created in its memory root,
not the memory root of the current query.
2005-11-03 14:20:13 +03:00
holyfoot@mysql.com
401d19f036
Merge mysql.com:/home/hf/work/mysql-4.1.14183
...
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 14:58:36 +04:00
evgen@moonbone.local
55790f74bb
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/14093-bug-5.0-mysql
2005-11-03 13:55:08 +03:00
evgen@moonbone.local
30fdafea76
Fix bug #14093 Query takes a lot of time when date format is not valid
...
Invalid date like 2000-02-32 wasn't converted to int, which lead to not
using index and comparison with field as astring, which results in slow
query execution.
convert_constatn_item() and get_mm_leaf() now forces MODE_INVALID_DATES to
allow such conversion.
2005-11-03 13:53:49 +03:00
holyfoot@deer.(none)
c5313e8d4f
Fix for bug #14268 (Bad FLOAT->DECIMAL conversion)
2005-11-03 13:49:37 +04:00
sergefp@mysql.com
a88ecb9a3d
Post-merge fixes
2005-11-03 12:38:46 +03:00
msvensson@neptunus.(none)
d028e8e063
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 10:34:15 +01:00
holyfoot@mysql.com
284f652980
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mysql-4.1.14183
2005-11-03 12:50:28 +04:00
sergefp@mysql.com
7357e470a4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug14026-r2
2005-11-03 11:20:01 +03:00
msvensson@neptunus.(none)
25f5062886
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 08:42:02 +01:00
sergefp@mysql.com
8fefb36800
Merged
2005-11-03 10:28:12 +03:00
holyfoot@mysql.com
c2640d292a
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.13573
2005-11-03 11:05:34 +04:00