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
guilhem@mysql.com
27a6670747
Merge mysql.com:/home/mysql_src/mysql-4.1-gca
...
into mysql.com:/home/mysql_src/mysql-4.1
2005-11-10 15:14:17 +01:00
guilhem@mysql.com
1379dd180f
Merge mysql.com:/home/mysql_src/mysql-4.1-gca
...
into mysql.com:/home/mysql_src/mysql-5.0-release
2005-11-10 15:13:12 +01:00
guilhem@mysql.com
2df7d97281
Declaring some class members public for BUG#12377:
...
"Item_date_add_interval needs to have the int_type member as Public".
As explained in the bug report, this change is is to help http://search.cpan.org/~philips/DBIx-MyParse-0.20/
So please keep those members public.
2005-11-10 15:12:22 +01:00
konstantin@mysql.com
0d4dbfd1b7
Fix a comment.
2005-11-10 17:05:19 +03:00
joerg@mysql.com
74c57a6dc9
Provide a default "minimum thread stack size" PTHREAD_STACK_MIN where it is missing.
...
(Currently, affects only BSD with Linuxthreads)
2005-11-10 14:24:54 +01:00
holyfoot@mysql.com
bbc26a63b2
merging
2005-11-10 16:32:49 +04:00
pem@mysql.com
2636f3cc6f
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14719/mysql-5.0
2005-11-10 12:26:43 +01:00
eric@mysql.com
ee39b6ab9a
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/eric/fed-txn-mysql-5.1-new
2005-11-10 03:02:41 -08:00
joerg@mysql.com
65bea6b36b
Merge mysql.com:/M51/merge-5.1 into mysql.com:/M51/clone-5.1
2005-11-10 10:05:59 +01:00
tomas@poseidon.ndb.mysql.com
400aa16353
corrected compile error
2005-11-10 09:24:27 +01:00
tomas@poseidon.ndb.mysql.com
d20c1230d8
stilled memleak in ndb Gci_container
2005-11-09 23:08:53 +01:00
joerg@mysql.com
9ef51c7995
Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/merge-5.1
2005-11-09 19:44:58 +01:00
joerg@mysql.com
6961bd0255
Hack! Compile fix to provide a "typedef" for "u_int32_t" where it is missing.
...
Should be replaced by a cleaner solution.
2005-11-09 18:44:28 +01:00
joerg@mysql.com
e0a47156ac
Compile fix for NDB 5.1.2 on Solaris, provided by Pekka.
2005-11-09 18:36:10 +01:00
konstantin@mysql.com
b318ed1768
A fix and a test case for Bug#13488 "Left outer join query incorrectly
...
gives MYSQL_DATA_TRUNCATED"
2005-11-09 20:31:01 +03: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
joerg@mysql.com
c669c38769
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-11-09 14:14:30 +01:00
joerg@mysql.com
1aa66c59c0
Raise the version number to 5.0.17.
2005-11-09 14:12:44 +01:00
sergefp@mysql.com
ea689d3867
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-nov08-push
2005-11-09 15:31:43 +03:00
joerg@mysql.com
5ff74d1bc4
Merge mysql.com:/M50/bug6584 into mysql.com:/M51/merge-5.1
2005-11-09 13:18:03 +01:00
sergefp@mysql.com
c914a03066
BUG#14480 post-fix: merge to 5.0
2005-11-09 14:47:58 +03:00
joerg@mysql.com
4015635bcd
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-11-09 12:45:34 +01:00
sergefp@mysql.com
628264f160
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-nov08-push
2005-11-09 14:33:55 +03:00
joerg@mysql.com
fc52847260
Merge mysql.com:/M50/bug6584 into mysql.com:/M50/mysql-5.0
2005-11-09 12:16:37 +01:00
kent@mysql.com
eb9113482a
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-11-09 12:00:57 +02:00
kent@mysql.com
b269caecb1
Additional "make distcheck" changes specific to 5.0
2005-11-09 11:56:04 +02:00
joerg@mysql.com
ee3cd794f8
Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1
2005-11-09 09:24:16 +01:00
jonas@perch.ndb.mysql.com
78a0dbfd84
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-11-09 08:57:59 +01:00
sergefp@mysql.com
dded290d1f
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-nov08-push
2005-11-09 10:14:49 +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
pekka@mysql.com
1926b4e167
ndb - super pool update (future use)
2005-11-08 23:48:26 +01:00
ingo@production.mysql.com
cae673d0a9
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
2005-11-08 20:18:08 +01:00
joerg@mysql.com
2153871abf
Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree.
2005-11-08 17:30:41 +01:00
sergefp@mysql.com
84101eb85d
Trivial post-merge fixes
2005-11-08 11:26:02 +03:00
sergefp@mysql.com
c5276ebcb0
Merge, will need post-merge fixes.
2005-11-08 11:22:51 +03:00
kent@mysql.com
41b554daa9
configure.in:
...
Temporary work around to pass --build=... to configure
in storage engine sub directory
print_file.cpp:
HP-UX compiler don't like variable shadowing
AsyncFile.cpp:
Cast result from strstr() to char* for HP-UX compile
trigger_definitions.h:
"MIN" and "MAX" are not used for trigger stuff, move to a more global include
ndb_global.h.in:
Define "MIN" and "MAX" globally for all NDB, in case the platform does not have it (like Solaris).
Moved here from "include/kernel/trigger_definitions.h".
Makefile.am:
Add missing ha_* files to EXTRA_mysqld_SOURCES
2005-11-08 07:41:46 +01: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
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
2e13e29a29
Add generated files to ignore list
2005-11-07 16:39:20 -08:00