Commit graph

1586 commits

Author SHA1 Message Date
patg@krsna.patg.net
f1bd9c0d0a Changeset:
Changed option text in mysqldump.c
mysqldump.c:
  Changed text to read "+00:00" as opposed to "UTC" (per what the code does)
2005-10-18 18:51:07 -07:00
reggie@ugeek.(none)
600c7df8f1 readd the my_cgets call that SergeyV originally put in 2005-10-18 17:53:09 -05:00
msvensson@neptunus.(none)
0684dc1342 Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs 
   to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
2005-10-18 15:43:59 +02:00
gluh@eagle.intranet.mysql.r18.ru
7ccf861242 Fix for bug#13783 mysqlcheck tries to optimize and analyze information_schema
'information_schema' is excluded from list of databases for mysqlcheck command
2005-10-18 14:25:03 +05:00
patg@krsna.patg.net
1423db9f0c BUG# 13052 Changed text in options to TIMESTAMP 2005-10-17 12:30:01 -07:00
bar@mysql.com
e7fa41ebf7 mysql.cc:
After merge fix.
2005-10-14 14:19:15 +05:00
bar@mysql.com
aec79cc463 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2005-10-14 14:17:15 +05:00
bar@mysql.com
48238e1b90 Merge mysql.com:/usr/home/bar/mysql-4.1.b13487
into  mysql.com:/usr/home/bar/mysql-4.1
2005-10-14 14:07:22 +05:00
patg@krsna.patg.net
d86f40650f BUG# 13146
Re-application of patch to clean 5.0 tree. Fixed issue with ANSI quotes 
when dumping triggers
2005-10-13 13:42:56 -07:00
jimw@mysql.com
b6dcc55969 Fix being able to set default TCP port for command-line utilities
by using MYSQL_TCP_PORT variable. (Bug #5792)
2005-10-13 12:28:43 -07:00
patg@krsna.patg.net
a46dd41255 BUG# 13052
Clean application of patch - 
- Added --tz-utc to fix issue of dumping timestamp values between 
servers with different global time zone settings, particularly 
with regard to the day of DST changeover, which without this fix,
 would dump duplicate timestamp values.
2005-10-12 22:44:42 -07:00
lars@mysql.com
082a0bc46c Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-12 23:40:54 +02:00
lars@mysql.com
48457e0852 mysqlbin --hexdump patch 3 2005-10-12 23:37:21 +02:00
lars@mysql.com
0378009b5b Fix of incompatible types
len and packet_error needs to be of same type for (len == packet_error) to
check failures
2005-10-12 19:31:24 +02:00
msvensson@neptunus.(none)
7d29c2a4a1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
2005-10-12 13:59:00 +02:00
msvensson@neptunus.(none)
0ac28d3187 Always test ssl and compress
- Updated after review
2005-10-12 13:56:07 +02:00
monty@mysql.com
f5fdf3e87a Reviewing new pushed code
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
  (Some old systems returns ETIME and it's safer to test for both values
   than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
2005-10-12 00:58:22 +03:00
lars@mysql.com
7a94010da9 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-11 21:46:40 +02:00
monty@mysql.com
17d7ba931d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-10-08 03:37:23 +03:00
gluh@mysql.com
041eab4663 4.1 -> 5.0 merge 2005-10-07 14:26:32 +05:00
monty@mysql.com
78e828d32f Review of code pushed since last 5.0 pull:
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
2005-10-06 17:54:43 +03:00
guilhem@mysql.com
8a291efb75 The "exit" command of mysqltest is quite useful when writing tests for 4.1 so I'm porting it from 5.0 to 4.1. 2005-10-05 12:21:53 +02:00
msvensson@neptunus.(none)
cb96f195c8 Improved testing of ssl and compression
- Added show status variable "compression" for checking that compression is turned on.
 - Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections.  
 - Setup server to accept ssl connections from clients ig that is supported by server
 - New tests 
   - ssl - Run with ssl turned on
   - ssl_compress - Run with ssl and compression turned on
   - compress - Run with compression turned in 
 - Updated test 
   - openssl_1, rpl_openssl1 - Changed to run if server supports ssl
2005-10-04 15:43:55 +02:00
georg@lmy002.wdf.sap.corp
f846bc32c1 Windows compilation fix: Added typecast (const char* to char *) 2005-10-04 10:54:58 +02:00
kent@mysql.com
fe26e59d70 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-04 04:03:48 +02:00
konstantin@mysql.com
1831d62a5c Fix -ansi -pedantic compilation failure. 2005-10-03 19:44:53 +04:00
kent@mysql.com
aef1f4cd2e Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-30 22:37:55 +02:00
msvensson@neptunus.(none)
92b1d080c9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
2005-09-30 16:51:35 +02:00
kent@mysql.com
7b2e04d5a2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-09-30 16:37:02 +02:00
kent@mysql.com
21cf818a8d Many files:
New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
2005-09-30 14:03:55 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
43b544a968 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 12:36:23 +03:00
guilhem@mysql.com
fd9a6f9750 Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle. 2005-09-30 10:58:24 +02:00
lars@mysql.com
bf19d02b27 mysqlbinlog --hexdump additional patch 2
- Fixes related to Guilhems review
- Special printing of event header
2005-09-30 00:12:14 +02:00
lars@mysql.com
d81d57d408 mysqlbinlog --hexdump augments each log entry with byte information 2005-09-29 10:42:23 +02:00
kent@mysql.com
656b0cc15a Merge 2005-09-29 03:20:31 +02:00
kent@mysql.com
844d964f2d Many files:
Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
my_regex.h:
  Rename: regex/regex.h -> regex/my_regex.h
2005-09-29 02:08:24 +02:00
lenz@mysql.com
6e10a589e1 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-09-28 23:05:42 +02:00
lenz@mysql.com
972d85af8b - compile fix: don't use C++ - style comments in .c files! 2005-09-28 23:04:35 +02:00
bar@mysql.com
ceb541e4bc Bug#13487 Japanese data inside a comment causes the syntax error
mysql.cc:
  Fixed not to copy multibyte characters to the
  target string if we are inside a comment.
2005-09-28 15:46:09 +05:00
msvensson@neptunus.(none)
fbf4a5e079 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 11:34:53 +02:00
patg@krsna.patg.net
ac924f6b4f BUG #7815 - Post-review fixes required for push. 2005-09-27 09:40:51 -07:00
msvensson@neptunus.(none)
1105d4293d Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest
2005-09-27 16:48:41 +02:00
patg@krsna.patg.net
8864a9b3c4 BUG #7815
Changes per serg to http://lists.mysql.com/internals/30281

Re-enabled --delayed-insert
2005-09-26 22:43:09 -07:00
monty@mysql.com
ea6d5f9ec3 Fixed error found during review of new pushed code 2005-09-25 21:22:23 +03:00
kent@mysql.com
095efe48a5 Makefile.am, configure.in:
Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
kent@mysql.com
0cfed79ea5 Makefile.am:
Revert to shell test script for test targets
mysqltest.c:
  Windows pclose() returns error code in low byte
mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++
2005-09-24 02:42:38 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
8d3036c35e Some minor fixes revealed as warnings by
Intel compiler.
2005-09-23 21:28:56 +03:00
msvensson@neptunus.(none)
4f03ab4943 Bug #13384 mysqltest, no protocol when script contains only lines with eval 2005-09-22 21:52:04 +02:00
msvensson@neptunus.(none)
4700631aa8 Bug #13384 mysqltest, no protocol when script contains only lines with eval 2005-09-22 21:24:57 +02:00
serg@serg.mylan
306aa15391 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged
2005-09-21 17:42:44 +02:00