Commit graph

119 commits

Author SHA1 Message Date
msvensson@pilot.mysql.com
5fb96884d1 Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my50-bug31004
into  pilot.mysql.com:/data/msvensson/mysql/bug31004/my51-bug31004
2007-11-01 16:49:39 +01:00
msvensson@pilot.mysql.com
53bc1d5c25 Bug#31004 mysqltest needs a --mkdir command
- Add new mysqltest command "mkdir" and "rmdir"
2007-11-01 15:42:19 +01:00
joerg@trift2.
6ee2fa0ff5 Manual merge: Makefile lines must start with tab, not blank. 2007-05-02 14:16:21 +02:00
joerg@trift2.
bb2996f487 Format corrections for various "Makefile.am": Leading tab, no trailing blank. 2007-05-02 14:01:49 +02:00
msvensson@pilot.blaudden
2ac94c30f4 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-23 17:01:02 +02:00
mats@romeo.(none)
06faf8f411 BUG#27779 (Slave cannot read old rows log events):
Taking code from before BUG#22583 and incorporating as events to be able
to read old events. Also incorporating old pack and unpack functions
into patch.
2007-04-12 15:50:54 +02:00
msvensson@pilot.blaudden
2218fafa1f Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-11 09:34:02 +02:00
tomas@whalegate.ndb.mysql.com
77d37e5810 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-03-30 08:37:47 +02:00
mats@romeo.(none)
e12cc44ac3 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl
2007-03-29 21:38:03 +02:00
mats@romeo.(none)
7c187c2c9b WL#3464: Add replication event to denote gap in replication
Adding an event that can be used to denote that an incident occured
on the master. The event can be used to denote a gap in the replication
stream, but can also be used to denote other incidents.

In addition, the injector interface is extended with functions to
generate an incident event. The function will also rotate the binary
log after generating an incident event to get a fresh binary log.
2007-03-29 20:31:09 +02:00
joerg@trift-lap.fambruehe
4507c6757a Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-03-29 09:41:39 +02:00
kent@mysql.com/kent-amd64.(none)
7eeae6ff13 Makefile.am:
Extended test section
  Removed duplicate EXTRA_DIST
2007-03-28 23:18:43 +02:00
msvensson@pilot.blaudden
b554258a8e Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit
- Move the link_sources command from top level Makefile into each subdir
   that need to link files
2007-03-27 23:56:48 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
2527b6ba1b fixes for 5.1-arch repository 2007-03-22 01:59:47 -07:00
msvensson@pilot.blaudden
3de9813e10 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 13:22:18 +01:00
msvensson@pilot.blaudden
00ee20edaa Add echo.c as EXTRA_DIST file 2007-02-19 13:21:06 +01:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s:
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
2006-12-31 01:02:27 +01:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files:
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
msvensson@neptunus.(none)
a6ce7b89a9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-27 10:48:41 +01:00
msvensson@neptunus.(none)
c4af2f26a7 Add mysys/my_getpagesize.c as source file for mysql_upgrade 2006-11-23 21:07:41 +01:00
msvensson@neptunus.(none)
31f50324ea Remove "yassl_dummy_link_fix" in 5.1 as well 2006-11-13 18:06:05 +01:00
msvensson@neptunus.(none)
bf020e5ea6 Bug#19817 error when try to compile PHP5.1 with mysql 5.0.21 static libs
- Most likely caused by linking with libmysqlclient using gcc and not g++.
 - Removing our "yassl_dummy_link_fix" hacks so some test programs are linked
   with gcc 
 - Remove build of non working test programs in vio
2006-11-13 17:16:37 +01:00
guilhem@gbichot3.local
375eaecf6d Fix for a compilation failure: mysqladmin_SOURCES is a needed line
in Makefile.am.
2006-11-13 16:54:47 +01:00
msvensson@neptunus.(none)
4a28dcecea Bug#23984 mysqltest on HP-UX
- Cleanup the Makefile for client
- Don't link mysqltest with mysys as it's been compiled with different flags.
2006-11-13 13:36:07 +01:00
msvensson@shellback.(none)
51b04fe458 Add mysys/my_copy.c as sources for mysqltest 2006-10-03 16:35:46 +02:00
msvensson@shellback.(none)
b9eda58afb Merge shellback.(none):/home/msvensson/mysql/my51-mysqltest-new-commands
into  shellback.(none):/home/msvensson/mysql/same_tools/my51-same_tools
2006-09-29 11:32:09 +02:00
georg@lmy002.wdf.sap.corp
9d6471c33e make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
kostja@bodhi.local
04c97488f9 Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00
msvensson@shellback.(none)
c274b51807 Add new commands to mysqltest - to make it easier to write portable test scripts 2006-07-30 19:16:51 +02:00
msvensson@neptunus.(none)
3aa99c062f Bug#10877 mysqldump should use consistent last line
- Add printout in write_footer to tell that mysqldump has completed.
   Ex: -- Dump completed 2006-07-24  8:55:05
2006-07-24 10:56:33 +02:00
igor@rurik.mysql.com
70ee1c2c6e Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-09 00:23:59 -07:00
monty@mysql.com
e50412ef38 Re-apply missing changeset, orignally pushed by elliot
Add define YASSL_PREFIX when compiling yassl

Import patch from yaSSL
- avoid allocating memory for each call to 'EVP_md5' and 
  'EVP_des_ede3_cbc' which were not released until server was stopped
- Those functions are used from the SQL function 'des_encrypt' and
  'des_decrypt'.

Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files

Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases
- Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1

- Include prefix files that renames all public functions in yaSSLs
  OpenSSL API to ya<function_name>. They will otherwise conflict
  with OpenSSL functions if loaded by an application that uses OpenSSL
  as well as libmysqlclient with yaSSL support.

Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c
  
Two threads both try a shutdown sequence which creates a race to the
de-init/free of certain resources.
  
This exists in similar form in the client as 17926: "mysql.exe crashes
when ctrl-c is pressed in windows."

Update after merge to 5.0

BUG#18669: Session COM_STATISTICS breaks mysqladmin status.
Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.

- In function 'handle_grant_struct' when searching the memory structures for an 
  entry to modify, convert all entries here host.hostname is NULL to "" and compare that 
  with the host passed in argument "user_from".
- A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into 
  memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means
  that "any host" can connect. Thus is's correct to turn on allow_all_hosts
  when such a user is found. 
- Review and fix other places where host.hostname may be NULL.

BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated
Removed duplication (not a user-visible change)
2006-06-06 14:21:07 +03:00
msvensson@shellback.(none)
20217ba36f Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init
- Include prefix files that renames all public functions in yaSSLs
   OpenSSL API to ya<function_name>. They will otherwise conflict
   with OpenSSL functions if loaded by an application that uses OpenSSL
   as well as libmysqlclient with yaSSL support.
2006-05-31 16:19:06 +02:00
serg@serg.mylan
60e3b61786 Incompatible ftparser plugin API change.
mysql_parse() and mysql_add_word() now take a MYSQL_FTPARSER_PARAM*,
not a mysql_ftparam.
2006-05-28 17:02:50 +02:00
msvensson@neptunus.(none)
40bfe246a9 Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
holyfoot@deer.(none)
5a75f865c2 bug #18115 (mysql_upgrade on Windows)
pushed in 5.0
2006-04-28 09:07:25 +05:00
jimw@mysql.com
276109b155 Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).
2006-04-11 18:54:24 -07:00
holyfoot@mysql.com
a5d18bc8ab Merging 2006-04-10 20:54:42 +05:00
knielsen@mysql.com
bc6628d27f Some changes to make it possible to build for Windows with CMake from
a normal 'make dist' source .tar.gz.
2006-03-24 22:50:56 +01:00
holyfoot@deer.(none)
9bc866d9b2 bug #18115 (mysql_upgrade missing in Windows binary) 2006-03-18 17:56:24 +04:00
kent@mysql.com
5d722a8491 Merge 2006-02-28 23:29:58 +01:00
kent@mysql.com
5484ee5815 Makefile.am:
Conditionally link with libmysqlclient.la or libmysqlclient_r.la
configure.in:
  Corrected help text for --with-debug option
  Changed default to be with thread safe client
  Added THREAD_SAFE_CLIENT to be used in 'if' in make files
2006-02-24 01:24:41 +01:00
msvensson@neptunus.(none)
4cde1d1259 Bug#17382 mysql-test-run mysqldump fails with mysqlimport 2006-02-20 13:04:40 +01:00
kent@mysql.com
4c81413932 Merge 2006-02-19 23:47:00 +01:00
brian@zim.tangent.org
faa1b42989 Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well). 2006-02-19 09:41:59 -08:00
kent@mysql.com
9aca849da1 Makefile.am:
Add an extra -lpthread before first -lc, to solve link
  problems when statically linking with glibc 2.2.5
make_win_src_distribution.sh:
  Added copying of the include/mysql directory
2006-02-18 04:23:24 +01:00
brian@zim.tangent.org
f76c047305 Made mysqlimport link against mysys so that it could make use of the safe mutex functions. 2006-02-13 04:48:14 -08:00
brian@zim.tangent.org
7f3d7af7ae Adding thread support for mysqlimport. You can now specify a number of threads to use and it will thread the loading of the database. Anyone who has had to go through the pain of loading the database will immediatly get the reason for this. 2006-02-13 00:45:59 -08:00