Commit graph

20920 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
2d5c7c42a3 Update "get_errcode_from_name"
- add missing DBUG_RETURN
 - Change type of st_error->code to uint, that should be more than enough
   to hold the error numbers between 1000 and around 2000
2006-10-04 23:34:05 +02:00
msvensson@neptunus.(none)
56ccee0f6c Only setup cmdline_myslslap if exe_mysqlslap defined 2006-10-04 23:19:06 +02:00
msvensson@neptunus.(none)
80184739ff Look for mysqlslap from 5.1, it's also available on windows 2006-10-04 23:15:04 +02:00
msvensson@neptunus.(none)
587754cab6 Use switch --old-log-format to mysqld started by im only in 5.1 and up 2006-10-04 23:07:49 +02:00
msvensson@neptunus.(none)
c243c7d866 Clean up de_before_start_master/slave 2006-10-04 23:05:12 +02:00
msvensson@neptunus.(none)
c29427ec3c Use replace_regex to mask the output of file_id= in "show binlog events" that depends on previous tests
What is this? replace_regex in 4.1! :)
2006-10-04 22:52:44 +02:00
msvensson@neptunus.(none)
6ac9c43e51 Set slave_load_path to ../../var/tmp in version prior to 5.0 to be compatible with mysql-test-run.sh 2006-10-04 22:50:34 +02:00
msvensson@neptunus.(none)
914f2bbc2a Create the mysqld.spec file with a unique name in mysql-test dir, $opt_var_dir haven't been created yet 2006-10-04 19:21:22 +02:00
msvensson@neptunus.(none)
0903a9f836 --ndb-extra-logging option to mysqld is not available until 5.1 2006-10-04 18:48:22 +02:00
msvensson@neptunus.(none)
d8191af7ee Fixup the regex's parsing the mysqld's version and variables
Add paths for ndb binaries
Some more backport issues
2006-10-04 16:28:23 +02:00
msvensson@shellback.(none)
3db774af45 Backport from 5.1
-Add support for detecting version and features from mysqld binary
 - Autodetect netware
 - Disable some features not available below 5.0
 - Cleanup executable_setup to look for one executable at a time, only llok for the ones that are needed based on the selected testcases and settings
2006-10-04 12:47:32 +02:00
msvensson@shellback.(none)
5aac9b58eb Don't print version in error message, just too messy to test 2006-10-04 12:27:05 +02:00
msvensson@neptunus.(none)
54a76f4946 Add possibility to send warnings about suspicious commands in .test file to <result_file_name>.warnings file
Move detection of "parsing enabled" to after command has been read.
Cleanup parsing enabled/disabled
2006-10-04 01:20:08 +02:00
msvensson@neptunus.(none)
89a53ef374 Fix problem when both option SSL and COMPRESS specified 2006-10-03 23:11:47 +02:00
msvensson@shellback.(none)
538e1881ce Fix typo
- Change con_host to ds_connection_name.str
2006-10-03 16:34:44 +02:00
msvensson@shellback.(none)
8f3fbd2625 Add two new result files 2006-10-03 15:48:41 +02:00
msvensson@shellback.(none)
2cea0e6b13 Update mysqltest to latest version
- ie. backport from 5.1
 - also update testcase error dected by new version
2006-10-03 15:33:44 +02:00
msvensson@shellback.(none)
2cb8215809 Merge bk-internal:/home/bk/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-09-01 10:26:01 +02:00
msvensson@shellback.(none)
324cf4ccb3 Add target to make "mtr", shortcut for running test suite 2006-09-01 10:21:08 +02:00
jimw@rama.(none)
2b8f30a764 Merge bk-internal:/home/bk/mysql-4.1-maint
into  rama.(none):/home/jimw/my/mysql-4.1-21288
2006-08-31 21:23:25 -07:00
cmiller@zippy.cornsilk.net
9c94dade04 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-08-31 12:45:49 -04:00
cmiller@zippy.cornsilk.net
2d9187fcba Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my41-no-strange-literals
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-08-31 11:30:14 -04:00
cmiller@zippy.cornsilk.net
436d3a3798 Bitkeeper's Tk interface uses UTF8 by default, so mixing charsets in a
single file is a bad practice.
2006-08-31 11:14:04 -04:00
tsmith@maint2.mysql.com
9a8ed3fe3e Merge maint2.mysql.com:/data/localhome/tsmith/bk/g41
into  maint2.mysql.com:/data/localhome/tsmith/bk/41
2006-08-31 00:23:15 +02:00
tsmith@maint2.mysql.com
4ae5e61620 Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
into  maint2.mysql.com:/data/localhome/tsmith/bk/41
2006-08-30 23:49:21 +02:00
cmiller@zippy.cornsilk.net
5a3922fbf1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my40-bug04053
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053
2006-08-30 17:33:28 -04:00
cmiller@zippy.cornsilk.net
2c356ec7db Bug#4053: too many of "error 1236: 'binlog truncated in the middle of \
event' from master"

Since there is no repeatable test case, and this is obviously wrong, this is
the most conservative change that might possibly work.  

The syscall  read()  wasn't checked for a negative return value for an
interrupted read.  The kernel  sys_read()  returns -EINTR, and the "library" 
layer maps that to return value of -1 and sets  errno  to EINTR.  It's 
impossible (on Linux) for  read()  to set errno EINTR without the return 
value being -1 .

So, if we're checking for EINTR behavior, we should not require that the
return value be zero.
2006-08-30 17:28:34 -04:00
tsmith@maint2.mysql.com
e80741b3a5 Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows 2006-08-30 22:39:23 +02:00
tsmith@maint2.mysql.com
843135ae1f portability fix in BUILD/* for solaris 2006-08-30 21:24:09 +02:00
tsmith@maint2.mysql.com
0da8a4e321 Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/40
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
2006-08-30 20:04:33 +02:00
gluh@mysql.com/gluh.(none)
af9895d4c2 Bug#20393 User name truncation in mysql client
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
2006-08-30 15:56:17 +05:00
tsmith@maint2.mysql.com
ccdda2e7ee Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  maint2.mysql.com:/data/localhome/tsmith/bk/41
2006-08-29 03:58:38 +02:00
tsmith@maint1.mysql.com
1f07fa0246 Merge maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/40
into  maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/41
2006-08-29 01:15:54 +02:00
tsmith@maint1.mysql.com
54e73e93d7 minor portability fix in SETUP.sh 2006-08-29 01:13:06 +02:00
evgen@moonbone.local
109d58af66 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-27 23:43:11 +04:00
evgen@moonbone.local
13f50fdb69 Merge moonbone.local:/work/tmp_merge-4.1-mysql
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-26 23:11:34 +04:00
msvensson@neptunus.(none)
4703f302fe Dont' ever use cluster for slave in 4.1 2006-08-26 18:38:42 +02:00
msvensson@neptunus.(none)
5abbe9eb00 Ignore --skip-im if specified on command line
Null merge to 5.0
2006-08-25 17:01:04 +02:00
msvensson@neptunus.(none)
7e8f06c46f Add mysqld-max-nt to list of mysqld executales to look for on windows 2006-08-25 15:23:42 +02:00
msvensson@neptunus.(none)
f0c4aba723 Backport from 5.0 a fix that will start ndb only for tests that needs it 2006-08-25 15:17:03 +02:00
msvensson@neptunus.(none)
31aa966718 Fix running tests suite with non standard tmp dir.
Default is "var/tmp"
2006-08-25 10:46:14 +02:00
msvensson@neptunus.(none)
655bdac0bc Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-08-25 10:11:55 +02:00
msvensson@neptunus.(none)
37be9fa3a7 Backport fix for finding executables from 5.0 2006-08-25 10:11:15 +02:00
sergefp@mysql.com
848548e16f BUG#16255: Post-review fixes: adjust the testcase. 2006-08-24 19:16:27 +04:00
sergefp@mysql.com
d4cacdb5cc Bug #16255: Subquery in WHERE (the cset by Georgi Kodinov)
Must not use Item_direct_ref in HAVING because it points to
 the new value (witch is not yet calculated for the first row).
2006-08-24 19:14:36 +04:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
13e0fa2ccf Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1-maint
2006-08-24 14:48:22 +02:00
tsmith@maint1.mysql.com
679d1e27ed Merge tim@tsmith.mysql.internal:m/bk/41
into  maint1.mysql.com:/data/localhome/tsmith/bk/41
2006-08-24 02:44:49 +02:00
tsmith/tim@siva.hindu.god
e8cbda2c27 Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41
into  siva.hindu.god:/usr/home/tim/m/bk/41
2006-08-23 18:06:07 -06:00
tsmith/tim@siva.hindu.god
45460bd0af Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets
- Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail
- Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors
2006-08-23 18:02:31 -06:00
tsmith/tim@siva.hindu.god
b8521714af Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-41
into  siva.hindu.god:/usr/home/tim/m/bk/41
2006-08-23 16:30:05 -06:00