Commit graph

18885 commits

Author SHA1 Message Date
unknown
98248f046f A fix and a test case for Bug#9379 (collation of a parameter marker is
binary).


mysql-test/r/ps.result:
  Test results fixed (Bug#9379)
mysql-test/t/ps.test:
  A test case for Bug#9379 (collation of a parameter marker is binary)
sql/item.cc:
  - set Item_param::collation to str_value collation, if Item_param
  is assigned a string. Reset it to default in Item_param::reset() (on 
  the next execution it can be assigned a number).
sql/item_func.cc:
  - now that item collation can change between executions
  (if this item is Item_param), we need to register the change
  of the execution tree in the rollback list.
2005-07-13 23:43:46 +04:00
unknown
e064ca31d9 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
unknown
f5c8f42f9c Cleanup after test for Bug#11458 2005-07-13 18:01:04 +04:00
unknown
5ef54bb929 4.1.13 has been cloned off
configure.in:
  Increase version number to 4.1.14, as the clone for 4.1.13 has been created.
2005-07-13 15:55:22 +02:00
unknown
7a0f6d522b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/opt/local/work/mysql-4.1-11458


sql/mysql_priv.h:
  Auto merged
2005-07-13 17:39:48 +04:00
unknown
ece17ba3cf - 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.


mysql-test/r/ps.result:
  Bug#11458: test results fixed
mysql-test/t/ps.test:
  - add a test case for Bug#11458 "Prepared statement with subselects return 
  random data"
sql/item.cc:
  - remove unnecessary Item_param::fix_fields
  - fix Item_param::set_null to set item_type accordingly (safety:
    Item_param should behave like a basic constant).
sql/item.h:
  Remove Item_param::fix_fields
sql/item_subselect.h:
  Remove no more existing friend.
sql/mysql_priv.h:
  Add UNCACHEABLE_PREPARE to mark all subqueries as uncacheable if
  in statement prepare (backport from 5.0).
sql/sql_lex.h:
  Comment fixed.
sql/sql_parse.cc:
  If in statement prepare, mark all subqueries as uncacheable (backport
  from 5.0)
sql/sql_prepare.cc:
  Switch off the uncacheable flag from all subqueries after statement
  prepare is done (backport from 5.0)
2005-07-13 17:38:55 +04:00
unknown
ecd1ea93a7 Bug#11905: Tables used in rpl_deadlock are not dropped at the
end of the test, causing subsequent tests to fail.


mysql-test/r/rpl_deadlock.result:
  Result change.
mysql-test/t/rpl_deadlock.test:
  Tables used in the test but not dropped.
2005-07-13 13:49:35 +02:00
unknown
3ae23d5b9e Bug #9854 hex() and out of range handling
added out of range handling
2005-07-13 14:23:09 +05:00
unknown
73fd169d02 Fixed some vio code that was using ___WIN__ instead of __WIN__
include/my_global.h:
  set SOCKET_EWOULDBLOCK to the proper windows def WSAEWOULDBLOCK
sql/net_serv.cc:
  fixed typo with using 3 leading underscores instead of 2
vio/vio.c:
  fixed typo with using 3 leading underscores instead of 2
vio/viosocket.c:
  fixed typo with using 3 leading underscores instead of 2
2005-07-12 10:31:09 -06:00
unknown
2bca6451f7 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
unknown
41b038b548 Merge mysql.com:/home/jimw/my/mysql-4.1-11643
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/item_strfunc.cc:
  Auto merged
BitKeeper/etc/config:
  Resolve conflict
2005-07-12 09:31:07 -07:00
unknown
2fdbbffeb4 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
unknown
20d2727b7e 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
unknown
171fa433e6 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
unknown
bc0eef3ecc 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
unknown
3be7d3fcee Fix for BUG#11821: Make Item_type_holder be able to work with MIN(field),
MAX(field).


mysql-test/r/subselect.result:
  Testcase for BUG#11821
mysql-test/t/subselect.test:
  Testcase for BUG#11821
2005-07-12 16:30:45 +00:00
unknown
a0678c6cbf 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
unknown
c9956b6a2a 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
unknown
63d25bbd98 Disabled internal ndb system table test, since it only works on case sensitive systems 2005-07-12 10:39:58 +02:00
unknown
9e4eb5f2d5 BUG#6987: Added note when stat is failing on relay log, added mutex for log rotatation.
sql/log.cc:
  Added a note when stat failed on log file
sql/slave.cc:
  Added mutex for relay log rotation
2005-07-12 06:01:26 +02:00
unknown
86f46a346e Fix for gcc 4.0 (they have removed min/max operators).
include/my_global.h:
  Fix for gcc 4.0 (they removed min/max)
2005-07-11 16:56:18 -07:00
unknown
b1b37094d9 Apply security patch to bundled zlib for CAN-2005-2096. (Bug #11844)
zlib/inftrees.c:
  Apply security patch for CAN-2005-2096
2005-07-11 10:37:21 -07:00
unknown
c580293e5c cmd-line-utils/libedit/chared.c: Fix compile problem caused by use of "uint" which is undefined on QNX.
cmd-line-utils/libedit/chared.c:
  Re-apply vva's fix:
  cmd-line-utils/libedit/chared.c@1.4, 2004-08-31 17:50:59+05:00, vva@eagle.mysql.r18.ru
    discarded using of uint because it's undefined on qnx
2005-07-11 15:59:49 +02:00
unknown
b18b97aace field_conv.cc:
Identation fix


sql/field_conv.cc:
  Identation fix
2005-07-11 16:51:39 +05:00
unknown
dce0304a42 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


sql/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.
mysql-test/t/ctype_utf8.test:
  adding test case
mysql-test/r/ctype_utf8.result:
  adding test caser
2005-07-11 13:20:07 +05:00
unknown
8dce276058 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
unknown
284e241c46 - 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
unknown
1f58b8f96e 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
unknown
6fcb956277 mysql_client_test.dsp:
Corrected libs and lib search path for debug target


VC++Files/tests/mysql_client_test.dsp:
  Corrected libs and lib search path for debug target
2005-07-08 15:36:57 +02:00
unknown
4d65b85e5e 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
unknown
3d2814d6d4 - added mysql-test/t/*.def to the source and binary distributions
mysql-test/Makefile.am:
  - added mysql-test/t/*.def to the source distribution and make sure that "make install"
    installs it, too.
scripts/make_binary_distribution.sh:
  - added mysql-test/t/*.def to the binary distribution
2005-07-08 11:07:05 +02:00
unknown
01b66f3f34 Fix crash caused by calling DES_ENCRYPT() without the --des-key-file
option having been passed to the server. (Bug #11643)


sql/des_key_file.cc:
  Split initialization of mutex to new function, and make sure static
  initialization variable is initialized.
sql/item_strfunc.cc:
  Make sure to initialize mutex before using it
sql/mysql_priv.h:
  Add init_des_key_file() declaration
mysql-test/r/func_des_encrypt.result:
  New BitKeeper file ``mysql-test/r/func_des_encrypt.result''
mysql-test/t/func_des_encrypt.test:
  New BitKeeper file ``mysql-test/t/func_des_encrypt.test''
BitKeeper/etc/config:
  Disable openlogging
2005-07-07 11:49:44 -07:00
unknown
5b49a4ffde 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
unknown
ce5f68cfa0 mtr_cases.pl:
Added support for the disabled.def file


mysql-test/lib/mtr_cases.pl:
  Added support for the disabled.def file
2005-07-07 18:41:22 +02:00
unknown
826b1db224 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
unknown
46d472d636 BUG#11635 mysqldump exports TYPE instead of USING for HASH Cluster indexes
- Change output from SHOW CREATE TABLE to use USING instead of TYPE


mysql-test/r/ctype_utf8.result:
  Update test results
mysql-test/r/show_check.result:
  Update test results
mysql-test/r/sql_mode.result:
  Update test results
mysql-test/t/show_check.test:
  Add test for BUG#11635
sql/sql_show.cc:
  Change TYPE to USING as output from SHOW CREATE TABLE
2005-07-07 14:44:28 +02:00
unknown
b10b9fdc50 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into  zim.(none):/home/brian/mysql/mysql-4.1


BitKeeper/etc/config:
  Auto merged
2005-07-06 15:55:49 -07:00
unknown
e2aa2abd72 Typo for debug code. Bug #11705
vio/viossl.c:
  Typo for dbug code
BitKeeper/etc/config:
  turned off openlogging
2005-07-06 15:54:02 -07:00
unknown
f8babb1a25 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
unknown
0f06342304 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


mysql-test/mysql-test-run.pl:
  Improved cleanup of binlogs
  Use separate log file for second master
  Corrected Windows paths to executables
mysql-test/lib/mtr_misc.pl:
  Corrected appending of .exe to Windows executables
  Don't alter read only @_ in foreach loop
2005-07-06 22:21:35 +02:00
unknown
8e9492f01a Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-07-06 16:21:14 +02:00
unknown
b5081acd66 mysql-test-run.pl:
Handle case where SHELL isn't set in Cygwin
mysql_client_test.dsp:
  Put output into the "client_debug" and "client_release" directories


VC++Files/tests/mysql_client_test.dsp:
  Put output into the "client_debug" and "client_release" directories
mysql-test/mysql-test-run.pl:
  Handle case where SHELL isn't set in Cygwin
2005-07-06 16:17:32 +02:00
unknown
903e404011 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
2005-07-06 16:32:25 +03:00
unknown
7f0667c6b7 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-07-06 14:53:54 +02:00
unknown
21ca7e7c7e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
2005-07-06 15:20:51 +03:00
unknown
81c31e3b00 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


scripts/make_binary_distribution.sh:
  Auto merged
2005-07-06 14:00:24 +02:00
unknown
2a04d15596 - backported a change for make_binary_distribution.sh from 5.0 for easier building of
all versions: added an option "--machine" that allows to override the autodetected
  architecture string (e.g. "i386") that becomes part of the binary package name with 
  a different one
- moved the removal of the BASE directory to the end of the make_binary_distribution
  script


scripts/make_binary_distribution.sh:
  - backported and fixed a change from 5.0 for easier building of all versions: added an
    option "--machine" that allows to override the autodetected architecture string 
    (e.g. "i386") that becomes part of the binary package name with a different one
  - moved the removal of the BASE directory to the end of the script
2005-07-06 13:58:29 +02:00
unknown
13331c740b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
2005-07-06 13:23:21 +03:00
unknown
e0df26b1fe Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-07-06 11:50:05 +02:00
unknown
2aaca01c46 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-07-06 11:29:22 +02:00