23cab491e9
Some post-merge cleaning, and made assert THD::store_globals() work at all times.
2005-11-24 19:13:13 +01:00
db8f03ebe8
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
2005-11-23 01:28:32 +02:00
7bd691f11e
Recursion support made for SP (BUG#10100).
2005-11-23 01:11:19 +02:00
7f162c7899
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
2005-11-21 21:15:48 +02:00
806f9e24ff
Inefficient usage of String::append() fixed.
...
Bad examples of usage of a string with its length fixed.
The incorrect length in the trigger file configuration descriptor
fixed (BUG#14090).
A hook for unknown keys added to the parser to support old .TRG files.
2005-11-20 20:47:07 +02:00
e91e55d643
set_var.cc, mysqld.cc, ha_innodb.h:
...
BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.
ha_innodb.cc:
BUG#12701: SHOW VARIABLES does not show correct size of buffer pool
2005-11-17 15:08:49 +01:00
9d670ddbf4
Merge mysql.com:/home/jimw/my/mysql-5.0-12570
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-10 11:22:13 -08:00
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
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
90ca9150a4
Fixes during review of new code
...
Destroy LOCK_uuid_generator
2005-11-03 22:42:25 +02:00
90e4346396
Don't allow startup when default storage engine is specified to be a
...
storage engine that is disabled. This was fixed once in 4.1, but regressed
in 5.0 because of changes to storage engine initialization. (Bug #9815 )
2005-11-02 17:56:12 -08:00
c3efdc92e7
Fix compile using libwrap with gcc 4.0.2. (Bug #12570 )
2005-11-01 11:08:20 -08:00
be6f7a3f82
Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:00:54 +02:00
cbe21a8eb6
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-27 23:43:20 +03:00
0eacb6fb35
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#14137-mysql-5.0
2005-10-26 19:05:02 +04:00
14e90138e5
Formatting change for #14137 patch.
2005-10-26 17:45:30 +04:00
ba919bd168
Fixes bug #14137 . Converts charsets_dir path to underlying
...
system representation.
2005-10-24 20:08:56 +04:00
f6f22df951
fix for BUG#12974: mysqld segfaults when depreciated option --sql-bin-update-same is used
2005-10-22 18:17:11 -06:00
ea3ea9ed10
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2
2005-10-23 02:49:57 +04:00
15a78334c3
BUG#9622, stage 2, work together with fix for BUG#12232:
...
added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622).
2005-10-21 06:29:17 +04:00
2c90e2f7a6
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-19 13:47:05 -07:00
e7065d355c
BUG#121915: Merge 4.1->5.0
2005-10-19 01:52:06 +04:00
e284a57c88
Merge mysql.com:/home/jimw/my/mysql-4.1-13334
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 09:45:12 -07:00
ddc36a2784
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/bug7049/mysql-5.0
2005-10-17 15:12:38 +02:00
e585315703
Additional fix for BUG#7049, after review.
...
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
2005-10-17 15:07:47 +02:00
845b9fbf58
fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0);
...
because they are used by net_printf() and push_warning(), which can be called if check_connection() fails.
2005-10-14 15:34:52 +02:00
2dd1e4f94e
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-10-13 18:23:53 +03:00
cb0d8aba46
Merge mysql.com:/home/jimw/my/mysql-4.1-8731b
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 13:28:46 -07:00
7d29c2a4a1
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
2005-10-12 13:59:00 +02:00
0ac28d3187
Always test ssl and compress
...
- Updated after review
2005-10-12 13:56:07 +02:00
4b2a0f0c70
after merge fix
2005-10-12 13:18:46 +05:00
d19c85199f
4.1->5.0 merge
2005-10-12 11:54:12 +05:00
c8a6c2c614
Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how
...
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731 )
2005-10-11 09:12:12 -07:00
8d01ea1be7
Fix for bug#9270 multiple SSL race conditions (for 5.0 tree)
...
The fix is needed to perform locking on shared data structures
This is modification of patch proposed by Leandro Santi
(see http://webs.sinectis.com.ar/lesanti/misc/mysql-4.0.23a-openssl_locking.patch )
2005-10-11 16:26:00 +05:00
083c032ec3
Fix minimum value of query_prealloc_size to be the same as its default. (Bug #13334 )
2005-10-10 19:39:16 -07:00
2c7505b263
Remove protocol_cursor.cpp (no longer used) from sources
...
Fix a compile failure
2005-10-09 14:45:08 +04:00
e91712d9bb
pthread_handler_decl() changed to be ctags-friendly
...
(and contain extern "C" when necessary)
2005-10-08 16:39:55 +02:00
4099872e2c
Fixed several boolean type options used in my_long_options[].
...
Some options were declared as 'bool', but since those are being
handled in my_getopt.c, bool can be machine dependent. To make
sure it works in all circumstances, the type should be my_bool
for C (not C++) programs.
2005-10-04 19:52:12 +03:00
cb96f195c8
Improved testing of ssl and compression
...
- Added show status variable "compression" for checking that compression is turned on.
- Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections.
- Setup server to accept ssl connections from clients ig that is supported by server
- New tests
- ssl - Run with ssl turned on
- ssl_compress - Run with ssl and compression turned on
- compress - Run with compression turned in
- Updated test
- openssl_1, rpl_openssl1 - Changed to run if server supports ssl
2005-10-04 15:43:55 +02:00
656b0cc15a
Merge
2005-09-29 03:20:31 +02:00
844d964f2d
Many files:
...
Prefix regex functions/types with "my_" as our
library is not compatible with normal regex lib.
my_regex.h:
Rename: regex/regex.h -> regex/my_regex.h
2005-09-29 02:08:24 +02:00
9a05a887de
Manually merged
2005-09-24 02:39:52 +04:00
d90b988da7
BUG#12232: Addressing docs team feedback: s/inequal/unequal/
2005-09-24 01:39:50 +04:00
67a643f931
mysqld.cc:
...
Fix out-of-order status variable.
2005-09-23 15:59:32 -05:00
b83f29d56d
mysqld.cc:
...
Fix out-of-order status variable.
2005-09-23 14:14:34 -05:00
19b2cd58e8
Fix for yet another compilation failure on Windows which was introduced during
...
work on WL#2787 "Add view definer/owner to the view definition (.frm) to check
privileges on used tables and stored routines when using a VIEW."
(aka bug #13402 "Windows VS 2003 Compiler error")
2005-09-23 21:28:47 +04:00
87dcb3c6f5
Fix for bug #13407 "Remote connecting crashes server" and couple of similar
...
problems which were introduced during work on WL#2787 "Add view definer/owner
to the view definition (.frm) to check privileges on used tables and stored
routines when using a VIEW."
In some cases it is better to use value from Security_context::host_or_ip
instead of value from Security_context::host since the latter can be NULL
in certain situations (When we can't resolve hostname or we have not done
this yet).
2005-09-22 23:03:53 +04:00
306aa15391
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged
2005-09-21 17:42:44 +02:00
3b41e3362b
aftermerge fix
2005-09-21 17:38:26 +02:00
d1ee898d34
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-21 14:39:28 +02:00
