Commit graph

5111 commits

Author SHA1 Message Date
unknown
f4425b50e1 mysqltest.c, mysql-test-run.sh:
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
  Use Purify suppress file


mysql-test/suppress.purify:
  Purify suppress file
mysql-test/mysql-test-run.sh:
  Use Purify suppress file
  Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
client/mysqltest.c:
  Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
2005-05-15 06:59:34 +02:00
unknown
2059908b9c After merge fixes
BitKeeper/deleted/.del-outfile2.result~fb702ee2518d8e6d:
  Delete: mysql-test/r/outfile2.result
libmysql/libmysql.c:
  Fix indentation for new function mysql_set_character_set()
mysql-test/r/alter_table.result:
  Fix test to be in same order as in 4.0
mysql-test/r/innodb.result:
  After merge fix
mysql-test/r/insert_update.result:
  Add extra test for insert into ... on duplicate key upate
mysql-test/r/outfile.result:
  After merge fix
mysql-test/t/alter_table.test:
  Fix test to be in same order as in 4.0
mysql-test/t/insert_update.test:
  Add extra test for insert into ... on duplicate key upate
mysql-test/t/outfile.test:
  After merge fix
sql/item_func.cc:
  After merge fix
sql/sql_table.cc:
  After merge fix
2005-05-14 16:24:36 +03:00
unknown
f8bb892314 Fix for BUG#9622: Make index statistics collection in MyISAM behave the same
way in ALTER TABLE ... ENABLE KEYS, ANALYZE TABLE and after bulk insert:
now statistics collection always assumes NULLs are inequal. 


mysql-test/r/myisam.result:
  Testcase for BUG#9622
mysql-test/t/myisam.test:
  Testcase for BUG#9622
2005-05-14 00:21:53 +02:00
unknown
037b0a7b14 Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/outfile2.result:
  Merge rename: mysql-test/r/outfile.result -> mysql-test/r/outfile2.result
myisam/mi_key.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/handler.h:
  Auto merged
mysql-test/t/alter_table.test:
  Merge
mysql-test/t/outfile.test:
  Merge
sql/item_func.cc:
  Merge
sql/share/czech/errmsg.txt:
  Merge
sql/share/danish/errmsg.txt:
  Merge
sql/share/dutch/errmsg.txt:
  Merge
sql/share/english/errmsg.txt:
  Merge
sql/share/estonian/errmsg.txt:
  Merge
sql/share/french/errmsg.txt:
  Merge
sql/share/german/errmsg.txt:
  Merge
sql/share/greek/errmsg.txt:
  Merge
sql/share/hungarian/errmsg.txt:
  Merge
sql/share/italian/errmsg.txt:
  Merge
sql/share/japanese/errmsg.txt:
  Merge
sql/share/korean/errmsg.txt:
  Merge
sql/share/norwegian-ny/errmsg.txt:
  Merge
sql/share/norwegian/errmsg.txt:
  Merge
sql/share/polish/errmsg.txt:
  Merge
sql/share/portuguese/errmsg.txt:
  Merge
sql/share/romanian/errmsg.txt:
  Merge
sql/share/russian/errmsg.txt:
  Merge
sql/share/slovak/errmsg.txt:
  Merge
sql/share/spanish/errmsg.txt:
  Merge
sql/share/swedish/errmsg.txt:
  Merge
sql/share/ukrainian/errmsg.txt:
  Merge
sql/sql_table.cc:
  Merge
sql/sql_yacc.yy:
  Keep old
sql/unireg.cc:
  Merge
2005-05-14 00:01:40 +03:00
unknown
cdd6bc9bfe Fixed wrong buffer usage for auto-increment key with blob part that caused CHECK TABLE to report that the table was wrong. (Bug #10045)
myisam/mi_key.c:
  Fixed wrong buffer usage for auto-increment key with blob part that caused
  CHECK TABLE to report that the table was wrong. (Bug #10045)
mysql-test/r/auto_increment.result:
  New test case
mysql-test/t/auto_increment.test:
  New test case
2005-05-13 23:08:29 +03:00
unknown
2a695127a6 Fixes during review
mysql-test/r/select.result:
  Better error message
mysql-test/t/select.test:
  Better error message
sql/hostname.cc:
  Join identical code
sql/sql_yacc.yy:
  Combine code (and get a better error message)
strings/ctype-ucs2.c:
  Cast pointer differencess
2005-05-13 14:04:32 +03:00
unknown
7c441dd115 Change create_field->offset to store offset from start of fields, independent of null bits.
Count null_bits separately from field offsets and adjust them in case of primary key parts.
(Previously a CREATE TABLE with a lot of null fields that was part of a primary key caused MySQL to wrongly count the number of bytes needed to store null bits)
This is a more complete bug fix for #6236


mysql-test/r/alter_table.result:
  More test for bug #6236 (CREATE TABLE didn't properly count not null columns for primary keys)
mysql-test/t/alter_table.test:
  More test for bug #6236 (CREATE TABLE didn't properly count not null columns for primary keys)
sql/handler.h:
  Add counter for null fields
sql/sql_table.cc:
  Change create_field->offset to store offset from start of fields, independent of null bits.
  Count null_bits separately from field offsets and adjust them in case of primary key parts.
sql/unireg.cc:
  Change create_field->offset to store offset from start of fields, independent of null bits.
  Count null_bits separately from field offsets and adjust them in case of primary key parts.
2005-05-13 11:11:50 +03:00
unknown
cbbc4ff6a2 If the system is under high load 'show full processlist' might report the
process of the predecessing test case instead of the current test case. 
Shifting the command to the end of the current test case should avoid this problem. 


mysql-test/r/ps_grant.result:
  Updated result
mysql-test/t/ps_grant.test:
  Shift ' show full processlist ' to the end of the test script
2005-05-12 17:49:34 +02:00
unknown
a91cf275c8 bug#10344: some string function fail for UCS2
substr fix
2005-05-10 14:13:58 +05:00
unknown
1fb790d3f0 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug10095


mysql-test/t/range.test:
  Auto merged
2005-05-10 00:43:18 +02:00
unknown
4a1b6c0102 Fix for BUG#10070: Make the test not to produce warnings if InnoDB is not available 2005-05-10 00:40:41 +02:00
unknown
66446b31b7 SUBSTR with negative argument didn't work
with multi-byte strings, length() instead
of numchars() where used in a mistake.
2005-05-09 20:55:06 +05:00
unknown
3a842fdfc0 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733


sql/sql_yacc.yy:
  Auto merged
2005-05-09 14:50:56 +01:00
unknown
19b8643830 Bug#8733 - server accepts malformed query (multiply mentioned distinct)
Detect conflicting options in SELECT


mysql-test/r/select.result:
  Test for bug#8733
mysql-test/t/select.test:
  Test for bug#8733
sql/mysql_priv.h:
  New bit for ALL
sql/sql_yacc.yy:
  We want to complain if DISTINCT or ALL is used in SELECT when a
  conflicting option is already selected.
2005-05-09 14:31:46 +01:00
unknown
adefe15c9f Fix outfile test/results 2005-05-09 08:33:45 +01:00
unknown
cb4b456bc6 - added "--skip-comments" to the "mysqldump" test to avoid printing comments that include
version-dependent information (which causes test failures when running the test with a
  different version string)


mysql-test/r/mysqldump.result:
  - fixed the results (removed the version-dependent comments to avoid a test failure)
mysql-test/t/mysqldump.test:
  - added "--skip-comments" to avoid printing comments that include version-dependent information
    (which causes test failures when running the test with a different version string)
2005-05-09 09:25:47 +02:00
unknown
76cfd9c075 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-05-09 00:51:05 +02:00
unknown
6706b9fac9 - fix the range test to pass when InnoDB is note enabled (e.g. in the "-classic" build) 2005-05-09 00:47:47 +02:00
unknown
4d1c68f8d1 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0


BitKeeper/etc/logging_ok:
  auto-union
2005-05-08 23:24:33 +01:00
unknown
cdfc786f69 Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug8191
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0


BitKeeper/etc/logging_ok:
  auto-union
2005-05-08 23:07:46 +01:00
unknown
3ac2df4e4c Bug#8191 - SELECT INTO OUTFILE insists on FROM clause
Fix bug + include test case.
  Enable outfile tests.


mysql-test/t/outfile.test:
  Reenable outfile tests
  Add test for Bug#8191
sql/sql_yacc.yy:
  Fix Bug#8191
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-08 22:56:58 +01:00
unknown
d808b76db5 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2005-05-08 14:24:43 -07:00
unknown
3e1dad4115 Bug#6236
Incomplete ALTER TABLE breaks MERGE compatibility
  Fix implicit NOT NULL not set on ALTER of PK columns


mysql-test/r/alter_table.result:
  Test for Bug#6236
mysql-test/t/alter_table.test:
  Test for Bug#6236
sql/sql_table.cc:
  Implicit NOT NULL not set on ALTER of PK columns
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-08 21:03:50 +01:00
unknown
04f9561a91 Fix crash in mysqldump -c triggered by tables with a large number of long
field names. (Bug #10286)


client/mysqldump.c:
  Use a DYNAMIC_STRING for the 'INSERT ...' pattern so we can handle
  an arbitrary number of fields. Also rename the internal cFlag to 
  opt_complete_insert so it is clear what it does.
mysql-test/t/mysqldump.test:
  Add regression test for 10286
mysql-test/r/mysqldump.result:
  Update results
2005-05-08 12:02:46 -07:00
unknown
a508af3ca1 Patch for --insert-ignore
client/client_priv.h:
  Additional option for insert-ignore
client/mysqldump.c:
  Additional insert-ignore, change of delayed variable to insert_option
mysql-test/r/mysqldump.result:
  Test results for --ignore-insert option.
mysql-test/t/mysqldump.test:
  New additions to the test.
2005-05-07 09:49:39 -07:00
unknown
f5f132fdde Test fix. DROP TABLE added. 2005-05-07 21:37:27 +05:00
unknown
0de8a53ff2 Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug9666
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/create.result:
  Auto merged
2005-05-07 14:46:54 +01:00
unknown
786ba12f31 Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug9725
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-05-07 14:43:03 +01:00
unknown
76f63c975d Bug#9666 - Can't use 'DEFAULT FALSE' for column of type bool
Fix bug by moving TRUE/FALSE in with other literals.


mysql-test/r/create.result:
  Test for Bug#9666
mysql-test/t/create.test:
  Test for Bug#9666
sql/sql_yacc.yy:
  Move TRUE/FALSE in with other literals.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-07 13:51:29 +01:00
unknown
bb42494438 Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update"
INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
  Fix so that protocol doesn't break by properly ignoring dups.


mysql-test/r/insert_update.result:
  Test for Bug#9725
mysql-test/t/insert_update.test:
  Test for Bug#9725
sql/sql_insert.cc:
  Ignore the failure in update_row when IGNORE is set.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-07 13:31:37 +01:00
unknown
1392f4820a BUG#7709 fix - Boolean fulltext query against unsupported engines does not
fail.


mysql-test/r/innodb.result:
  Test case for BUG#7709 - Boolean fulltext query against
  unsupported engines does not fail added.
mysql-test/t/innodb.test:
  Test case for BUG#7709 - Boolean fulltext query against
  unsupported engines does not fail added.
sql/item_func.cc:
  Check if table supports fulltext.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-07 15:48:56 +05:00
unknown
e28ddc8d7b Merge mysql.com:/home/jimw/my/mysql-4.1-8497
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/ha_heap.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-05-07 01:00:24 -07:00
unknown
a56921bbe0 fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and InnoDB 2005-05-06 20:11:01 +05:00
unknown
cdbf493997 Bug#6505 Wrong sorting order:
latin2_croatian_ci collation was fixed.
2005-05-06 18:41:41 +05:00
unknown
a0aa453934 bug#6504 Upper/Lower conversion bug:
upper/lower conversion for LATIN LETTER D WITH STROKE
was wrong in latin2.
2005-05-06 15:22:55 +05:00
unknown
25896a822f Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql


BitKeeper/etc/logging_ok:
  auto-union
2005-05-05 10:46:14 -07:00
unknown
b1d7d8211b Added cp932 character set
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-05 10:36:17 -07:00
unknown
c758512a91 A fix and test case for Bug#9777 " Empty set returned by Prepared Statement when it
should return a non empty one"
(see comments for the changed files for details).


mysql-test/r/ps.result:
  A test case for Bug#9777: tests results fixed.
mysql-test/t/ps.test:
  A test case for Bug#9777
sql/item.cc:
  A fix for Bug#9777: when creating a constant item from within 
  Item_int_with_ref::new_item, create the item by value, not by name.
  This should work with prepared statements placeholders.
  Item_int_with_ref is a special optimization case used
   when we compare datetime constants with datetime value.
  Converting the item to integer early is OK as it is in line
  with the purpose of Item_int_with_ref - to speed up comparison by 
  using integers.
  Minor cleanups.
sql/item.h:
  Declaration for Item_int_with_ref::new_item
2005-05-05 12:55:09 +04:00
unknown
8736d8ac06 logging_ok:
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
  BUG#10287


mysql-test/r/ndb_restore.result:
  BUG#10287
mysql-test/t/ndb_restore.test:
  BUG#10287
ndb/test/src/NDBT_ResultRow.cpp:
  BUG#10287
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-04 10:16:03 +02:00
unknown
b883aebae0 Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-4.1-9096-fresh


sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
2005-05-03 12:49:22 +04:00
unknown
9fcda7fcc5 A fix and test case for Bug#9096 "select doesn't return all matched
records if prepared statements is used".
This fix changes equality evaluation method of basic constants from
by-name to by-value, thus effectively enabling use of parameter markers
in some optimizations (constants propagation, evaluation of possible
keys for query).


mysql-test/r/ps.result:
  Test results for the test case for Bug#9096
mysql-test/t/ps.test:
  A short test case for Bug#9096 "select doesn't return all matched records if
   prepared statements is used". The is enough to reproduce the
  glitch in update_ref_and_keys causing the bug to occur.
sql/item.cc:
  Implement by-value equality evaluation of basic constants.
  This is needed to work with Item_param values. Until now
  Item_param was compared with other items by its name, which is always "?".
  The bug at hand showed up when an integer
  constant was created from one parameter marker (with value 200887 and
   name "?") and then compared by-name with another parameter marker
  (with value 860 and name "?"). True returned by this comparison resulted
  in a wrong table access method used to evaluate the query.
  Implement Item_param methods needed to emulate "basic constant" mode at 
  full.
sql/item.h:
  Change declaration of basic_const_item(): now it also widens its 
  argument from const Item * to Item * if the argument is a basic constant.
  Declare eq() for all basic constatns, as long as now they 
  are compared by value, not by name. Each constant needs its own
  comparison method.
  Declarations of Item_param methods needed to fully emulate 
  a basic constant when parameter value is set.
sql/item_func.cc:
  Fix wrong casts.
2005-05-03 12:47:27 +04:00
unknown
5df9135be7 Merge mysql.com:/home/jimw/my/mysql-4.1-9761
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-02 08:12:03 -07:00
unknown
465ba81afa Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
2005-05-02 08:05:58 -07:00
unknown
3b6043870d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
2005-04-30 03:45:12 +03:00
unknown
1c62941741 Merge mysql.com:/home/jimw/my/mysql-4.1-9634
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-29 08:47:03 -07:00
unknown
65d0de3b7b Manually resolve merge
mysql-test/r/query_cache.result:
  Resolve merge
mysql-test/t/query_cache.test:
  Resolve merge
2005-04-29 08:46:03 -07:00
unknown
97b0821462 CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036)
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467)
Fix compiler problems with MinGW (Bug #8872)


configure.in:
  Fix compiler problems with MinGW (Bug #8872)
include/config-win.h:
  Fix compiler problems with MinGW (Bug #8872)
include/my_global.h:
  Fix compiler problems with MinGW (Bug #8872)
mysql-test/r/cast.result:
  Test for cast to signed/unsigned outside of range (Bug #7036)
mysql-test/t/cast.test:
  Test for cast to signed/unsigned outside of range (Bug #7036)
mysys/default.c:
  Cleanup (combine identical code). 
  Done mainly by Jani
sql/field.h:
  Added cast_to_int_type() to ensure that enums are casted as numbers
sql/hostname.cc:
  Don't block not resolved IP's if DNS server is down (Bug #8467)
sql/item.h:
  Added cast_to_int_type() to ensure that enums are casted as numbers
sql/item_func.cc:
  CAST(string_argument AS UNSIGNED) didn't work for big integers above the
  signed range. (Bug #7036)
  Produce warnings of wrong cast of strings to signed/unsigned
sql/item_func.h:
  CAST(string_argument AS UNSIGNED) didn't work for big integers above the
  signed range. (Bug #7036)
2005-04-29 17:03:34 +03:00
unknown
d937adf967 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-29 11:56:38 +02:00
unknown
ef3e9e1cff Fix 'CREATE TABLE ... LIKE ...' when lower_case_table_names
is set on case-sensitive file systems and the source table
was specified in something other than lowercase. (Bug #9761)


mysql-test/r/lowercase_table.result:
  Add results
mysql-test/t/lowercase_table.test:
  Regression test for Bug #9761
sql/sql_table.cc:
  When lower_case_table_names is set, make sure to look for
  the source table using a lowercase filename.
2005-04-28 15:30:42 -07:00
unknown
e26a93e999 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-28 19:58:52 +04:00