Commit graph

19596 commits

Author SHA1 Message Date
unknown
a17b3dcbe3 Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.
resolve_const_item() assumed to be not called for Item_row items. For
ensuring that DBUG_ASSERT(0) was set there.

This patch adds section for Item_row items. If it can it recursively calls
resolve_const_item() for each item the Item_row contains. If any of the
contained items is null then whole Item_row substitued by Item_null. Otherwise
it just returns.


sql/item.cc:
  Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.
  
  Added section to resolve_const_item() for Item_row items. If it can it
  recursively calls resolve_const_item() for each item the Item_row contains. If
  any of the contained items is null then Item_row is substituted by Item_null.
  Otherwise it just returns.
  Comment moved closer to function it belongs to.
mysql-test/t/select.test:
  Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.
mysql-test/r/select.result:
  Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.
2005-09-28 00:58:12 +04:00
unknown
ab7ec7ee8f Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
into  mysql.com:/users/lthalmann/bk/mysql-4.1-max
2005-09-26 16:58:38 +02:00
unknown
e7c905c4fd Fixed gcc error on AMD64: cast from 'char*' to 'unsigned int' loses precision 2005-09-26 16:49:18 +02:00
unknown
2f7d4bd525 Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-09-26 13:13:46 +02:00
unknown
31b01d13ef added make target for printSchemaFile 2005-09-26 10:26:38 +02:00
unknown
502b3cc00d Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-09-26 09:56:18 +02:00
unknown
466b46a66a Fixed error found during review of new pushed code
client/mysql.cc:
  Don't use c_ptr() for cgets() and ensure buffer is not overwritten
mysql-test/r/cast.result:
  More test for CAST(0x.... as signed)
sql/opt_sum.cc:
  Fix bugs found during review
  - Changed code to be able to remove one if
  - Ensure that count == 0 only if is_exact_count == TRUE
sql/sql_delete.cc:
  Ensure 'allow_sum_func' is reset before call to setup_conds
sql/sql_lex.cc:
  allow_sum_func doesn't have to be reset for each query
  (It's to be reset in setup_fields() or before call to setup_conds()
sql/sql_load.cc:
  Move set of auto_increment_field_not_null so that it's not set if field value is NULL
sql/sql_prepare.cc:
  allow_sum_func doesn't have to be reset for each query
  (It's to be reset in setup_fields() or before call to setup_conds()
sql/sql_update.cc:
  Ensure 'allow_sum_func' is reset before call to setup_conds
2005-09-25 21:22:23 +03:00
unknown
b337566bab Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-09-24 02:43:28 +02:00
unknown
3614cff71c Makefile.am:
Revert to shell test script for test targets
mysqltest.c:
  Windows pclose() returns error code in low byte
mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++


scripts/mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++
client/mysqltest.c:
  Windows pclose() returns error code in low byte
Makefile.am:
  Revert to shell test script for test targets
2005-09-24 02:42:38 +02:00
unknown
a51f78320e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2005-09-24 02:32:34 +03:00
unknown
5559c48e18 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug13419
2005-09-24 01:55:09 +04:00
unknown
2a4f5aacd7 BUG#12232: Addressing docs team feedback: s/inequal/unequal/ 2005-09-24 01:39:50 +04:00
unknown
1c064d285c mysqld.cc:
Fix out-of-order status variable.


sql/mysqld.cc:
  Fix out-of-order status variable.
2005-09-23 14:14:34 -05:00
unknown
9c0d809270 Bug#9112 - Merge table with composite index producing invalid results with some queries
After merge fix
2005-09-23 17:22:36 +02:00
unknown
32de973588 Fix for BUG#13419: In "ref" optimizer, take into account that item=Item_func_in(x,y) is
not equivalent to "x=y" when item->negated == TRUE.


mysql-test/r/func_in.result:
  Testcase for BUG#13419
mysql-test/t/func_in.test:
  Testcase for BUG#13419
sql/sql_select.cc:
  Fix for BUG#13419:
  * Take into account that item=Item_func_in(x,y) is not equivalent to "x=y" when 
    item->negated == TRUE.
  * Removed comment that is no longer true.
2005-09-23 13:43:20 +04:00
unknown
c08721e5fa Merge mysql.com:/home/mydev/mysql-4.0-4000
into  mysql.com:/home/mydev/mysql-4.1-4100


myisam/mi_dbug.c:
  Auto merged
myisam/mi_rkey.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisammrg/myrg_rkey.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Manual merge
mysql-test/r/merge.result:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Manual merge
mysql-test/t/merge.test:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Manual merge
2005-09-23 10:49:08 +02:00
unknown
674c8165ea Bug#9112 - Merge table with composite index producing invalid results with some queries
The problem was an ab-use of last_rkey_length.
Formerly we saved the packed key length (of the search key)
in this element. But in certain cases it got replaced by 
the (packed) result key length.
Now we use a new element of MI_INFO to save the packed key 
length of the search key.


myisam/mi_dbug.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Fixed the recognition of NULL values in _mi_print_key().
myisam/mi_rkey.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Saved the packed key length in a new element of MI_INFO.
myisam/mi_search.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Added a comment and trace prints.
myisam/myisamdef.h:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Added a new element to store the packed key length
  for use by the MyISAMMRG engine.
myisammrg/myrg_rkey.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Changed to use the new element of MI_INFO to get at the
  packed key length.
mysql-test/r/merge.result:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  The test result.
mysql-test/t/merge.test:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  The test case.
2005-09-23 10:15:11 +02:00
unknown
727f0b8a1f Bug #13384 mysqltest, no protocol when script contains only lines with eval
client/mysqltest.c:
  Set query_executed also for eval, that results in a query being executed and output is likely.
2005-09-22 21:24:57 +02:00
unknown
443b394fc3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b11553
2005-09-22 13:05:48 +05:00
unknown
fe61a61355 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Merge/4.1
2005-09-22 12:46:50 +05:00
unknown
91ed9588bf Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
set auto_increment_field_not_null to true to preserve zero values
  for autoincrement fields during LOAD DATA execution if 
  NO_AUTO_VALUE_ON_ZERO sql mode is set


mysql-test/r/loaddata.result:
  Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
    test case
mysql-test/t/loaddata.test:
  Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
    test case
2005-09-22 12:46:01 +05:00
unknown
2543c551cb Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-22 09:13:14 +02:00
unknown
8e78ba93ec Add testcase for bug#13316
ndb big alter table


mysql-test/r/ndb_alter_table.result:
  Add testcase for bug#13316
mysql-test/t/ndb_alter_table.test:
  Add testcase for bug#13316
2005-09-22 09:09:27 +02:00
unknown
855c1646e1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b11553


sql/sql_yacc.yy:
  Auto merged
2005-09-22 11:46:54 +05:00
unknown
6367a2c631 a fix (#11553: gives error if aggregate user-defined function in HAVING clause).
sql/sql_yacc.yy:
  a fix (#11553: gives error if aggregate user-defined function in HAVING clause).
  udf_sum_expr_list rule introduced and used for aggregate udf functions:            
    - call inc_in_sum_expr() before udf_expr_list parsing                            
      (as in_sum_expr rule does).
2005-09-22 11:45:16 +05:00
unknown
86713962d9 bug#13316
ndb alter table with big dicttabinfo
  send alter_tab_req fragmented as signal can get larger than MAX_MESSAGE_SIZE


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  DictTabInfo used during alter table can easily becom larger than MAX_MESSAGE_SIZE
    send fragmented instead
2005-09-22 08:35:27 +02:00
unknown
d440d5ea7c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-22 07:19:09 +02:00
unknown
ac2ffe02b5 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-22 07:17:41 +02:00
unknown
449fb0b184 ndb - fix gcc4 compile problem
ndb/src/ndbapi/Ndbinit.cpp:
  fix gcc4 compile problem
2005-09-22 07:11:53 +02:00
unknown
1ca355dbd2 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-21 17:05:35 -07:00
unknown
14926bf926 Merge mysql.com:/home/jimw/my/mysql-4.1-zlib
into  mysql.com:/home/jimw/my/mysql-4.1-clean


zlib/ChangeLog:
  Auto merged
zlib/FAQ:
  Auto merged
zlib/README:
  Auto merged
zlib/crc32.c:
  Auto merged
zlib/deflate.c:
  Auto merged
zlib/deflate.h:
  Auto merged
zlib/gzio.c:
  Auto merged
zlib/infback.c:
  Auto merged
zlib/inffast.c:
  Auto merged
zlib/inflate.c:
  Auto merged
zlib/inftrees.c:
  Auto merged
zlib/inftrees.h:
  Auto merged
zlib/trees.c:
  Auto merged
zlib/zconf.h:
  Auto merged
zlib/zlib.3:
  Auto merged
zlib/zlib.h:
  Auto merged
zlib/zutil.h:
  Auto merged
2005-09-21 15:17:48 -07:00
unknown
14deb9632b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13180-bug-4.1-mysql
2005-09-22 01:48:39 +04:00
unknown
1b02a815dd Fix bug #13180 thd->allow_sum_funcs wasn't reset before query processing.
thd->allow_sum_func was left 'true' after previous statement thus allowing
sum funcs to be present in conditions.

thd->allow_sum_func should be set to 0 for each query and each prepared
statement reinitialization. This is done in lex_start() and 
reset_stmt_for_execute().


sql/sql_lex.cc:
  Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing.
  thd->allow_sum_func is set to 0 in lex_start().
sql/sql_prepare.cc:
  Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing.
  thd->allow_sum_func is set to 0 in  reset_stmt_for_execute().
mysql-test/t/update.test:
  Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query
  processing.
mysql-test/r/update.result:
  Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query
  processing.
2005-09-22 01:38:39 +04:00
unknown
a808e97d8a Fix compiler error: C++ code in C 2005-09-21 19:58:40 +04:00
unknown
09225cef3a Merge mysql.com:/home/timka/mysql/src/4.1-virgin
into  mysql.com:/home/timka/mysql/src/4.1-dbg
2005-09-21 18:58:39 +03:00
unknown
02fe27b3e3 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-21 17:58:38 +02:00
unknown
3c8a296f28 bug#12950
ndb backup with charsets and simultanious updates
    make sure that backup _dont_ read xfrm data


ndb/src/kernel/blocks/backup/Backup.cpp:
  Backup can do dirty read
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Fix so that backup dont read xfrm data
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Fix so that backup dont read xfrm data
2005-09-21 17:24:39 +02:00
unknown
381fe39e78 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2005-09-21 17:28:51 +03:00
unknown
1d16fa5d86 Ensure that hex strings are used as integers in cast(... signed/unsigned)
This fixes the new report for bug #7036


mysql-test/t/cast.test:
  Added test for cast(hex-value to signed/unsigned)
sql/item.h:
  Ensure that hex strings are used as integers in cast(... signed/unsigned)
2005-09-21 17:28:25 +03:00
unknown
1c2cb84285 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push


sql/mysqld.cc:
  Auto merged
2005-09-21 14:39:28 +02:00
unknown
98bbb1ae89 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b7589
2005-09-21 14:33:39 +05:00
unknown
24922a3092 a fix (bug #7589: Decimal types are ignored when updating data from another column).
mysql-test/r/union.result:
  a fix (bug #7589: Decimal types are ignored when updating data from another column).
  removed wrong test result (see #13372)
mysql-test/t/union.test:
  a fix (bug #7589: Decimal types are ignored when updating data from another column).
  removed wrong test result (see #13372)
sql/field_conv.cc:
  a fix (bug #7589: Decimal types are ignored when updating data from another column).
  use memcpy() only for identical decimals.
2005-09-21 14:32:19 +05:00
unknown
30681cf509 Don't add all args to mysqltest to MYSQL_TEST env var
mysql-test/mysql-test-run.pl:
  Not all args to mysqltest should be added to the MYSQL_TEST environment variable. The MYSQL_TEST var is used when testing mysqltest and --record and result_file should not be set.
2005-09-21 10:24:46 +02:00
unknown
a4243d3c6b Merge mysql.com:/home/timka/mysql/src/4.1-virgin
into  mysql.com:/home/timka/mysql/src/4.1-dbg


sql/opt_sum.cc:
  Auto merged
2005-09-21 09:53:42 +03:00
unknown
8e7217e43b Fix for BUG#12882 - min/max inconsistent on empty table.
The problem was in that the MIN/MAX optimization in opt_sum_query was
replacing MIN/MAX functions with their constant argument without
taking into account that a query has no result rows.


mysql-test/r/func_group.result:
  Test for BUG#12882.
mysql-test/t/func_group.test:
  Test for BUG#12882.
sql/item_sum.cc:
  If it is known that a query has no result rows, do not call add()
  via the call to Item_sum::no_rows_in_result() which calls reset().
  Instead directly call clear() so that the MIN and MAX functions
  produce NULL when there are no result rows.
sql/opt_sum.cc:
  * Do not apply MIN/MAX optimization when the operand of MIN/MAX is
    a constant if it can't be determined whether the query has any
    result rows. The reason is that if the query has result rows,
    then the result of MIN/MAX is its constant argument, but if the
    query result is empty, then the result of MIN/MAX must be NULL
    irrespective of its argument.
  
  * The patch also simplifies a bit the branch that hadles COUNT().
2005-09-21 09:49:19 +03:00
unknown
458a4234e4 Merge mysql.com:/home/psergey/bk-trees/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-csc6030-r3


sql/mysqld.cc:
  Auto merged
2005-09-21 02:20:55 +04:00
unknown
a2a8216b20 BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index
statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)


include/myisam.h:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
myisam/mi_check.c:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
myisam/myisamchk.c:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
mysql-test/r/myisam.result:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
mysql-test/t/myisam.test:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/ha_myisam.cc:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/handler.h:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/mysqld.cc:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/set_var.cc:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/sql_class.h:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
2005-09-21 02:18:29 +04:00
unknown
1818ff1c22 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  selena.:H:/MYSQL/src/#12929-mysql-4.1


include/my_sys.h:
  Auto merged
2005-09-20 20:11:38 +04:00
unknown
ac604f715d Small update for lock functions used in my_cgets() 2005-09-20 20:03:51 +04:00
unknown
3ce33c2c52 Bug #10694 LOAD DATA FROM INFILE fails with 'Out of operation records' 2005-09-20 14:20:02 +02:00