Commit graph

19959 commits

Author SHA1 Message Date
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
unknown
87308abfc4 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-10-11 22:31:08 +02:00
unknown
e032994ea8 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2005-10-11 22:30:37 +02:00
unknown
7d86879442 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


scripts/make_win_src_distribution.sh:
  Auto merged
2005-10-11 21:24:01 +02:00
unknown
28dffbcd66 - added Docs/manual.chm to the windows source distribution (BUG#13899)
scripts/make_win_src_distribution.sh:
  - added Docs/manual.chm to the windows source distribution (BUG#13899). The file
    is placed in there by the Bootstrap script, which pulls it from the mysqldoc
    repository
2005-10-11 21:16:08 +02:00
unknown
e61dea1b36 Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731)


configure.in:
  Fix flags for Darwin 6 and later. Simplify Darwin 7-9 blocks to simply
  be a catch-all for *darwin* so that future Darwin releases get the
  latest flags.
include/config-win.h:
  Define my_sigset() instead of sigset().
include/my_pthread.h:
  Define my_sigset() instead of trying to monkey with sigset(), and favor
  an implementation based on sigaction().
mysys/my_pthread.c:
  Remove pthread_signal(), which is identical to the new my_sigset() macro.
mysys/thr_alarm.c:
  Use my_sigset() instead of sigset().
sql/mysqld.cc:
  Use my_sigset() instead of signal() and sigset(), remove unnecessary
  definition of sigset on __amiga__. Remove unused THREAD_SPECIFIC_SIGPIPE
  code.
  
  A future improvement would be to re-assess the use of sigaction() here
  and convert its usage to use my_sigset().
vio/vio.c:
  Always call fcntl() to initialize flags of socket in initialization to
  avoid problems on systems that don't report the flags on a socket
  correctly right after it has been returned from accept(), such as
  FreeBSD, Mac OS X, and possibly other BSD-derived systems.
vio/viosocket.c:
  If fcntl() fails in vio_blocking(), restore the flags stored in the
  vio struct.
mysql-test/r/wait_timeout.result:
  New BitKeeper file ``mysql-test/r/wait_timeout.result''
mysql-test/t/wait_timeout-master.opt:
  New BitKeeper file ``mysql-test/t/wait_timeout-master.opt''
mysql-test/t/wait_timeout.test:
  New BitKeeper file ``mysql-test/t/wait_timeout.test''
2005-10-11 09:12:12 -07:00
unknown
a31b47cd9f Fix for bug#9270 multiple SSL race conditions (for 5.0 tree)
The fix is needed to perform locking on shared data structures
  This is modification of patch proposed by Leandro Santi
  (see http://webs.sinectis.com.ar/lesanti/misc/mysql-4.0.23a-openssl_locking.patch)


sql/mysqld.cc:
  Fix for bug#9270 multiple SSL race conditions (for 5.0 tree)
    The fix is needed to perform locking on shared data structures
2005-10-11 16:26:00 +05:00
unknown
4c3f3bd826 Fix minimum value of query_prealloc_size to be the same as its default. (Bug #13334)
mysql-test/r/variables.result:
  Add new results
mysql-test/t/variables.test:
  Add new regression test
sql/mysqld.cc:
  Fix minimum value of query_prealloc_size to be the same as its default.
2005-10-10 19:39:16 -07:00
unknown
b02c74dad8 Many files:
Added Visual Studio .Net targets and 'vcproj' files for "isam",
  "isamchk", "mysqlshutdown", "mysqlwatch" and "pack_isam"


VC++Files/mysql.sln:
  Added isam, isamchk, mysqlshutdown, mysqlwatch and pack_isam
VC++Files/isam/isam.vcproj:
  Added isam, isamchk, mysqlshutdown, mysqlwatch and pack_isam
VC++Files/isamchk/isamchk.vcproj:
  Added isam, isamchk, mysqlshutdown, mysqlwatch and pack_isam
VC++Files/mysqlshutdown/mysqlshutdown.vcproj:
  Added isam, isamchk, mysqlshutdown, mysqlwatch and pack_isam
VC++Files/mysqlwatch/mysqlwatch.vcproj:
  Added isam, isamchk, mysqlshutdown, mysqlwatch and pack_isam
VC++Files/pack_isam/pack_isam.vcproj:
  Added isam, isamchk, mysqlshutdown, mysqlwatch and pack_isam
2005-10-11 01:07:50 +02:00
unknown
a043cc536e Added missing HAVE_REPLICATION define 2005-10-10 19:23:13 +02:00
unknown
aac2575bdb Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.13372


sql/item.cc:
  Auto merged
2005-10-10 21:09:34 +05:00
unknown
5d2bc92523 BUG#12618: Removing fake locking
mysql-test/r/rpl_multi_update3.result:
  New test case
mysql-test/t/rpl_multi_update3.test:
  New test case
sql/sql_parse.cc:
  Removed fake locking
  Changed so that filtering is done later for multi-update
  Removed redundant code
sql/sql_update.cc:
  Moved call to sql_parse.cc
2005-10-10 15:10:14 +02:00
unknown
2b603902cc Bug #13611 double [TCP DEFAULT] in config.ini crashes ndb_mgmd
- Added error printout and nice exit for duplicate default sections
2005-10-10 12:27:48 +02:00
unknown
54fd083507 Makefile.am:
Copy "disabled.def"


mysql-test/Makefile.am:
  Copy "disabled.def"
2005-10-10 00:21:10 +02:00
unknown
a1f492840b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into moonbone.local:/work/7672-bug-4.0-mysql
2005-10-09 23:12:12 +04:00
unknown
f3f84ed8a0 Fix bug#7672 Unknown column error in order clause
When fixing Item_func_plus in ORDER BY clause field c is searched in all
opened tables, but because c is an alias it wasn't found there.

This patch adds a flag to select_lex which allows Item_field::fix_fields() 
to look up in select's item_list to find aliased fields.


sql/item.cc:
  Fix bug#7672 Unknown column error in order clause
  When fixing fields in ORDER BY clause allow Item_field::fix_fields() to look up items in select's item list to find aliased fields.
sql/sql_lex.cc:
   Fix bug#7672 Unknown column error in order clause
sql/sql_lex.h:
  Fix bug#7672 Unknown column error in order clause
  Added flag to select_lex allowing Item_field::fix_fields to look up items in select's item list.
sql/sql_select.cc:
  Fix bug#7672 Unknown column error in order clause
mysql-test/t/select.test:
  Test case for bug#7672 Unknown column error in order clause
mysql-test/r/select.result:
  Test case for bug#7672 Unknown column error in order clause
2005-10-09 23:05:44 +04:00
unknown
9f8cbf86d4 func_group.test:
Test requires innodb


mysql-test/t/func_group.test:
  Test requires innodb
2005-10-09 01:32:09 +02:00
unknown
0c16a7ccc7 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-10-08 16:59:08 +02:00
unknown
51907576bd Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE"
don't allow STOP SLAVE if global read lock is in taken
2005-10-08 14:46:04 +02:00
unknown
30d81f0041 Merge mysqldev@production.mysql.com:my/mysql-4.1-release
into  mysql.com:/usr/home/ram/work/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged
2005-10-07 20:34:40 +05:00
unknown
d1e71faf61 Populate t1 in order to get more predictable explain results. 2005-10-07 20:14:34 +05:00
unknown
d40a0f423f Copy zlib.a and valgrind.supp if exists.
Copy disabled.def
(Backport of Kent's change from the main tree to the 4.1.15 build clone.
Original changeset:  2005/10/07 13:08:07+02:00 kent@mysql.com )


scripts/make_binary_distribution.sh:
  Copy zlib.a and valgrind.supp if exists.
  Copy disabled.def
  (Backport of Kent's change from the main tree to the 4.1.15 build clone.)
2005-10-07 16:37:53 +02:00