Commit graph

19982 commits

Author SHA1 Message Date
unknown
0dc3105ada Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2005-10-14 00:04:40 +03:00
unknown
0069549021 - set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236)
- fixed test


mysql-test/r/rpl_multi_update2.result:
  fixed setting/reseting environment
  multi-update with subquery added
mysql-test/t/rpl_multi_update2.test:
  fixed setting/reseting environment
  multi-update with subquery added
sql/sql_update.cc:
  set 'updating' in both tables list if we have two of them (because of subquery)
2005-10-14 00:02:38 +03:00
unknown
eb8be3261d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-10-13 22:29:50 +02:00
unknown
74121f4648 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2005-10-13 22:29:29 +02:00
unknown
507dc62acc Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
support-files/mysql.spec.sh:
  Auto merged
2005-10-13 22:11:49 +02:00
unknown
124b0a594c - added a usermod call in the postinstall section of the RPM spec file
to assign a potential existing mysql user to the correct user group (BUG#12823) 


support-files/mysql.spec.sh:
   - added a usermod call to assign a potential existing mysql user to the
     correct user group (BUG#12823)
2005-10-13 22:10:54 +02:00
unknown
4b51051d99 RPM spec file fixes:
- added a usermod call to assign a potential existing mysql user to the
   correct user group (BUG#12823)
 - Save the perror binary built during Max build so it supports the NDB
   error codes (BUG#13740)
 - added a separate macro "mysqld_group" to be able to define the
   user group of the mysql user seperately, if desired.


support-files/mysql.spec.sh:
   - added a usermod call to assign a potential existing mysql user to the
     correct user group (BUG#12823)
   - Save the perror binary built during Max build so it supports the NDB
     error codes (BUG#13740)
   - added a separate macro "mysqld_group" to be able to define the
     user group of the mysql user seperately, if desired.
2005-10-13 22:01:02 +02:00
unknown
8402aefe25 Force a server restart for the not_embedded_server test to satisfy
conditions of its first test. (Bug #13796)


mysql-test/t/not_embedded_server-master.opt:
  New BitKeeper file ``mysql-test/t/not_embedded_server-master.opt''
2005-10-13 11:10:45 -07:00
unknown
ab90b23a87 Fix typo (thread_cache should be thread_cache_size) in example
configuration files. (Bug #13811)


support-files/my-huge.cnf.sh:
  Fix name of thread_cache_size setting.
support-files/my-innodb-heavy-4G.cnf.sh:
  Fix name of thread_cache_size setting.
support-files/my-large.cnf.sh:
  Fix name of thread_cache_size setting.
2005-10-13 11:05:59 -07:00
unknown
c8067ec848 Fixes during review of new code
sql/slave.cc:
  Moved mutex_unlock to handle 'err' case properly
vio/vio.c:
  Made code clearer (fcntl_mode is always 0 here)
2005-10-13 19:24:01 +03:00
unknown
0e9f9498ea Use 4.1 code 2005-10-13 18:48:58 +03:00
unknown
854fd32827 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged
2005-10-13 16:53:46 +02:00
unknown
94d51833ef Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-10-13 19:53:45 +05:00
unknown
3d332ea76f merging 2005-10-13 19:51:07 +05:00
unknown
f4e6fca1bd Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into  mysql.com:/home/my/mysql-4.0
2005-10-13 17:42:15 +03:00
unknown
d853ecd67c Review of new pushed code
- No need to check *ref when ref is checked (Simple optimization fix)


sql/item.cc:
  No need to check *ref
2005-10-13 17:41:55 +03:00
unknown
2a0183b54d merging
sql/sql_select.cc:
  Auto merged
2005-10-13 19:31:09 +05:00
unknown
2e887f794a Fix for bug #3874 (Group by field is not considered)
mysql-test/r/select.result:
  test result fixed
mysql-test/t/select.test:
  test case added
sql/sql_select.cc:
  do the same for nullable
2005-10-13 19:23:52 +05:00
unknown
0d89774756 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
2005-10-13 17:21:54 +03:00
unknown
cd04dcd7bc Some Netware related fixes and fixes for Metrowerks compiler.
netware/BUILD/mwenv:
  Removed -O3 for Metrowerks compiler.
netware/pack_isam.def:
  NetWare specific change, Added SCRENNAME for pack_isam.
scripts/make_binary_distribution.sh:
  Netware specific change for creating help tables.
strings/my_strtoll10.c:
  Fix for Metrowerks compiler.
2005-10-13 17:21:14 +03:00
unknown
7eee194d6e Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug12698/my41-bug12698
2005-10-13 15:53:02 +02:00
unknown
ab87b08973 Bug #12698 abnormal program termination running mysql_client_test
- Move test for bug#93 from mysql_client_test.c to show_check.test
 - No need for test written in c


mysql-test/r/show_check.result:
  Add test case for bug#93, moved from mysql_client_test.c
mysql-test/t/show_check.test:
  Add test case for bug#93, moved from mysql_client_test.c
tests/mysql_client_test.c:
  Remove test for bug#95 to show_check.test
2005-10-13 15:52:22 +02:00
unknown
8b6ba46c2c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13535-bug-4.1-mysql


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
2005-10-13 17:17:32 +04:00
unknown
10ad813d4f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged
2005-10-13 14:32:10 +02:00
unknown
341fbced18 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-13 14:23:37 +02:00
unknown
8009bdd26d Bug #12698 abnormal program termination running mysql_client_test
- The testcase create a .frm file consisting of "junk". Unfortunately the "junk" wasn't
   written to the .frm file if mysql_client_test was run with -s option to make it run silent.
   This most likely caused the file never to be created on windows, and thus the 
    test case failed.


tests/mysql_client_test.c:
  Always write "junk" to the test file.
2005-10-13 13:37:10 +02:00
unknown
1bfdbfca27 Merge mysql.com:/M41/clone-4.1-current into mysql.com:/M41/mysql-4.1
scripts/make_binary_distribution.sh:
  Auto merged
2005-10-13 12:36:41 +02:00
unknown
787318dc7b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12476
2005-10-13 13:38:15 +05:00
unknown
3657f600df memcpy_overlap() replaced with memmove() during the merging.
strings/ctype-tis620.c:
  memcpy_overlap() replaced with memmove() during the merge.
2005-10-13 13:25:07 +05:00
unknown
5de7ba46e8 Merge mysql.com:/usr/home/ram/work/mysql-4.0
into  mysql.com:/usr/home/ram/work/mysql-4.1


myisam/mi_search.c:
  Auto merged
include/m_string.h:
  SCCS merged
2005-10-13 12:48:30 +05:00
unknown
3818980eb9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12476


sql/item_cmpfunc.cc:
  Auto merged
2005-10-13 11:25:08 +05:00
unknown
62002fdc00 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 16:07:16 -07:00
unknown
ce48949ef9 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 14:38:32 -07:00
unknown
d68f16e215 Manual merged
sql/item.cc:
  Auto merged
2005-10-13 01:14:58 +04:00
unknown
a46e8e230e select.test, sql_select.cc, sql_lex.cc, item.cc:
Bug #7672 after merge fix


sql/item.cc:
  Bug #7672 after merge fix
sql/sql_lex.cc:
  Bug #7672 after merge fix
sql/sql_select.cc:
  Bug #7672 after merge fix
mysql-test/t/select.test:
  Bug #7672 after merge fix
2005-10-13 00:58:59 +04:00
unknown
0d5af53ccc Merge mysql.com:/home/jimw/my/mysql-4.1-6413
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 13:31:01 -07:00
unknown
77ad01c270 Merge mysql.com:/home/jimw/my/mysql-4.1-12136
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 13:29:49 -07:00
unknown
3b3712fda3 To force a restart at the end of test, the option file must be non-empty, it's not enough if it exists and is empty.
mysql-test/t/rpl_dual_pos_advance-master.opt:
  the option file must be non-empty (because there's a -z test in mysql-test-run)
2005-10-12 22:29:36 +02:00
unknown
0c9997fca7 Merge mysql.com:/home/jimw/my/mysql-4.1-8731b
into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-10-12 13:28:46 -07:00
unknown
101d9189bd Merge mysql.com:/home/jimw/my/mysql-4.1-13344
into  mysql.com:/home/jimw/my/mysql-4.1-clean


mysql-test/r/cast.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
sql/item.h:
  Auto merged
2005-10-12 13:27:49 -07:00
unknown
9a3bce50ae Merge mysql.com:/home/jimw/my/mysql-4.1-13619
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 13:26:49 -07:00
unknown
228d5c42fa Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13535-bug-4.1-mysql


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
2005-10-13 00:16:33 +04:00
unknown
6c89848de9 memcpy_overlap() removed, as
1. it's wrong to use memcpy() for overlapped areas;
  2. we use it only once.
During merge to 4.1 will remove a memcpy_overlap() call 
from strings/ctype-tis620.c as well in order to fix 
bug #10836: ctype_tis620 test failure with ICC-compiled binaries on IA64.


myisam/mi_search.c:
  use memmove() instead, as memcpy_overlap() is removed.
2005-10-12 18:50:25 +05:00
unknown
61dfc3347f merge 2005-10-12 13:31:48 +02:00
unknown
7ff27a614d Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc;
in short we now record whenever the slave I/O thread ignores a master's event because of its server id,
and use this info in the slave SQL thread to advance Exec_master_log_pos. Because if we
do not, this variable stays at the position of the last executed event, i.e. the last *non-ignored*
executed one, which may not be the last of the master's binlog (and so the slave *looks* behind
the master though it's data-wise it's not).


mysql-test/t/rpl_dual_pos_advance-master.opt:
  empty; its goal is just to trigger a server restart after running the test,
  so that the master forgets that it was a slave (otherwise it affects the following tests).
sql/log.cc:
  No more default arguments for Rotate_log_event constructor.
  MYSQL_LOG::appendv() is now called without mutex.
sql/log_event.cc:
  Moving one Rotate_log_event constructor from log_event.h. Support for on-demand choice of
  duplicating the string argument of the constructor or not (because there now are needs for both
  alternatives, see slave.cc).
sql/log_event.h:
  We now have a case where a Rotate_log_event is executed by the slave SQL thread while
  not being in the relay log, so it needs to pretend its length is 0: a ZERO_LEN flag for that;
  a flag DUP_NAME (replaces "bool alloced") to be able to choose if we want the constructor
  to duplicate the string argument or not.
sql/slave.cc:
  A comment for BUG#13861 (to be fixed). llstr() instead of %ld as the number is ulonglong.
  mi->rli becomes rli in some places.
  Fix for BUG#13023:
  - in the slave I/O thread, whenever we ignore an event because of its server id we update
  a couple of coordinates in memory
  - in the slave SQL thread, whenever we bump into the end of the latest relay log, we check
  this couple of coordinates to see if we should advance our Exec_master_log_pos.
  - when the slave I/O thread terminates it saves these in-memory coordinates into a Rotate event
  in the relay log, so that they are durable.
sql/slave.h:
  A couple of coordinates in RELAY_LOG_INFO to keep track of the last ignored events received
  by the slave I/O thread (ignored because of the server id).
mysql-test/r/rpl_dual_pos_advance.result:
  New BitKeeper file ``mysql-test/r/rpl_dual_pos_advance.result''
mysql-test/t/rpl_dual_pos_advance.test:
  Test for BUG#13023 (with a part, disabled, to test BUG#13861 when I fix it).
  Before the fix, this test used to hang.
2005-10-12 13:29:55 +02:00
unknown
9af6650abd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/users/grog/4.1
2005-10-12 09:54:20 +02:00
unknown
be559ad6ce sql_yacc.yy:
Bug #10308: Parse 'purge master logs' with subselect correctly.
subselect.test:
  Bug #10308: Test for 'purge master logs' with subselect.
subselect.result:
  Bug #10308: Test result for 'purge master logs' with subselect.


mysql-test/r/subselect.result:
  Bug #10308: Test result for 'purge master logs' with subselect.
mysql-test/t/subselect.test:
  Bug #10308: Test for 'purge master logs' with subselect.
sql/sql_yacc.yy:
  Bug #10308: Parse 'purge master logs' with subselect correctly.
2005-10-12 09:47:59 +02:00
unknown
b455f7c575 Manual merge, fix for bug #7672
mysql-test/r/select.result:
  Manual merge
mysql-test/t/select.test:
  Manual merge
sql/item.cc:
  Manual merge
sql/sql_lex.cc:
  Manual merge
sql/sql_lex.h:
  Manual merge
sql/sql_select.cc:
  Manual merge
2005-10-12 03:32:14 +04:00
unknown
62064da186 Fix read past allocated buffer when parsing charsets file. (Bug #6413)
strings/xml.c:
  Don't look for comment past end of buffer.
2005-10-11 15:23:34 -07:00
unknown
156cb69e63 mysqlwatch.vcproj:
Removed Debug target not used
mysql.sln:
  Added pro-gpl target
  Build mysqlwatch and mysqlshutdown for classic as well


VC++Files/mysql.sln:
  Added pro-gpl target
VC++Files/mysqlwatch/mysqlwatch.vcproj:
  Removed Debug target not used
2005-10-11 22:34:40 +02:00