1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Commit Graph

11375 Commits

Author SHA1 Message Date
unknown
b28b0bf466 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into igor-inspiron.creware.com:/home/igor/mysql-4.1


sql/sql_select.cc:
  Auto merged
2005-07-08 06:37:09 -07:00
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
c31a78c863 portability fix: the Max_data_length replaced with # 2005-07-08 16:25:07 +05: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
7672befa72 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/home/pem/work/mysql-5.0
2005-07-08 11:32:13 +02: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
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
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
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
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
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
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
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
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
afdc702665 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/home/pem/work/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-07-07 09:13:49 +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
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
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
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
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
de40b79a63 Updated sp.result
mysql-test/r/sp.result:
  Updated test result.
2005-07-06 16:56:38 +02:00
unknown
f3a84063a1 Merge
mysql-test/mysql-test-run.pl:
  Auto merged
2005-07-06 16:42:16 +02:00
unknown
23cc601089 Fixed BUG#7088: Stored procedures: labels won't work if character set is utf8.
We used 'IDENT' for labels as a temporary fix for the  parser conflicts
  introduced if the proper rule 'ident' was used. Now a specially tailored
  'label_ident' rule is used for labels instead.


mysql-test/r/sp.result:
  New test cases for BUG#7088.
mysql-test/t/sp.test:
  New test cases for BUG#7088.
sql/sql_yacc.yy:
  Make labels in stored procedures work with other character sets than latin1.
  Using a separate 'label_ident' rule (instead of 'ident') and splitting
  the 'keyword' rule into two got rid of the temporary fix of using 'IDENT' for
  labels (which didn't heed character sets).
2005-07-06 16:37:57 +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
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
55420e9892 ctype_innodb_like.inc:
New BitKeeper file ``mysql-test/include/ctype_innodb_like.inc''
Many files:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
ctype_innodb_like.inc:
  new file


mysql-test/r/ctype_big5.result:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
mysql-test/r/ctype_cp932.result:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
mysql-test/r/ctype_sjis.result:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
mysql-test/r/ctype_ujis.result:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
mysql-test/t/ctype_big5.test:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
mysql-test/t/ctype_cp932.test:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
mysql-test/t/ctype_sjis.test:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
mysql-test/t/ctype_ujis.test:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
strings/ctype-big5.c:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
strings/ctype-cp932.c:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
strings/ctype-gbk.c:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
strings/ctype-simple.c:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
strings/ctype-sjis.c:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
mysql-test/include/ctype_innodb_like.inc:
  New BitKeeper file ``mysql-test/include/ctype_innodb_like.inc''
2005-07-06 17:16:22 +05:00
unknown
8165560074 Merge
mysql-test/r/func_str.result:
  SCCS merged
mysql-test/t/func_str.test:
  SCCS merged
2005-07-06 11:36:27 +03:00
unknown
87b7e20ebd init_db.sql:
add new table privileges
Makefile.am:
  Include path to regex dir was accidently removed


sql/Makefile.am:
  Include path to regex dir was accidently removed
mysql-test/lib/init_db.sql:
  add new table privileges
2005-07-06 10:16:36 +02:00
unknown
cf297f60fe Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-07-06 10:03:07 +02:00
unknown
4727620b0d After merge fix.
mysql-test/t/sp-error.test:
  Fixed error-codes after merging changes from the main tree.
2005-07-06 11:34:53 +04:00
unknown
99cee82126 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg11394


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
mysql-test/r/sp-error.result:
  Manual merge.
mysql-test/t/sp-error.test:
  Manual merge.
sql/share/errmsg.txt:
  Manual merge.
2005-07-06 10:21:27 +04:00
unknown
de40177365 Update test results
mysql-test/r/mysqldump.result:
  Update results
2005-07-05 18:23:55 -07:00