msvensson@neptunus.(none)
b0e0040dcb
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-05 00:13:27 +02:00
msvensson@neptunus.(none)
dd2a184f69
Set the small configuration a little bit larger for 4.1
2006-10-05 00:12:54 +02:00
msvensson@neptunus.(none)
b6cc1e690f
Update result file
2006-10-05 00:00:34 +02:00
msvensson@neptunus.(none)
a920973e8b
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 23:58:23 +02:00
msvensson@neptunus.(none)
b56d31eb05
Add skip-bdb to im defaults file in 5.0
2006-10-04 23:57:31 +02:00
msvensson@neptunus.(none)
a915d6951e
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 23:49:22 +02:00
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)
965c6f3bad
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 23:19:32 +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)
28d4e7c1ae
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 23:18:03 +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)
c4ca3e8aec
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 19:21:45 +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)
d7671d0d79
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 18:48:57 +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)
6b15f7680a
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 16:30:56 +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@neptunus.(none)
f39ff057d1
Update tests and result files after running with new mysqltest that better detects problems with test files
2006-10-04 13:09:37 +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)
5cb71d48d2
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-04 01:21:03 +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)
5cdbeab88c
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-03 23:13:19 +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)
1a9db6b7fd
Merge shellback.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into shellback.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-03 16:36:26 +02: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)
538e1881ce
Fix typo
...
- Change con_host to ds_connection_name.str
2006-10-03 16:34:44 +02:00
msvensson@shellback.(none)
de8bc06266
Merge shellback.(none):/home/msvensson/mysql/same_tools/my41-same_tools
...
into shellback.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-03 16:14:23 +02:00
msvensson@shellback.(none)
4e97643423
Delete files now moved into mysqltest.test
2006-10-03 15:59:56 +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
elliot/emurphy@mysql.com/lost.local
d1fb415ad4
Temporary fix for bug#22268 (official patch will come soon)
...
Don't cap threads at 1000 on Windows any more.
2006-09-27 17:13:58 -04:00
msvensson@shellback.(none)
d8e27606e1
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 18:00:03 +02:00
msvensson@shellback.(none)
6a0841a1bc
Add definition of SHUT_RDWR for compiling on windows
2006-09-15 17:53:45 +02:00
msvensson@shellback.(none)
b0fc6840b4
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 17:09:58 +02:00
msvensson@shellback.(none)
27d8545868
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 17:00:29 +02:00
msvensson@shellback.(none)
b178e40cae
Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602
...
into shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:57:37 +02:00
msvensson@shellback.(none)
bfc3cfd4ee
Merge msvensson.mysql.internal:mysql/my50-m-bug16574
...
into shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:55:47 +02:00
msvensson@shellback.(none)
557a8f50b8
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 16:52:52 +02:00
msvensson@shellback.(none)
fb89352b47
Merge msvensson.mysql.internal:mysql/my50-m-bug16576
...
into shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:52:08 +02:00
msvensson@shellback.(none)
223c82fde2
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 16:50:08 +02:00
msvensson@shellback.(none)
a297c29243
Merge msvensson.mysql.internal:mysql/my50-m-bug21222
...
into shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:49:24 +02:00
msvensson@shellback.(none)
2c3015499d
Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 16:42:27 +02:00
hartmut@mysql.com/linux.site
4e65deb2fa
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-maint
2006-09-15 16:38:18 +02:00
hartmut@mysql.com/linux.site
871eeadc94
Add SSL specific linker flags to --libmysqld-libs (Bug #21239 )
2006-09-15 16:35:50 +02:00
msvensson@shellback.(none)
2ce0da628e
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 15:43:46 +02:00