Commit graph

18,707 commits

Author SHA1 Message Date
unknown
5841d70af8 Fix multiplication of abs() by a negative value. (Bug #11402)
mysql-test/r/func_math.result:
  Add new results
mysql-test/t/func_math.test:
  Add new regression test
sql/item_func.cc:
  Don't set result of abs() to unsigned. Result should still be
  a signed value, even if always positive.
2005-06-22 20:00:21 -07:00
unknown
31d0786687 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/mysql-4.1 2005-06-22 20:59:33 +02:00
unknown
ff972e3e5d Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/bug9148
2005-06-22 13:59:32 -05:00
unknown
285e348c1f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/mysql-4.1-bug-8147
2005-06-22 22:59:31 +04:00
unknown
256c99fdb2 item.h:
Fix for fix for bug#9728 decreased functionality in "on duplicate key update"
  Have to return false to set flag for whole expression.


sql/item.h:
  Fix for fix for bug#9728 decreased functionality in "on duplicate key update"
  Have to return false to set flag for whole expression.
2005-06-22 22:58:44 +04:00
unknown
900fe718d1 BUG#9361: Added test cases
mysql-test/r/rpl_multi_update3.result:
  Added test cases
mysql-test/t/rpl_multi_update3.test:
  Added test cases
2005-06-22 17:12:02 +02:00
unknown
a47530f118 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-22 11:51:18 +02:00
unknown
eb7e1d7257 Made upgrade compatibility in 4.1 range to latest build version
ndb/src/common/util/version.c:
  Maybe upgrade compatibility in 4.1 range to latest build version
2005-06-22 11:18:40 +02:00
unknown
2e7df19bad fix README file to be more verbose match actual situation (recomitted to push into 4.1)
mysql-test/README:
  fix README file to be more verbose match actual situation
2005-06-22 05:18:43 +02:00
unknown
a6c7fb455a Fix bug #9728 decreased functionality in "on duplicate key update"
Remove changes made by bug fix #8147. They strips list of insert_table_list to
only insert table, which results in error reported in bug #9728.
Added flag to Item to resolve ambigous fields reported in bug #8147.


sql/item.h:
  Fix bug#9728  decreased functionality in "on duplicate key update".
sql/item.cc:
  Fix bug#9728  decreased functionality in "on duplicate key update"
sql/sql_parse.cc:
  Fix bug#9728  decreased functionality in "on duplicate key update"
sql/sql_base.cc:
  Fix bug#9728  decreased functionality in "on duplicate key update".
sql/sql_yacc.yy:
  Fix bug#9728  decreased functionality in "on duplicate key update"
mysql-test/t/insert_select.test:
  Test case for bug#9728 Decreased functionality in "on duplicate key update".
mysql-test/r/insert_select.result:
  Test case for bug#9728 Decreased functionality in "on duplicate key update".
2005-06-22 07:18:42 +04:00
unknown
d785fc60ab BUG#10442 Minor changes from code review
mysql-test/r/rpl_multi_update3.result:
  Changes from code review
mysql-test/t/rpl_multi_update3.test:
  Changes from code review
sql/sql_parse.cc:
  Changes from code review
2005-06-21 15:40:58 -04:00
unknown
0bc8837943 Bug #9148 Denial of Service
my_access.c:
  Fixed problem where in some cases check_if_legal_filename was returning 0 for illegal names


mysys/my_access.c:
  Fixed problem where in some cases check_if_legal_filename was returning 0 for illegal names
2005-06-21 13:35:12 -05:00
unknown
5031e9adc8 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug10442
2005-06-21 14:28:55 -04:00
unknown
d18ab5a024 mysql-test-run.pl:
Added optional paths for finding mysqld on Windows
  Added language/charset options to embedded mysql_client_test


mysql-test/mysql-test-run.pl:
  Added optional paths for finding mysqld on Windows
  Added language/charset options to embedded mysql_client_test
2005-06-21 20:25:50 +02:00
unknown
a23bf16577 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  moonbone.local:/work/mysql-4.1-bug-10886


sql/sql_insert.cc:
  Auto merged
2005-06-21 22:25:49 +04:00
unknown
8e45c0572b Fix bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE produces bad results
Temporary field wasn't restored to default values after ON DUPLICATE KEY
 UPDATE event, which results in wrong data being inserted in new record.


sql/sql_insert.cc:
  Fix bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE produces bad results
mysql-test/t/insert_select.test:
  Test case for bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY 
  UPDATE produces bad results
mysql-test/r/insert_select.result:
  Test case for bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE 
  produces bad results
2005-06-21 22:24:58 +04:00
unknown
9f4db56284 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-21 06:19:06 -07:00
unknown
472a2b511c Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
2005-06-21 04:31:07 -07:00
unknown
7b1ec02732 group_by.result, group_by.test:
Added a test case for bug #11295.
item_buff.cc:
  Fixed bug #11295.
  This a correction for the patch of bug #11088 that takes into
  account a possible NULL values of the BLOB column.


sql/item_buff.cc:
  Fixed bug #11295.
  This a correction for the patch of bug #11088 that takes into
  account a possible NULL values of the BLOB column.
mysql-test/t/group_by.test:
  Added a test case for bug #11295.
mysql-test/r/group_by.result:
  Added a test case for bug #11295.
2005-06-21 04:24:21 -07:00
unknown
06b1e94109 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-21 10:35:22 +02:00
unknown
e74d531373 mysql-test-run.pl:
More compact and safe handling of path names.
  Support for running in Windows source tree.
  Use libtool wrapper, instead of messing with
  library path names, and objects in .libs dir.
mtr_misc.pl:
  Utility function that search aand check path names
mtr_report.pl:
  Patch by Carsten, set correct reject/result/eval if not main suite


mysql-test/lib/mtr_report.pl:
  Patch by Carsten, set correct reject/result/eval if not main suite
mysql-test/lib/mtr_misc.pl:
  Utility function that search aand check path names
mysql-test/mysql-test-run.pl:
  More compact and safe handling of path names.
  Support for running in Windows source tree.
  Use libtool wrapper, instead of messing with
  library path names, and objects in .libs dir.
2005-06-21 02:21:52 +02:00
unknown
e17de6ecb4 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-20 14:48:04 -07:00
unknown
d73327e199 mtr_cases.pl:
Bug#11466: Script can now get test case name
  from test case file path on command line
mysql-test-run.pl:
  Bug#11466: Added --skip-ndbcluster/--skip-ndb option
mtr_cases.pl:
  Don't set --default-time-zone if opt file sets it
  Restart the server if time zone is given in opt file
mysql-test-run.pl:
  Don't remove symlink to "var" directory in cleanup
  Removed duplicate/unessesary options to mysqld


mysql-test/mysql-test-run.pl:
  Bug#11466: Added --skip-ndbcluster/--skip-ndb option
mysql-test/lib/mtr_cases.pl:
  Bug#11466: Script can now get test case name
  from test case file path on command line
2005-06-20 21:37:39 +02:00
unknown
bcec3fa575 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-06-20 21:25:54 +02:00
unknown
30f67d70a1 Merge jwinstead@production.mysql.com:my/mysql-4.1-win
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-20 12:07:41 -07:00
unknown
305fe79c3b Merge jwinstead@production.mysql.com:my/mysql-4.1-10840
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-20 12:05:09 -07:00
unknown
641bd4ec29 Merge jwinstead@production.mysql.com:my/mysql-4.1-7858
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-20 12:04:22 -07:00
unknown
36dcc209b6 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-20 10:52:38 -07:00
unknown
15b113e186 group_by.result:
Added  a test case for bug #11385.
group_by.test:
  Added  a test case for bug #11385.
field.h:
  Fixed bug #11385.
  The bug was due to not defined method decimals for the class
  Field_datetime.


sql/field.h:
  Fixed bug #11385.
  The bug was due to not defined method decimals for the class
  Field_datetime.
mysql-test/t/group_by.test:
  Added  atest case for bug #11385.
mysql-test/r/group_by.result:
  Added  a test case for bug #11385.
2005-06-20 10:49:04 -07:00
unknown
7b24dad470 Fix handling of command-line on Windows, missed as part of earlier
commit. (Bug #10840)


client/mysql.cc:
  Add cast of unsigned value stored in signed char
2005-06-20 18:54:45 +02:00
unknown
0f5b946ccf Makefile.am:
Corrected dependency for "lex_hash.h", to avoid occasional make failure


sql/Makefile.am:
  Corrected dependency for "lex_hash.h", to avoid occasional make failure
2005-06-20 18:03:30 +02:00
unknown
84da8b22d5 ha_ndbcluster.cc:
Added CR for readability


sql/ha_ndbcluster.cc:
  Added CR for readability
2005-06-20 17:17:44 +02:00
unknown
b8cbed7c36 Added comment to store_lock 2005-06-20 17:16:22 +02:00
unknown
e0e1adc329 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-20 16:13:34 +02:00
unknown
2c7095c82e 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-06-20 06:13:30 -07:00
unknown
79444fa535 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg11060
2005-06-20 16:07:36 +04:00
unknown
78e6794b63 Fix for bug #11060 "Server crashes on re-execution of prepared
INSERT ... SELECT with UNION" (reviewed version).

Altough bug manifest itself only starting from 5.0 it is better to
apply fix to 4.1 to keep some assumptions true and make code more
future-proof.


mysql-test/r/ps.result:
  Added test case for bug #11060 "Server crashes on re-execution of
  prepared INSERT ... SELECT with UNION".
mysql-test/t/ps.test:
  Added test case for bug #11060 "Server crashes on re-execution of
  prepared INSERT ... SELECT with UNION".
sql/sql_insert.cc:
  select_insert::prepare():
    Item::fix_fields() methods operate assuming that LEX::current_select
    points to the select to which current item belongs. Thus
    during check_insert_fields() routine execution LEX::current_select
    should point ot the first select in query since this is the
    select with which items in insert list is associated.
    But if we have INSERT SELECT UNION SELECT type of query
    LEX::current_select will point to the fake_select_lex instead
    since select_insert::prepare() is called during processing of JOIN
    which corresponds to this select_lex.
    So we have set LEX::current_select before calling check_insert_fields()
    and restore it afterwards.
2005-06-20 16:07:00 +04:00
unknown
c871478886 Makefile.am:
Use the Perl version of mysql-test-run


Makefile.am:
  Use the Perl version of mysql-test-run
2005-06-20 12:58:58 +02:00
unknown
2aa1a04c63 mysql-test-run.pl:
Corrected path to 'mysql_fix_privilege_tables'


mysql-test/mysql-test-run.pl:
  Corrected path to 'mysql_fix_privilege_tables'
2005-06-20 12:32:53 +02:00
unknown
3402861e23 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-20 12:27:50 +02:00
unknown
d0a7c1248e mysql-test-run.pl:
Corrected path to 'mysql_fix_privilege_tables'
  Corrected dummy --manager-port to take integer argument


mysql-test/mysql-test-run.pl:
  Corrected path to 'mysql_fix_privilege_tables'
2005-06-20 11:49:25 +02:00
unknown
f258d561eb Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
2005-06-20 09:37:31 +02:00
unknown
34dc6ac352 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
2005-06-20 08:28:45 +02:00
unknown
1bc23847bf ha_ndbcluster.cc:
remove typecheck in ndb handler not needed


sql/ha_ndbcluster.cc:
  remove typecheck in ndb handler not needed
2005-06-20 07:53:53 +02:00
unknown
8d87d9bf29 BUG#11377 Building cluster in 4.1 BK tree fails with GCC4.0
ndb/src/kernel/SimBlockList.cpp:
  GCC 4.0 build fix
2005-06-20 15:18:53 +10:00
unknown
f35c177a2a mysql-test-run.pl:
Added dummy --manager-port flag, for backward compatibility
  Back port from 5.0, correction of paths to SSL pem files
mtr_cases.pl:
  Removed hard coded exclude list for embedded server
mysql-test-run.pl:
  Set environment variable MYSQL_SHOW, to be used in test cases


mysql-test/lib/mtr_cases.pl:
  Removed hard coded exclude list for embedded server
mysql-test/mysql-test-run.pl:
  Added dummy --manager-port flag, for backward compatibility
  Back port from 5.0, correction of paths to SSL pem files
2005-06-19 20:06:27 +02:00
unknown
fc390fe6a9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-06-19 18:55:00 +02:00
unknown
e148529e8e Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-06-18 18:16:04 +02:00
unknown
3e4082cd8e BSD make compatibility. bug#9828 2005-06-18 18:14:28 +02:00
unknown
61b2a6b083 Fix hang/crash with Boolean full-text search against an unindexed field for
which the query contained more words than we allocated space. (Bug #7858)


myisam/ft_boolean_search.c:
  Fix calculation of max number of elements -- "words" may not have spaces
  between them.
mysql-test/t/fulltext.test:
  Modify test to be specific to reported bug (fix for old bug wasn't quite enough)
mysql-test/r/fulltext.result:
  Update results
2005-06-17 21:44:17 +02:00