Commit graph

24403 commits

Author SHA1 Message Date
unknown
6eedec6889 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into igor-inspiron.creware.com:/home/igor/mysql-5.0
2005-07-08 06:19:13 -07:00
unknown
b24aa0655a Merge igor-inspiron.creware.com:/home/igor/mysql-5.0
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/ctype_utf8.result:
  Auto merged
2005-07-08 02:33:15 -07:00
unknown
586e91abdc Merge mysql.com:/space/my/mysql-5.0.9-clone
into mysql.com:/space/my/mysql-5.0
2005-07-08 11:32:12 +02:00
unknown
d261c2af8a - manual merge of the addition of including mysqlt-test/t/*.def
mysql-test/Makefile.am:
  - manual merge
scripts/make_binary_distribution.sh:
  - manual merge
2005-07-08 11:27:08 +02:00
unknown
47c921e364 ctype_utf8.test:
Added a test case for bug #11484.
hp_hash.c:
  Fixed bug #11484.
  This bug in the function hp_rec_key_cmp resulted in wrong
  comparison of varchar multibyte keys if the bytes after 
  string values happened to be different. This caused wrong
  results for queries returning DISTINCT varchar fields in
  multibyte charsets (e.g. in utf8).


heap/hp_hash.c:
  Fixed bug #11484.
  This bug in the function hp_rec_key_cmp resulted in wrong
  comparison of varchar multibyte keys if the bytes after 
  string values happened to be different. This caused wrong
  results for queries returning DISTINCT varchar fields in
  multibyte charsets (e.g. in utf8).
mysql-test/t/ctype_utf8.test:
  Added a test case for bug #11484.
2005-07-08 02:12:31 -07: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
47e50b0acb Merge mysql.com:/usr/home/ram/work/mysql-5.0-release
into  mysql.com:/usr/home/ram/work/mysql-5.0
2005-07-08 13:30:56 +05:00
unknown
2d4e858aa3 a fix (bug #11809: ps_1general.test fails on QNX).
mysql-test/r/ps_1general.result:
  a fix (bug #11809: ps_1general.test fails on QNX).
  replace Max_data_length column value with '#' as well
mysql-test/t/ps_1general.test:
  a fix (bug #11809: ps_1general.test fails on QNX).
  replace Max_data_length column value with '#' as well
2005-07-08 12:54:00 +05:00
unknown
39293b7f4b Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-07-07 19:31:28 +02:00
unknown
49fc6635c6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


mysql-test/lib/mtr_cases.pl:
  Auto merged
2005-07-07 18:54:57 +02:00
unknown
cab1a23a73 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean


mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sql_mode.result:
  Auto merged
2005-07-07 21:49:12 +05:00
unknown
077e335eb3 Fix for bug #8449(Silent column changes)
mysql-test/r/show_check.result:
  test result fixed
mysql-test/r/sql_mode.result:
  test result fixed
mysql-test/r/type_decimal.result:
  test result fixed
mysql-test/r/type_float.result:
  test result fixed
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_decimal.test:
  test fixed
mysql-test/t/type_float.test:
  test fixed
mysql-test/t/type_newdecimal.test:
  test case added
sql/share/errmsg.txt:
  error messages added
sql/sql_parse.cc:
  now precision/scale parameters are handled in required way
2005-07-07 21:47:18 +05: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
21f2026606 Merge neptunus.(none):/home/msvensson/mysql/bug11635/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-07-07 18:23:22 +02:00
unknown
b849d80b73 Merge mysql.com:/space/my/mysql-5.0.9-clone
into mysql.com:/space/my/mysql-5.0
2005-07-07 18:22:43 +02:00
unknown
a78764e869 Merge to 5.0
mysql-test/r/ctype_utf8.result:
  Correct wrong merge
mysql-test/r/show_check.result:
  Correct wrong merge
  Fix output from new test for SHOW CREATE TABLE, default '0' is not displayed in 5.0
mysql-test/r/sql_mode.result:
  Correct wrong merge
2005-07-07 18:20:13 +02:00
unknown
c7efc37f4c - Updated the sp-security result set after updating the test
mysql-test/r/sp-security.result:
  - Updated the result set
2005-07-07 17:55:16 +02:00
unknown
6651fd232a - fixed the "sp-security" test case: drop any possible already existing table to
avoid failing if a previous test failure left the t1 table around


mysql-test/t/sp-security.test:
  - drop any possible already existing table to avoid failing if a previous test failure
    left the t1 table around
2005-07-07 17:44:10 +02:00
unknown
d98461719e Fix for bug #11708 (real function returns wrongly rounded decimal)
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
sql/item_func.cc:
  Item_real_func::val_decimal implemented
sql/item_func.h:
  Item_real_func::val_decimal declared
2005-07-07 20:28:47 +05:00
unknown
51b07d2751 Manual merge of BUG#11635 whihc is already in 5.0
mysql-test/t/show_check.test:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Manual merge(without filemerge tool!)
mysql-test/r/show_check.result:
  Manual merge
mysql-test/r/sql_mode.result:
  Manual merge
sql/sql_show.cc:
  Manual merge
2005-07-07 15:48:43 +02:00
unknown
995abb0ed2 Fix for bug #10891 (string->decimal conversion crashes server)
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
strings/decimal.c:
  new_point can be 0, and this case should be handled separately
2005-07-07 18:23:30 +05: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
36421c837b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0


sql/item_strfunc.cc:
  Auto merged
2005-07-07 09:25:16 +03:00
unknown
98a3bae33d Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean


VC++Files/tests/mysql_client_test.dsp:
  Merge with fix to link debug version against debug yassl library
2005-07-06 19:05:36 -07:00
unknown
f56102ae06 Fix typos that crept into ChangeSet for fix for Bug #11045.
sql/ha_federated.cc:
  Fix typo
sql/sql_insert.cc:
  Fix typo
2005-07-06 18:56:10 -07:00
unknown
4d60d42afd Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-07-07 02:34:11 +02:00
unknown
8a23dd8672 Merge jwinstead@production.mysql.com:my/mysql-5.0-11045
into  mysql.com:/home/jimw/my/mysql-5.0-clean


VC++Files/sql/mysqld.dsp:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/item_strfunc.cc:
  SCCS merged
2005-07-06 16:49:04 -07:00
unknown
376a50e638 Merge 2005-07-06 22:29:28 +02:00
unknown
abe951abcb Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-07-06 23:24:51 +03: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
348dfd4163 Look in the directory above the executable for the my.cnf/ini, on Windows, as
the new installer and GUI tools expect. (Bug #10419) Also, dynamically bind to
GetSystemWindowsDirectory() so that it works on all platforms. (Bug #5354)


mysys/default.c:
  Dynamically bind to GetSystemWindowsDirectory() or emulate it, and also look
  in directory above the executable to find my.cnf/ini on Windows.
2005-07-06 19:49:43 +02:00
unknown
ef4290d569 Merge igor-inspiron.creware.com:/home/igor/mysql-5.0
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
2005-07-06 09:14:44 -07:00
unknown
39968552a8 view.result, view.test:
Added a test case for bug #6120.
sql_view.cc:
  Fixed bug #6120.
  The SP cache must be invalidated when a view is altered.


sql/sql_view.cc:
  Fixed bug #6120.
  The SP cache must be invalidated when a view is altered.
mysql-test/t/view.test:
  Added a test case for bug #6120.
mysql-test/r/view.result:
  Added a test case for bug #6120.
2005-07-06 09:00:17 -07:00
unknown
f3a84063a1 Merge
mysql-test/mysql-test-run.pl:
  Auto merged
2005-07-06 16:42:16 +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
f50ca56059 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2005-07-06 16:59:56 +03: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
a20b87536f Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-07-06 14:53:24 +02:00
unknown
86ba3511ab Merge mysql.com:/space/my/mysql-5.0.9-clone
into mysql.com:/space/my/mysql-5.0-build
2005-07-06 14:39:00 +02:00
unknown
89cefd36a9 - manual merge of the make_binary_distribution.sh ChangeSet propagation
scripts/make_binary_distribution.sh:
  - manual merge
2005-07-06 14:30:51 +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
310c470522 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-07-06 13:10:12 +02:00
unknown
6dc280da7c Increase version number to 5.0.10, as 5.0.9 has been cloned off. 2005-07-06 12:54:22 +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
daa3ebb65e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


client/mysqldump.c:
  Auto merged
2005-07-06 11:47:48 +02:00
unknown
a58fec2688 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


client/mysqldump.c:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge
2005-07-06 11:39:48 +02:00