Commit graph

3059 commits

Author SHA1 Message Date
unknown
580f12cc04 fixed error handling if creating derived table failed
single row subquery always can return NULL (no rows found) (BUG#5590)


mysql-test/r/subselect.result:
  maybe_null flag returning by subquwery for temporary table creation
mysql-test/t/subselect.test:
  maybe_null flag returning by subquwery for temporary table creation
sql/item.cc:
  storing maybe_null in type holder
sql/item_subselect.cc:
  single row subquery always can return NULL (no rows found)
sql/sql_derived.cc:
  fixed error handling if creating derived table failed
2004-09-17 19:08:46 +03:00
unknown
f177c76fb2 Do not try use fields examples is expression and fiend used or SET/ENUM field used in types merging procedure (BUG#5618)
mysql-test/r/union.result:
  merging ENUM and SET fields in one UNION
mysql-test/t/union.test:
  merging ENUM and SET fields in one UNION
2004-09-17 13:23:57 +03:00
unknown
38628bca1b A quick fix for bug#5556: replace a column of SHOW TABLE STATUS result
with a fixed constant to pass on QNX:
max_data_file_length is calculated depending on max possible value of
record pointer. It's different on QNX, so the difference in results is OK.


mysql-test/t/ps.test:
  A quick fix for bug#5556: replace a column of SHOW TABLE STATUS result
  with a fixed constant to pass on QNX:
  max_data_file_length is calculated depending on max value of record
  pointer. It's different on QNX, so the result difference is intentional.
2004-09-16 22:13:24 +04:00
unknown
e754501a12 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-update-4.1


sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2004-09-16 17:47:53 +03:00
unknown
3b4c38336d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sum-4.1


sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2004-09-16 16:24:46 +03:00
unknown
1832ea3794 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-09-16 15:05:17 +05:00
unknown
16a46cc75b Clean-up. The length of compress() may depend on zlib version, etc.
mysql-test/r/func_compress.result:
  clean-up. The length of compress() may depend on zlib version, etc.
mysql-test/t/func_compress.test:
  clean-up. The length of compress() may depend on zlib version, etc.
2004-09-16 15:01:12 +05:00
unknown
dd343eb8d0 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
2004-09-15 19:01:00 +02:00
unknown
f955763fb3 Fixed handling of NO_AUTO_VALUE_ON_ZERO 2004-09-15 18:44:18 +02:00
unknown
b87892265c A fix (bug #5540: CONCAT function and 'double' type). 2004-09-15 15:13:17 +05:00
unknown
067241d501 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug5318
2004-09-14 18:17:03 +02:00
unknown
0deb4c4192 Added testcase for select count() during transaction with failures
added fix for keeping "records" up to date when execute() fails


mysql-test/r/ndb_insert.result:
  Added testcase for select count() during transaction with failures
mysql-test/t/ndb_insert.test:
  Added testcase for select count() during transaction with failures
sql/ha_ndbcluster.cc:
  added fix for keeping "records" up to date when execute() fails
sql/ha_ndbcluster.h:
  added fix for keeping "records" up to date when execute() fails
2004-09-14 15:51:57 +00:00
unknown
dbd8e7611f Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug5318
2004-09-14 13:50:30 +02:00
unknown
b4e557fdd6 BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
Added a check to recover from IGNORE_SPACE in this situation: 
<ident-character(s)><space><dot><ident-character(s)>
The ignored space led to the false identification of the dot
as an ident separator (like "db.table").


mysql-test/r/sql_mode.result:
  BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
  Added the test results.
mysql-test/t/sql_mode.test:
  BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
  Added new tests for the bug.
sql/sql_lex.cc:
  BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
  Added code to recover from skipped spaces in mode IGNORE_SPACES,
  when testing for an ident separator (which happens to be a dot).
2004-09-14 13:49:08 +02:00
unknown
61e6211646 A fix (bug #5497: COMPRESS() returns NULL for large strings). 2004-09-13 18:43:59 +05:00
unknown
a07c535d51 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5428


strings/ctype-simple.c:
  Auto merged
2004-09-13 12:39:04 +05:00
unknown
a791904678 Persian collation, contibuted by Jody McIntyre 2004-09-13 12:07:01 +05:00
unknown
4e639af733 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1


sql/item_func.cc:
  Auto merged
2004-09-12 10:41:06 +04:00
unknown
9ecf15ed74 Fix for bug #5513: FIND_IN_SET fails if set ends with a comma 2004-09-11 15:48:23 +04:00
unknown
3ffc483275 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug4788
2004-09-11 12:31:28 +02:00
unknown
9d80a396db Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-09-10 21:40:18 +03:00
unknown
cd573513a3 removed shaky test case 2004-09-10 17:40:02 +00:00
unknown
7c80446c4e BUG#4788 - show create table provides incorrect statement.
Added code to adjust the field_length of user variables 
in dependence on the field type.
Aded new constants for numeric field widths.


include/mysql_com.h:
  BUG#4788 - show create table provides incorrect statement.
  Introduced definitions for default field width of numeric types.
  So common values can be used at different places in the code.
mysql-test/r/variables.result:
  BUG#4788 - show create table provides incorrect statement.
  New test results.
mysql-test/t/variables.test:
  BUG#4788 - show create table provides incorrect statement.
  Added a test for the bug.
sql/item_func.cc:
  BUG#4788 - show create table provides incorrect statement.
  Added code to adjust the field_length of user variables 
  in dependence on the field type.
sql/sql_parse.cc:
  BUG#4788 - show create table provides incorrect statement.
  Changed numeric literals to the new constants.
2004-09-10 18:56:47 +02:00
unknown
32dc386d5e information about different variables agged to query cache (BUG#5515, BUG#5394)
mysql-test/r/query_cache.result:
  test of QC with different variables
mysql-test/t/query_cache.test:
  test of QC with different variables
sql/mysql_priv.h:
  new information for query key calculation
sql/sql_cache.cc:
  new information for query key calculation
sql/sql_cache.h:
  removed unused definitions
2004-09-10 16:28:18 +03:00
unknown
96a45ab066 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-09 16:34:25 +00:00
unknown
8d1e535e4a Bug #5430 ctype_tis620 test failure
BitKeeper/deleted/.del-ctype_tis620-master.opt~38b79f80b9348a14:
  Delete: mysql-test/t/ctype_tis620-master.opt
2004-09-09 18:44:53 +05:00
unknown
9106686846 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
2004-09-09 10:41:33 +02:00
unknown
a2e570ab39 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-09-08 21:58:22 +03:00
unknown
b9826e1063 test case of bug#5220 2004-09-08 21:54:01 +03:00
unknown
aba34540f4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug-grp
2004-09-08 22:44:16 +04:00
unknown
4233d901f4 Fix for bug#5400 "GROUP_CONCAT returns everything twice":
Don't evaluate the value of GROUP_CONCAT several times for the same 'group', reuse the value instead.


mysql-test/r/group_by.result:
   Testcase for bug#5400
mysql-test/t/group_by.test:
   Testcase for bug#5400
2004-09-08 22:43:37 +04:00
unknown
6c2330407f check that table used in multi-update is unique added (BUG#5455)
mysql-test/r/multi_update.result:
  multi* unique updating table check
mysql-test/t/multi_update.test:
  multi* unique updating table check
sql/sql_lex.cc:
  new method to check table only in subqueries
sql/sql_lex.h:
  new method to check table only in subqueries
sql/sql_parse.cc:
  used new method to check table only in subqueries
sql/sql_update.cc:
  check that table is unique added
2004-09-08 13:39:15 +03:00
unknown
eb72c28b9b Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-09-07 19:49:16 -07:00
unknown
3be674036f func_group.test, func_group.result:
Added test case for bug #5406.
opt_sum.cc:
  Fixed bug #5406.


sql/opt_sum.cc:
  Fixed bug #5406.
mysql-test/r/func_group.result:
  Added test case for bug #5406.
mysql-test/t/func_group.test:
  Added test case for bug #5406.
2004-09-07 19:46:09 -07:00
unknown
3f70b62ceb after merge 2004-09-07 22:10:15 +02:00
unknown
2f96e073d2 merged
mysql-test/r/rpl_set_charset.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/rpl_set_charset.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/slave.cc:
  Auto merged
2004-09-07 21:30:28 +02:00
unknown
419ca7152f Merge rurik.mysql.com:/home/igor/mysql-4.0
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2004-09-07 10:08:17 -07:00
unknown
95036003c6 select.test:
Added newline at the end of file.


mysql-test/t/select.test:
  Added newline at the end of file.
2004-09-07 10:03:46 -07:00
unknown
49d90b09f5 after merge fixes 2004-09-07 16:56:31 +02:00
unknown
77a8615488 merged
BitKeeper/etc/ignore:
  auto-union
client/mysqlcheck.c:
  Auto merged
myisammrg/myrg_open.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
2004-09-07 15:18:53 +02:00
unknown
7540feca8e fixed NdbConnection::restart and made use of it in ha_ndbcluster
added testcase
2004-09-07 12:30:11 +00:00
unknown
3a476a6e91 clean up at end of test (thanks serg)
mysql-test/r/rpl_set_charset.result:
  result update
mysql-test/t/rpl_set_charset.test:
  clean up on slave too.
2004-09-07 14:20:48 +02:00
unknown
e205392de7 cleanup 2004-09-07 13:36:27 +02:00
unknown
d3650df62e fixed and added test case for bug#5431
+ fix for support of multiple mgmt servers


mysql-test/r/ndb_alter_table.result:
  added test case for bug #5431
mysql-test/t/ndb_alter_table.test:
  added test case for bug #5431
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  fix to make multiple mgmt srvrs work
sql/ha_ndbcluster.cc:
  fixed and added test case for bug#5431
2004-09-07 10:54:31 +00:00
unknown
5f8f320c0a Merge msvensson@build.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql/mysql-4.1
2004-09-07 12:46:16 +02:00
unknown
235c5035b5 Fix for INSERT with multiple values and start/end_bulk_insert
mysql-test/r/ndb_insert.result:
  Add tests for duplicate keys in combination with start/end_bulk_insert
mysql-test/t/ndb_insert.test:
  Add tests for duplicate keys in combination with start/end_bulk_insert
sql/ha_ndbcluster.cc:
  Set my_errno if error occurs in end_bulk_insert
2004-09-07 12:45:19 +02:00
unknown
95f42e1da2 Bug #5228 ORDER BY CAST(enumcol) sorts incorrectly under certain conditions 2004-09-07 15:42:19 +05:00
unknown
00080aa7c3 A new test for the fix for BUG#4500 ("SET CHARACTER SET replicates incorrectly").
As I cannot be 100% sure that there won't be issues with some of our exotic platforms
(who knows if the charset of <obscure old OS> will play fair?), I'll send an email to the build guys.
Well, this holds if bk does not crash on binary chars of this cset.
2004-09-07 11:15:23 +02:00
unknown
5e3fa948e2 A fix (Bug #5428 small max_sort_length crash server). 2004-09-07 13:33:35 +05:00
unknown
982a78829a bug#5389 merge.test fails on qnx - uninitalized variable in myrg_open()
myisammrg/myrg_open.c:
  backport from 4.1
mysql-test/r/union.result:
  after merge fix
mysql-test/t/union.test:
  after merge fix
sql/log.cc:
  backward compatibility: inhibit severity labels in error log
2004-09-06 22:20:40 +02:00