brian@zim.(none)
44d54791ae
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-11-10 13:55:14 -08:00
anozdrin@mysql.com
f23f49ed57
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/MySQL/devel/5.0-wl2818
2005-11-10 22:48:00 +03:00
anozdrin@mysql.com
491e4f89f5
WL#2818 (Add creator to the trigger definition for privilege
...
checks on trigger activation)
2005-11-10 22:25:03 +03:00
bell@sanja.is.com.ua
8cedaeb971
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-11-10 21:16:56 +02:00
guilhem@mysql.com
28d23440c3
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0
2005-11-10 19:17:52 +01:00
brian@grrr.local
9807162144
Added "SHOW AUTHORS" code
2005-11-10 19:43:17 +02:00
bell@sanja.is.com.ua
148570fca1
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-11-10 19:38:00 +02:00
guilhem@mysql.com
dda1756789
Merge mysql.com:/home/mysql_src/mysql-5.0-release
...
into mysql.com:/home/mysql_src/mysql-5.0
2005-11-10 18:14:07 +01:00
guilhem@mysql.com
9e07979476
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/home/mysql_src/mysql-5.0-release
2005-11-10 17:53:09 +01:00
guilhem@mysql.com
ff46e54932
WL#2971 "change log-bin-trust-routine-creators=0 to apply only to functions".
...
Indeed now that stored procedures CALL is not binlogged, but instead the invoked substatements are,
the restrictions applied by log-bin-trust-routine-creators=0 are superfluous for procedures.
They still need to apply to functions where function calls are written to the binlog (for example as "DO myfunc(3)").
We rename the variable to log-bin-trust-function-creators but allow the old name until some future version (and issue a warning if old name is used).
2005-11-10 17:50:51 +01:00
brian@zim.(none)
47f9ada913
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-11-10 08:28:50 -08:00
brian@zim.(none)
510d0f24c8
Added handlerton flag to make storage engines invisable via flag.
2005-11-10 08:24:21 -08:00
holyfoot@mysql.com
71908dbc41
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.14268
2005-11-10 19:54:38 +04:00
ramil@mysql.com
6bc74f53a2
Fix for bug #14822 : Test "mysqldump" fails, "result" protocol seems wrong.
2005-11-10 18:58:33 +04:00
bell@sanja.is.com.ua
69c2076c03
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-11-10 16:49:30 +02:00
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
eric@mysql.com
af7e3fceca
Re-applying the work initially done by Brian, and since worked upon by me previously in several separate patches to the 5.1 parent but never pushed.
...
WL#2952 - add simple single-table only transactions to federated.
2005-11-09 05:53:34 -08: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
pem@mysql.com
718f837410
Fixed BUG#14643: Stored Procedure: Continuing after failed var.
...
initialization crashes server.
Make sure variables are initialized to something (like null) when
the default initialization fails and a continue handler is in effect.
2005-11-08 14:47:33 +01:00
sergefp@mysql.com
c5276ebcb0
Merge, will need post-merge fixes.
2005-11-08 11:22:51 +03:00
pappa@c-5608e253.1238-1-64736c10.cust.bredbandsbolaget.se
2a0f8e6434
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into c-5608e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
2005-11-08 00:40:49 -05:00
pappa@c-5608e253.1238-1-64736c10.cust.bredbandsbolaget.se
4282ad92cb
Bug #12796 : Record lost in HEAP table
...
Two handler objects were present, one was used for an insert and the other for a select
The state of the statistics was local to the handler object and thus the other handler
object didn't notice the insert.
Fix included:
1) Add a new variable key_stat_version added to whenever statistics was considered in need
of update (previously key_stats_ok= FALSE in those places)
2) Add a new handler variable key_stat_version assigned whenever key_stats_ok= TRUE was set
previously
3) Fix records_in_range to return records if records <= 1
4) Fix records_in_range to add 2 to rec_per_key to ensure we don't specify 0 or 1 when it isn't
and thus invoking incorrect optimisations.
5) Fix unique key handling for HEAP table in records_in_range
2005-11-08 00:26:37 -05:00
sasha@asksasha.com
637c800191
changed select release_lock() to do release_lock() to avoid having to compare the
...
non-deterministic result in the test case for BUG#7947
the bug fix for BUG#7947 now fixed the result of mix_innodb_myisam_binlog test, which
in the past was missing DO RELEASE_LOCK() in the output of SHOW BINLOG EVENTS
2005-11-07 20:51:30 -07: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
jimw@mysql.com
c5a1a48728
Use transaction-aware DB->stat() call when doing 'ANALYZE TABLE' on
...
a table using the BDB storage engine. (Bug #14671 )
2005-11-07 17:14:35 -08: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
jimw@mysql.com
a6aa8fa6d0
Fix handling of comparisons done by IN() to be consistent with how they
...
are done for the = operator, such as when doing a comparison with a large
unsigned number that was quoted. (Bug #12612 )
2005-11-07 14:59:52 -08: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
sasha@asksasha.com
aaaee3f23b
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
2005-11-07 15:10:48 -07:00
sasha@asksasha.com
41752fa9a0
fix for BUG#7947 - failure to log DO RELEASE_LOCK() if we disconnect in the middle of
...
transaction while holding the lock. Also test to make sure other binlogging issues
reported in the bug have been addressed.
2005-11-07 15:09:35 -07: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
2cb601c840
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/M51/mysql-5.1
2005-11-07 22:54:00 +01:00
joerg@mysql.com
a6eef9b92e
Merge mysql.com:/M50/bug14720 into mysql.com:/M51/merge-5.1
2005-11-07 22:42:58 +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
acurtis@poseidon.ndb.mysql.com
98e20c9b46
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/m51new
2005-11-07 16:30:03 +01:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f
Make storage engines "pluggable", handlerton work
2005-11-07 16:25:06 +01:00
guilhem@mysql.com
ef415ceb14
Fix for BUG#14703 "Valgrind error when inserting 0 into a BIT column (like in type_bit.test)":
...
test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
I wrote to the Valgrind authors in case this is something fixable in Valgrind (normally the
decision to issue a warning is based on the simulated CPU condition code, which should not be undefined here).
2005-11-07 16:18:46 +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
jonas@perch.ndb.mysql.com
88fbfc489d
Import ndb varsize
2005-11-07 12:19:28 +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
bar@mysql.com
1946d68f99
Bug#14146 CHAR(...USING ...) and CONVERT(CHAR(...) USING...) produce different results
...
ctype_utf8.result, ctype_utf8.test:
Adding test case.
item_strfunc.cc:
item_strfunc.h:
Moving the well formed checking code into a method,
to reuse in several Item_func_xxx. Reusing the new
method in Item_func_char and Item_func_charset_conv.
2005-11-07 12:34:19 +04: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
kent@mysql.com
0a160a8416
init_db.sql:
...
Added system table 'mysql.plugin'
2005-11-06 20:51:37 +01:00
svoj@poseidon.ndb.mysql.com
3791197f0d
WL#2575 - Fulltext: Parser plugin for FTS
...
WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree.
2005-11-06 13:13:06 +01: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
igor@rurik.mysql.com
0960f5fedc
Post review fixes.
2005-11-05 22:41:36 -08:00