jani@ua141d10.elisa.omakaista.fi
617585eb33
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2006-01-12 20:28:23 +02:00
jani@ua141d10.elisa.omakaista.fi
8c6a32b997
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2006-01-12 17:47:58 +02:00
jani@ua141d10.elisa.omakaista.fi
af845f6eff
NetWare specific change to increase thread stack size.
...
Changes to Netware specific mysqld_safe.c
2006-01-12 15:10:12 +02:00
monty@mysql.com
b0a5ea01ef
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-01-06 01:08:48 +02:00
knielsen@mysql.com
f13dff7a72
EADDRINUSE is not defined on Windows.
2006-01-04 16:38:54 +01:00
ingo@mysql.com
b1214d232e
Bug#15591 Occasional test suite abort due to port in use
...
If the server is started with --port-open-timeout=#
retry to bind the TCP port if it fails with EADDRINUSE.
Use the new option in mysql-test-run.sh.
2005-12-28 20:30:57 +01:00
stewart@mysql.com
efbdf7b225
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-12-28 00:57:18 +11:00
serg@serg.mylan
d5d6b51422
remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source
2005-12-24 14:32:50 +01:00
serg@serg.mylan
7b049bf2cd
correct help text
2005-12-23 12:38:22 +01:00
kent@mysql.com
45b81ac196
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 13:09:41 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
b7c52afb57
Disabled archive db for Netware.
2005-12-14 02:08:48 +02:00
kent@mysql.com
8fd7e5f922
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-12-08 16:15:27 +01:00
kent@mysql.com
e8198e799e
mysqld.cc:
...
Bug#14960, reverted code to make symdir work on Windows
symlink.test:
Disabled test case on Windows
2005-12-08 16:13:53 +01:00
monty@mysql.com
88eee63d8c
Set thread_stack after return from end_thread()
...
Fixes core dump when reusing thread when running debug binary
2005-12-03 18:13:06 +02:00
pem@mysql.com
23cab491e9
Some post-merge cleaning, and made assert THD::store_globals() work at all times.
2005-11-24 19:13:13 +01:00
bell@sanja.is.com.ua
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
bell@sanja.is.com.ua
7bd691f11e
Recursion support made for SP (BUG#10100).
2005-11-23 01:11:19 +02:00
bell@sanja.is.com.ua
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
bell@sanja.is.com.ua
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
grog@mysql.com
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
jimw@mysql.com
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
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
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
90ca9150a4
Fixes during review of new code
...
Destroy LOCK_uuid_generator
2005-11-03 22:42:25 +02:00
jimw@mysql.com
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
jimw@mysql.com
c3efdc92e7
Fix compile using libwrap with gcc 4.0.2. (Bug #12570 )
2005-11-01 11:08:20 -08:00
msvensson@neptunus.(none)
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
jani@ua141d10.elisa.omakaista.fi
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
SergeyV@selena.
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
SergeyV@selena.
14e90138e5
Formatting change for #14137 patch.
2005-10-26 17:45:30 +04:00
SergeyV@selena.
ba919bd168
Fixes bug #14137 . Converts charsets_dir path to underlying
...
system representation.
2005-10-24 20:08:56 +04:00
sasha@asksasha.com
f6f22df951
fix for BUG#12974: mysqld segfaults when depreciated option --sql-bin-update-same is used
2005-10-22 18:17:11 -06:00
sergefp@mysql.com
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
sergefp@mysql.com
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
jimw@mysql.com
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
sergefp@mysql.com
e7065d355c
BUG#121915: Merge 4.1->5.0
2005-10-19 01:52:06 +04:00
jimw@mysql.com
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
pem@mysql.com
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
pem@mysql.com
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
guilhem@mysql.com
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
jani@ua141d10.elisa.omakaista.fi
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
jimw@mysql.com
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
msvensson@neptunus.(none)
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
msvensson@neptunus.(none)
0ac28d3187
Always test ssl and compress
...
- Updated after review
2005-10-12 13:56:07 +02:00
gluh@eagle.intranet.mysql.r18.ru
4b2a0f0c70
after merge fix
2005-10-12 13:18:46 +05:00
gluh@mysql.com
d19c85199f
4.1->5.0 merge
2005-10-12 11:54:12 +05:00
jimw@mysql.com
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
gluh@eagle.intranet.mysql.r18.ru
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
jimw@mysql.com
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
konstantin@mysql.com
2c7505b263
Remove protocol_cursor.cpp (no longer used) from sources
...
Fix a compile failure
2005-10-09 14:45:08 +04:00