mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18948 commits 2780 branches 343 tags 1.6 GiB
Commit graph

18948 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
konstantin@mysql.com
d4df2660c6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-root
 2005-07-14 15:14:40 +04:00
konstantin@mysql.com
62b8e6fdd1 A fix and a test case for Bug#9735. 
No separate typecode for MEDIUMTEXT/LONGTEXT is added, as we
have no sound decision yet what typecodes and for what types are
sent by the server (aka what constitutes a distinct type in MySQL).
 2005-07-14 15:13:23 +04:00
reggie@linux.site
03a6d0c731 fixed function sig so it will compile with Visual C++ 8 2005-07-14 03:49:54 -06:00
bar@mysql.com
1b612b0006 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.num-conv
 2005-07-14 10:46:15 +05:00
konstantin@mysql.com
ef1e748ef1 A test case for Bug#9442 "Set parameter make query fail if column 
character set is UCS2".
The bug is no longer repeatable.
 2005-07-14 00:15:23 +04:00
konstantin@mysql.com
1755df7649 A fix and a test case for Bug#9379 (collation of a parameter marker is 
binary).
 2005-07-13 23:43:46 +04:00
konstantin@mysql.com
2ba359147f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-11458
 2005-07-13 18:09:14 +04:00
konstantin@mysql.com
2dc2ec3ef7 Cleanup after test for Bug#11458 2005-07-13 18:01:04 +04:00
joerg@mysql.com
ae949ccdd5 4.1.13 has been cloned off 2005-07-13 15:55:22 +02:00
konstantin@mysql.com
374b9182af Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-11458
 2005-07-13 17:39:48 +04:00
konstantin@mysql.com
bef558b7ee - a fix for Bug#11458 "Prepared statement with subselects return random 
data": remove the fix for another bug (8807) that
added OUTER_REF_TABLE_BIT to all subqueries that used a placeholder
to prevent their evaluation at prepare. As this bit hanged in 
Item_subselect::used_tables_cache for ever, a constant subquery with
a placeholder was never evaluated as such, which caused wrong 
choice of the execution plan for the statement.
- to fix Bug#8807 backport a better fix from 5.0
- post-review fixes.
 2005-07-13 17:38:55 +04:00
mats@mysql.com
1826c39897 Bug#11905: Tables used in rpl_deadlock are not dropped at the 
end of the test, causing subsequent tests to fail.
 2005-07-13 13:49:35 +02:00
gluh@eagle.intranet.mysql.r18.ru
672e1f20cb Bug #9854 hex() and out of range handling 
added out of range handling
 2005-07-13 14:23:09 +05:00
bar@mysql.com
5150fdcc04 ctype_utf8.result: 
adding test case
sql_table.cc:
  sql_table.cc:
  - do not create a new item when charsets are the same
  - return ER_INVALID_DEFAULT if default value cannot
    be converted into the column character set.
item.cc:
  - Allow conversion not only to Unicode,
    but also to and from "binary".
  - Adding safe_charset_converter() for Item_num
    and Item_varbinary, returning a fixed const Item.
 2005-07-13 13:00:17 +05:00
reggie@linux.site
c31d71c065 Fixed some vio code that was using ___WIN__ instead of __WIN__ 2005-07-12 10:31:09 -06:00
jimw@mysql.com
25deb84c0a Merge mysql.com:/home/jimw/my/mysql-4.1-11844 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-12 09:31:08 -07:00
jimw@mysql.com
60368919f9 Merge mysql.com:/home/jimw/my/mysql-4.1-11643 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-12 09:31:07 -07:00
lars@mysql.com
a2ed7cb257 Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/b6987-mysql-4.1
 2005-07-12 18:31:06 +02:00
joerg@mysql.com
c208abe705 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-07-12 18:31:05 +02:00
lars@mysql.com
7d78f53e1c Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/b6987-mysql-4.1
 2005-07-12 18:31:05 +02:00
sergefp@mysql.com
670428f6e6 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug11821
 2005-07-12 16:31:04 +00:00
sergefp@mysql.com
55e70fd1f6 Fix for BUG#11821: Make Item_type_holder be able to work with MIN(field), 
MAX(field).
 2005-07-12 16:30:45 +00:00
reggie@linux.site
8a68788c39 Bug #7142 Show Fields from fails using Borland's dbExpress interface 
The problem here is that columns that have an especially long type 
such as an enum type with many options would be longer than 40 chars
but the type column returned from show columns always was defined
as varchar(40).

This is fixed in 5.0 using info schema.
 2005-07-12 08:35:30 -06:00
lars@mysql.com
bdf0a22c71 Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/b6987-mysql-4.1
 2005-07-12 14:17:23 +02:00
igor@igor-inspiron.creware.com
36945e144c Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into igor-inspiron.creware.com:/home/igor/mysql-4.1
 2005-07-12 03:18:43 -07:00
mskold@mysql.com
d71548c873 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-07-12 10:50:47 +02:00
mskold@mysql.com
c37aece470 Disabled internal ndb system table test, since it only works on case sensitive systems 2005-07-12 10:39:58 +02:00
lars@mysql.com
dc55af92ff BUG#6987: Added note when stat is failing on relay log, added mutex for log rotatation. 2005-07-12 06:01:26 +02:00
brian@avenger.(none)
0c5ac2dd5b Fix for gcc 4.0 (they have removed min/max operators). 2005-07-11 16:56:18 -07:00
jimw@mysql.com
7ae4a6043c Apply security patch to bundled zlib for CAN-2005-2096. (Bug #11844) 2005-07-11 10:37:21 -07:00
joerg@mysql.com
e3feff334f cmd-line-utils/libedit/chared.c: Fix compile problem caused by use of "uint" which is undefined on QNX. 2005-07-11 15:59:49 +02:00
bar@mysql.com
1042a275fe field_conv.cc: 
Identation fix
 2005-07-11 16:51:39 +05:00
bar@mysql.com
45fe5e74d8 field_conv.cc: 
Bug#11591
  CHAR column with utf8 does not work properly
  (more chars than expected)
  do_cut_string didn't call well_formed_length,
  and copied all data, which was wrong in the
  case of multibyte character set.
ctype_utf8.result, ctype_utf8.test:
  adding test case
 2005-07-11 13:20:07 +05:00
lenz@mysql.com
ce4f3cfb3f Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-4.1
 2005-07-08 21:06:07 +02:00
lenz@mysql.com
611ae59245 - reverted adding mysql-test/t/*.def to the distribution (it is not supported in 4.1 
at all)
 2005-07-08 21:04:54 +02:00
kent@mysql.com
ccae663ec0 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-07-08 15:40:36 +02:00
igor@igor-inspiron.creware.com
3c98b0132e Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into igor-inspiron.creware.com:/home/igor/mysql-4.1
 2005-07-08 06:37:09 -07:00
kent@mysql.com
f65323bd08 mysql_client_test.dsp: 
Corrected libs and lib search path for debug target
 2005-07-08 15:36:57 +02:00
lenz@mysql.com
8b6c6eea49 Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-4.1
 2005-07-08 11:11:05 +02:00
lenz@mysql.com
780d699b86 - added mysql-test/t/*.def to the source and binary distributions 2005-07-08 11:07:05 +02:00
jimw@mysql.com
de9909faec Fix crash caused by calling DES_ENCRYPT() without the --des-key-file 
option having been passed to the server. (Bug #11643)
 2005-07-07 11:49:44 -07:00
kent@mysql.com
be0f916512 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-07-07 18:50:29 +02:00
kent@mysql.com
922f2faa36 mtr_cases.pl: 
Added support for the disabled.def file
 2005-07-07 18:41:22 +02:00
msvensson@neptunus.(none)
a8efd33aec Merge neptunus.(none):/home/msvensson/mysql/bug11635/my41-bug11635 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-07-07 18:21:20 +02:00
msvensson@neptunus.(none)
50133499b5 BUG#11635 mysqldump exports TYPE instead of USING for HASH Cluster indexes 
- Change output from SHOW CREATE TABLE to use USING instead of TYPE
 2005-07-07 14:44:28 +02:00
brian@zim.(none)
61db785682 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zim.(none):/home/brian/mysql/mysql-4.1
 2005-07-06 15:55:49 -07:00
brian@zim.(none)
8c9dd56b0e Typo for debug code. Bug #11705 2005-07-06 15:54:02 -07:00
kent@mysql.com
287971069b Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-07-06 22:23:07 +02:00
kent@mysql.com
fe21793446 mtr_misc.pl: 
Corrected appending of .exe to Windows executables
  Don't alter read only @_ in foreach loop
mysql-test-run.pl:
  Improved cleanup of binlogs
  Use separate log file for second master
  Corrected Windows paths to executables
 2005-07-06 22:21:35 +02:00