reggie@linux.site
65a1d74fb1
added a comment referring to the bug report
2005-07-15 03:51:55 -06:00
reggie@linux.site
adfa1a2596
Bug #7403 error "Forcing close of thread 1 user: 'xxx'"
...
The problem was that on Windows, the socket was in a blocking state
trying to read. Setting killed=1 is not enough to break the
socket out of it's read loop. You have to cancel the read request
or close the socket (which close_connection does).
2005-07-14 06:04:29 -06:00
tomas@poseidon.ndb.mysql.com
674b6bb151
Merge
2005-07-12 20:01:22 +02:00
monty@mysql.com
fe30ec9032
manual merge
2005-07-04 03:50:04 +03:00
monty@mysql.com
ec420bfb43
Fixes during review of new code
...
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling
2005-07-04 03:42:33 +03:00
monty@mysql.com
86d7b02199
Merge with 4.1
2005-07-03 14:17:52 +03:00
jani@ua141d10.elisa.omakaista.fi
b60175f9c4
Fixed Bug#11226 and reverted fix for Bug#6993.
...
Using 8 bytes for data pointer does not work at least on
all computers. The result may become 0 or negative number.
(mysqld, myisamchk)
2005-06-30 16:13:22 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
3df73db1cf
Applied some Netware related patches.
2005-06-29 14:02:11 +03:00
jimw@mysql.com
3dd28e98e6
Fix typo in --default-store-engine help. (Bug #11534 )
2005-06-27 10:49:40 -07:00
jimw@mysql.com
409592e652
Add my_str_malloc and _free function pointers to strings library
...
which will by default exit(1) if malloc() fails, but can be set
to do something else by the calling program does, which mysqld
does to use my_malloc(..., MYF(MY_FAE)) instead. Also checks
allocation in conf_to_src utility program. (Bug #7003 )
2005-06-24 13:41:33 -07:00
ndbdev@dl145b.mysql.com
dcef1c7532
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-22 19:07:29 +02:00
svoj@mysql.com
a8bcb25eda
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-22 14:11:23 +05:00
svoj@mysql.com
74373e7d54
WL#2286 - Compile MySQL w/YASSL support
...
Fix GCC 4.0 link failure.
Better CXX_VERSION guessing.
2005-06-22 14:08:28 +05:00
monty@mishka.local
1524cd001d
Cleanup during review of new code
...
Fixed wrong allocation that could cause buffer overrun when using join cache
2005-06-21 18:18:58 +03:00
tulin@dl145b.mysql.com
a6d0581275
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-21 08:49:21 +02:00
marko@hundin.mysql.fi
e992adcb3f
Merge hundin.mysql.fi:/home/marko/mysql-5.0
...
into hundin.mysql.fi:/home/marko/mysql-5.0-current
2005-06-21 07:36:18 +03:00
tulin@dl145b.mysql.com
b217fc0692
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-20 12:42:39 +02:00
svoj@mysql.com
c45df76029
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-20 11:33:57 +05:00
svoj@mysql.com
7660f609e6
WL#2286 - Compile MySQL w/YASSL support
...
Fix for yaSSL link failures with Forte Developer 7, MIPSpro Compilers, Compaq C++.
These compilers have problem with implicit template instantiation in archives
(libyassl.a, libtaocrypt.a). Instantiate templates explicitly.
Fix for yaSSL link failure on powermacg5 (gcc 3.3). When -O3 is specified gcc inlines
__cxa_pure_virtual. This is wrong behavior, __cxa_pure_virtual must never be inlined.
2005-06-19 21:46:44 +05:00
tulin@dl145b.mysql.com
07b4a42e18
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-18 09:21:50 +02:00
acurtis@xiphis.org
51dd521dfc
Bug#6877 MySQL should give an error if the requested table type is not available
...
Implement new SQL mode - NO_ENGINE_SUBSTITUTION
2005-06-17 22:14:44 +01:00
ndbdev@dl145b.mysql.com
7641b50fb6
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-17 08:13:57 +02:00
konstantin@mysql.com
4f966145b0
Post-merge fixes.
2005-06-17 01:58:36 +04:00
konstantin@mysql.com
62dacf0813
Manual merge (4.1->5.0)
2005-06-17 00:34:35 +04:00
konstantin@mysql.com
dcb0e65dcb
Fix Bug#9334 "PS API queries in log file" and
...
Bug#8367 "low log doesn't gives complete information about prepared
statements"
Implement status variables for prepared statements commands (a port of
the patch by Andrey Hristov).
See details in comments to the changed files.
No test case as there is no way to test slow log/general log in
mysqltest.
2005-06-17 00:11:48 +04:00
konstantin@mysql.com
f10b395982
A fix for Bug#9141 "4.1 does not log into slow log
...
ALTER, OPTIMIZE and ANALYZE statements".
In 4.1 we disabled logging of slow admin statements. The fix adds an
option to enable it back.
No test case (slow log is not tested in the test suite), but tested
manually.
+ post-review fixes (word police mainly).
2005-06-16 23:05:38 +04:00
ndbdev@dl145b.mysql.com
be7c5c1900
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-15 20:07:31 +02:00
georg@lmy002.wdf.sap.corp
80c4566231
Added comment after Serg's review
2005-06-15 15:57:38 +02:00
georg@lmy002.wdf.sap.corp
5670a3f31e
Fix for bug #11174 (can't determine hostname under Windows 64-bit)
2005-06-15 09:27:24 +02:00
joreland@mysql.com
84a04b4a9d
merge
2005-06-13 14:09:09 +02:00
joreland@mysql.com
54cff2bc30
merge
2005-06-13 08:05:29 +02:00
jimw@mysql.com
55f962c0cf
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-10 20:11:20 -07:00
jimw@mysql.com
495ee34be0
Fix problem with handling of lower_case_table_name == 2 when
...
the case in the FROM and WHERE clauses didn't agree. (Bug #9500 )
2005-06-08 14:35:16 -07:00
paul@frost.snake.net
52a4221188
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0
2005-06-07 10:05:52 -05:00
paul@frost.snake.net
85648050af
Typo in help message.
2005-06-07 10:03:09 -05:00
ndbdev@dl145b.mysql.com
723173c0f3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 12:50:45 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
f2933263fb
A fix for systems that don't have HAVE_MMAP defined.
...
Moved some variable externs from sql_class.h to mysql_priv.h
2005-06-07 11:30:09 +03:00
ndbdev@dl145b.mysql.com
2fb1fb5877
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 06:50:50 +02:00
monty@mysql.com
775f17667b
Merge with 4.1
2005-06-07 00:31:53 +03:00
monty@mysql.com
29fd1f2fd9
Move USE_PRAGMA_IMPLEMENTATION to proper place
...
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
2005-06-03 23:46:03 +03:00
tomas@poseidon.ndb.mysql.com
2dca9d5953
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-02 10:44:48 +02:00
brian@zim.(none)
113a99626d
Merge of 4.1->5.0. This contained the fixes for GCC 4.0
2005-06-01 21:56:30 -07:00
brian@zim.(none)
ba9b9f8993
Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
2005-06-01 17:34:10 -07:00
tomas@poseidon.ndb.mysql.com
1b029b1c06
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-05-31 21:30:26 +02:00
tomas@poseidon.ndb.mysql.com
5088b28d09
Merge
2005-05-31 14:37:47 +02:00
pem@mysql.comhem.se
063896a6e7
Post-review fixes of BUG#9937: Crash on call to stored procedure.
2005-05-31 12:06:15 +02:00
pem@mysql.com
e496b24304
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-05-30 11:06:31 +02:00
msvensson@neptunus.(none)
a07d8b1951
Merge neptunus.(none):/home/msvensson/mysql/bug9993
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-27 17:22:19 +02:00
pem@mysql.com
605af1e7dc
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-05-27 11:28:03 +02:00
sergefp@mysql.com
59db44382b
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2
2005-05-26 21:01:53 +02:00