Commit graph

19182 commits

Author SHA1 Message Date
unknown
000a09baac Merge mysql.com:/home/jimw/my/mysql-4.1-11688
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-15 10:18:14 -07:00
unknown
4566d12fb8 Merge mysql.com:/home/jimw/my/mysql-4.1-12235
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-15 10:03:36 -07:00
unknown
3b1eabe866 Merge mysql.com:/home/jimw/my/mysql-4.1-11796
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
2005-08-15 09:59:11 -07:00
unknown
21bb08e8b6 Merge mysql.com:/home/jimw/my/mysql-4.1-12327
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-15 09:58:05 -07:00
unknown
1c847f790e BUG#12542: Prevous patch was incorrect. This removed the patch. 2005-08-15 17:53:38 +02:00
unknown
e8d9dccb3d Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
2005-08-13 07:49:22 +03:00
unknown
208be175de Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
2005-08-13 07:46:06 +03:00
unknown
19b4760f19 fixed convertion and handling IN subqueries with rows (BUG#11867)
mysql-test/r/subselect.result:
  testst of IN subqueries with row
mysql-test/t/subselect.test:
  tests of ion subqueries with row
sql/item.h:
  add method to prevent of removing Item_ref_null_helper from HAVING
sql/item_cmpfunc.h:
  Prevented removing of Item_test_isnotnull from HAVING
sql/item_subselect.cc:
  fixed converting row IN subqueries
sql/sql_select.cc:
  fixed debug print
2005-08-13 07:45:14 +03:00
unknown
66b97195eb sql_parse.cc:
Don't skip SET command even if --replicate-wild* says to.
  E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)


sql/sql_parse.cc:
  Don't skip SET command even if --replicate-wild* says to.
  E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)
2005-08-13 05:08:29 +02:00
unknown
4d0fad0dc2 Make sure to clean up temporary files in myisampack even when the
-T option is used. (Bug #12235)


myisam/myisampack.c:
  Clean up temporary files when -T was used.
2005-08-12 11:44:25 -07:00
unknown
d5ee74c92d Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-merge
2005-08-12 14:44:03 +02:00
unknown
058d5bff6e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12351


sql/item_strfunc.cc:
  Auto merged
2005-08-12 15:44:03 +05:00
unknown
32e29cd7e2 Merge mysql.com:/space/my/mysql-4.0-merge
into mysql.com:/space/my/mysql-4.1-merge


support-files/MacOSX/Makefile.am:
  Auto merged
support-files/Makefile.am:
  Auto merged
support-files/MacOSX/postflight.sh:
  Auto merged
2005-08-12 08:13:02 +02:00
unknown
d8ab930498 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean
2005-08-12 03:34:57 +02:00
unknown
e11a23a8aa - another comment typo fixed 2005-08-11 21:18:45 +02:00
unknown
ed0d295e3a - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
preflight/postflight instead, so they are run every time a PKG is installed, not only for
  a fresh installation


support-files/MacOSX/Makefile.am:
  - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
    preflight/postflight instead, so they are run every time, not only for a fresh installation
support-files/MacOSX/postflight.sh:
  - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
    preflight/postflight instead, so they are run every time, not only for a fresh installation
support-files/MacOSX/preflight.sh:
  - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
    preflight/postflight instead, so they are run every time, not only for a fresh installation
  - fixed comment typo
2005-08-11 20:23:12 +02:00
unknown
8c5e6af57d - Make sure the Mac OS X support files are built, but not installed by "make install" (the previous
change was too drastic) (BUG#12506)


support-files/Makefile.am:
  - make sure that the RPM spec files are built, but not installed by "make install"
2005-08-11 20:13:12 +02:00
unknown
bf07693148 query_cache_notembedded.test, query_cache_notembedded.result:
postmerge fix


mysql-test/r/query_cache_notembedded.result:
  postmerge fix
mysql-test/t/query_cache_notembedded.test:
  postmerge fix
2005-08-11 13:07:08 +03:00
unknown
7a3cf49389 merge
BitKeeper/deleted/.del-query_cache_notembedded.result:
  Delete: mysql-test/r/query_cache_notembedded.result
BitKeeper/deleted/.del-query_cache_notembedded.test:
  Delete: mysql-test/t/query_cache_notembedded.test
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
2005-08-11 10:20:06 +03:00
unknown
a724dbc039 make the same filenames as in 4.1
mysql-test/t/query_cache_notembedded.test:
  Rename: mysql-test/t/query_cache_noembeded.test -> mysql-test/t/query_cache_notembedded.test
mysql-test/r/query_cache_notembedded.result:
  Rename: mysql-test/r/query_cache_noembeded.result -> mysql-test/r/query_cache_notembedded.result
2005-08-11 09:29:50 +03:00
unknown
c1a7cfb7d5 Fix mysql_info() returning bad data in the results of a multi-statement
query that mixed statements that do and do not return info. (Bug #11688)


mysql-test/r/metadata.result:
  Add new results
mysql-test/t/metadata.test:
  Add new regression test
sql-common/client.c:
  Clear mysql->info in free_old_query()
2005-08-10 18:32:17 -07:00
unknown
d1b8c44b5b BUG #12253. Fixed logic the prevented repair when "--fast" was included
in invoking mysqlcheck.


client/mysqlcheck.c:
  BUG #12253. Removed logic that would skip adding the corrupt table name 
  if "--fast" was included along with "--auto-repair". Added some comments 
  as well.
2005-08-10 23:37:17 +02:00
unknown
307ed9b4da block using QC in case of having tables locked by LOCK... (BUG#12385)
sql/sql_cache.cc:
  block QC using if tables are locked with LOCK
  unlock QC
mysql-test/r/query_cache_noembeded.result:
  New BitKeeper file ``mysql-test/r/query_cache_noembeded.result''
mysql-test/t/query_cache_noembeded.test:
  New BitKeeper file ``mysql-test/t/query_cache_noembeded.test''
2005-08-10 18:58:55 +03:00
unknown
0872e83c49 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-08-10 09:52:58 +02:00
unknown
0ba4be2bd4 Added support for ha_ndbcluster::info(HA_STATUS_AUTO) 2005-08-10 09:38:36 +02:00
unknown
bea4fbb052 Rename rest() macro in my_list.h to list_rest(). (Bug #12327)
include/my_list.h:
  Rename rest() macro to list_rest().
mysys/list.c:
  rest() renamed to list_rest().
mysys/thr_lock.c:
  rest() renamed to list_rest().
sql/sql_test.cc:
  rest() renamed to list_rest().
2005-08-09 18:02:36 -07:00
unknown
888a931432 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into  xiphis.org:/usr/home/antony/work2/p2-bug10109.3


sql/sql_parse.cc:
  Auto merged
2005-08-09 16:35:51 +01:00
unknown
dbfc9b741d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b5439
2005-08-09 09:07:12 +05:00
unknown
ac28ad5dca Avoid problems on shutdown by shutting down replication slave threads
after normal connection threads. (Bug #11796)


sql/mysqld.cc:
  Move call to end_slave() after first loop through killing threads,
  to minimize chances of 'SHOW SLAVE STATUS' being called between the
  time the slave is shut down and connections are shut down.
2005-08-08 18:05:27 -07:00
unknown
310bb7e2da Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
2005-08-08 16:55:29 -07:00
unknown
6f0a626097 subselect.test, subselect.result:
Added a test case for bug #12392.
item_cmpfunc.cc:
  Fixed bug #12392.
  Missing handling of rows containing NULL components
  when evaluating IN predicates caused a crash.


sql/item_cmpfunc.cc:
  Fixed bug #12392.
  Missing handling of rows containing NULL components
  when evaluating IN predicates caused a crash.
mysql-test/r/subselect.result:
  Added a test case for bug #12392.
mysql-test/t/subselect.test:
  Added a test case for bug #12392.
2005-08-08 16:51:12 -07:00
unknown
e6ed39b405 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2005-08-09 00:15:27 +03:00
unknown
97988099eb Review of new pushed code
- Fixed some error condtion when handling dates with 'T'
- Added extra test for bug #11867 (Wrong result with "... WHERE ROW( a, b ) IN ( SELECT DISTINCT a, b WHERE ...)" to show it's not yet fixed
- Safety fixes and cleanups


mysql-test/r/subselect.result:
  Added extra test case to test case for bug #11867
  (Result shows that current code is not yet right and needs to be fixed)
mysql-test/r/type_datetime.result:
  More tests for dates of type CCYYMMDDTHHMMSS
mysql-test/t/subselect.test:
  Added extra test case to test case for bug #11867
mysql-test/t/type_datetime.test:
  More tests for dates of type CCYYMMDDTHHMMSS
sql-common/my_time.c:
  Fixed handling of dates of type CCYYMMDDTHHMMSS
  (Old code couldn't handle 2003-0304 or 2003-0003-02)
sql/slave.cc:
  Indentation cleanup
sql/sql_parse.cc:
  Added test of return value of get_system_var()
sql/sql_select.cc:
  Removed unnecessary call to field->table->maybe_null
sql/sql_union.cc:
  Indentation fixes
2005-08-09 00:13:49 +03:00
unknown
b10670142c BUG #12119
Removed unnecessary error message from mysql.cc (client program)


client/mysql.cc:
  BUG #12119
  
  The error message "Didn't find any fields in table ..." would 
  be printed out when a table was created and dropped in rapid succession 
  via a perl script. The client would get a list of tables, meanwhile, the 
  one table would be deleted, and then this error message printed when the 
  table was not found, which it should just quietly not print the fields.
  Removing the error message fixes this issue.
2005-08-08 13:50:10 -07:00
unknown
10805ec234 item_strfunc.cc:
BUG #11104 
      Took out the offset-=delimiter_length-1 out of the for loop. It was causing
      basically this: 
      select substring_index('the king of the the hill', 'the', -2) to not work.
      The first iteration, offset would be initialised to 24, then strstr would 
      point at 'the king of the the* hill' ('*'means right before the 
      character following), returning a offset of 16. The for loop would then 
      decrement offset by two (3 - 1), to 14, now pointing at 
      "the king of th*e the hill", _skipping_ past the 'e' in the second to last
      'the', and therefore strstr would never have a chance of matching the 
      second to last 'the', then moving on to the 'the' at the begginning of the 
      string!
      In a nutshell, offset was being decremented by too great a value, preventing
      the second to last 'the' from being ever found, hence the result of 
      'king of the the hill' from the query that is reported in the bug report
func_str.test:
  BUG #11104
  Added tests to make sure fix addresses issues in original bug report
func_str.result:
  BUG #11104 
  New results for new tests


mysql-test/r/func_str.result:
  BUG #11104 
  
  New results for new tests
mysql-test/t/func_str.test:
  BUG #11104
  
  Added tests to make sure fix addresses issues in original bug report
sql/item_strfunc.cc:
  BUG #11104 
      Took out the offset-=delimiter_length-1 out of the for loop. It was causing
      basically this: 
      select substring_index('the king of the the hill', 'the', -2) to not work.
      The first iteration, offset would be initialised to 24, then strstr would 
      point at 'the king of the the* hill' ('*'means right before the 
      character following), returning a offset of 16. The for loop would then 
      decrement offset by two (3 - 1), to 14, now pointing at 
      "the king of th*e the hill", _skipping_ past the 'e' in the second to last
      'the', and therefore strstr would never have a chance of matching the 
      second to last 'the', then moving on to the 'the' at the begginning of the 
      string!
  
      In a nutshell, offset was being decremented by too great a value, preventing
      the second to last 'the' from being ever found, hence the result of 
      'king of the the hill' from the query that is reported in the bug report
2005-08-08 13:46:13 -07:00
unknown
4112dc2176 Bug#5439 : mysql_server_init() crashes if ShiftJIS path is passed
(important for Adobe).

mf_pack.c, mf_dirname.c, charset.c, my_sys.h:

  - adding fs_character_set() function on Windows
  - ignoring fake slashes which are just multibyte
    parts in several functions in /mysys

Verified by Shu to work on WinXP and Win2k.
Test is not possible, or very hard to do.


include/my_sys.h:
  Bug#5439 : mysql_server_init() crashes if ShiftJIS path is passed
  (important for Adobe)
  - adding fs_character_set() function on Windows
  - ignoring fake slashes which are just multibyte
    parts in several functions in /mysys
mysys/charset.c:
  d
mysys/mf_dirname.c:
  d
mysys/mf_pack.c:
  d
2005-08-08 19:52:30 +05:00
unknown
d3a6f4082f func_system.result, func_system.test:
adding test case
item_strfunc.cc:
  Bug#12351
  CONCAT with USER()/DATEBASE() and
  a column gets strange results.
  Mark created Item_str as constant, so CONCAT
  cannot reuse it for optimization purposes.


sql/item_strfunc.cc:
  Bug#12351
  CONCAT with USER()/DATEBASE() and
  a column gets strange results
mysql-test/t/func_system.test:
  adding test case
mysql-test/r/func_system.result:
  adding test case
2005-08-08 19:09:54 +05:00
unknown
e630100374 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b10892
2005-08-08 17:49:13 +05:00
unknown
00267b9f73 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b10892
2005-08-08 16:22:17 +05:00
unknown
b9ffa4dbab item.cc:
After review fix


sql/item.cc:
  After review fix
2005-08-08 16:20:46 +05:00
unknown
00e7404821 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mishka.local:/home/my/mysql-4.1
2005-08-08 13:19:13 +03:00
unknown
38b4ccf5d3 Fix for BUG #11642: [Patch]es x86 Assembler and text relocations
Changed assembler functions to not access global variables or variables in text segement
Added wrapper function in C to longlong2str() to pass _dig_vec_upper as an argument


mysql-test/r/bigint.result:
  More tests for parsing of bigint's
  More tests for different values to conv()
mysql-test/t/bigint.test:
  More tests for parsing of bigint's
  More tests for different values to conv()
strings/Makefile.am:
  Added longlong2str_asm.c
strings/longlong2str-x86.s:
  Changed functions to not access variables in text segment
  Fixed this by adding global variable '_dig_vec_upper' as an argument to longlong2str_with_dig_vector()
strings/my_strtoll10-x86.s:
  Removd array lfactor by calculating the value in code
  (this is to to make the code position independent)
strings/longlong2str_asm.c:
  New BitKeeper file ``strings/longlong2str_asm.c''
2005-08-08 13:18:18 +03:00
unknown
22a7308481 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2005-08-08 13:14:29 +03:00
unknown
23095e278b Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-08-07 14:03:47 -07:00
unknown
25201f23c8 Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-08-07 23:03:46 +02:00
unknown
84d34d9d59 subselect.result:
Added test case for bug #11867.
  Fixed results for two existing test cases.
subselect.test:
  Added test case for bug #11867.
item_subselect.cc:
  Fixed bug #11867.
  Added missing code in Item_in_subselect::row_value_transformer
  that caused problems for queries with
  ROW(elems) IN (SELECT DISTINCT cols FROM ...).


sql/item_subselect.cc:
  Fixed bug #11867.
  Added missing code in Item_in_subselect::row_value_transformer
  that caused problems for queries with
  ROW(elems) IN (SELECT DISTINCT cols FROM ...).
mysql-test/t/subselect.test:
  Added test case for bug #11867.
mysql-test/r/subselect.result:
  Added test case for bug #11867.
  Fixed results for two existing test cases.
2005-08-07 14:03:46 -07:00
unknown
b9e04cf1ef BUG#11869: part2: post-review fixes:
In init_prepare_fake_select_lex() don't empty ftfunc_list. UNION's ORDER BY clause may 
contain MATCH(...), for which fix_index() should be called.


mysql-test/r/fulltext_order_by.result:
  BUG#11869 part2 : added another test case
mysql-test/t/fulltext_order_by.test:
  BUG#11869 part2 : added another test case
2005-08-07 21:03:45 +00:00
unknown
1ab80cf4df Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-08-07 18:28:08 +02:00
unknown
1b431c4274 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug11869-part2
2005-08-07 11:05:25 +00:00
unknown
fdb4d307ab Bug#10109
"INSERT .. SELECT ... ON DUPLICATE KEY UPDATE fails"
  Ensure that check_insert_fields() is only called once when
  doing an INSERT..SELECT


mysql-test/r/insert_update.result:
  Test for bug 10109
mysql-test/t/insert_update.test:
  Test for bug 10109
sql/sql_class.h:
  select_insert needs more state
sql/sql_insert.cc:
  ensure that check_insert_fields() is only called once when
  doing an INSERT...SELECT
sql/sql_parse.cc:
  more args for select_insert constructor
2005-08-07 03:16:15 +01:00