Commit graph

533 commits

Author SHA1 Message Date
kent@mysql.com
0aaded3707 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-07 18:21:38 +01:00
msvensson@neptunus.(none)
48bef14042 Fix missing call to init_tmp_sh_file 2006-03-07 14:34:20 +01:00
msvensson@neptunus.(none)
647a940649 Enable ifdef for windows specific functions 2006-03-07 08:57:57 +01:00
msvensson@neptunus.(none)
456b2d6b14 Improve error message for faulty usage of "inc" and "dec" 2006-03-07 07:50:04 +01:00
msvensson@neptunus.(none)
f2ce7dc787 Fix typo 2006-03-06 22:18:04 +01:00
msvensson@neptunus.(none)
0cc14310e8 Remove unused var
Reduce code
2006-03-06 22:08:34 +01:00
msvensson@neptunus.(none)
a336f48552 Win fixes
- Use tmp sh file both in system and popen
2006-03-06 22:05:39 +01:00
msvensson@neptunus.(none)
3f935b2777 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 12:00:51 +01:00
reggie@big_geek.
97a4671f1f Bug #17720 Partition ALTER TABLE fails on rename of .MYI file
Fix this by passing the HA_EXTRA_PREPARE_FOR_DELETE onto the newly added or about to be dropped partitions
so they have an opportunity to close their OS file handle.
2006-03-04 14:21:27 -06:00
paul@snake-hub.snake.net
53ea1584bc Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1-clone
2006-03-03 14:41:55 -06:00
paul@snake-hub.snake.net
1442be9798 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-clone
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
2006-03-03 14:37:43 -06:00
paul@snake-hub.snake.net
f3cf52832d mysqltest.c:
Typos.
2006-03-03 14:34:30 -06:00
paul@snake-hub.snake.net
f3c7e2d3ed mysqltest.c:
Better fix for do_sleep().
2006-03-03 13:57:49 -06:00
msvensson@neptunus.(none)
21cc7c9555 Windows fixes
- Use pipes "|"
 - Improved system command, create a temporary .sh faile that is executed  with cygwins sh(bash)
   This makes the Windows version behave exactly as the Lunix version(well almost...) 
 - Give unix path to DBUG, trace files is no produced if running ./mysql-test-run.pl --debug"
2006-03-03 14:55:05 +01:00
msvensson@neptunus.(none)
f601d26961 Remove superfluous DBUG_PRINT 2006-03-02 17:33:34 +01:00
msvensson@neptunus.(none)
52d51e5e26 Make the "system" command become executed in a bash shell in cygwin. 2006-03-02 16:28:45 +01:00
msvensson@neptunus.(none)
e4b6f64a16 Make do_block return void, return value never used. 2006-03-02 11:10:29 +01:00
msvensson@neptunus.(none)
ff391e9fe1 Fix unsigned warning on windows 2006-03-02 11:08:43 +01:00
paul@snake-hub.snake.net
1986796849 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-28 15:14:31 -06:00
paul@snake-hub.snake.net
67e4580e29 mysqltest.c:
expand tab
2006-02-28 15:11:44 -06:00
paul@snake-hub.snake.net
d8a6e41c6b Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 15:09:45 -06:00
paul@snake-hub.snake.net
d6654fe9cb mysql-test-run.sh:
Fix URLs.
README:
  Fix URL.
mysqltest.result:
  Update test result for real_sleep error message.
mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.
2006-02-28 15:08:16 -06:00
paul@snake-hub.snake.net
49de5254f3 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-28 14:05:20 -06:00
paul@snake-hub.snake.net
7ff2ede8c9 mysqltest.c:
Fix reference to incorrect (non-existent) options in comment.
2006-02-28 14:04:21 -06:00
paul@snake-hub.snake.net
486bd42b06 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 14:01:16 -06:00
paul@snake-hub.snake.net
fc8ed82da4 mysqltest.c:
Correct/clarify comments.
2006-02-28 14:00:17 -06:00
paul@snake-hub.snake.net
c28c6aa953 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-28 12:20:48 -06:00
paul@snake-hub.snake.net
a052ef7d82 mysqltest.c:
Fix typos.
2006-02-28 12:19:30 -06:00
paul@snake-hub.snake.net
a2c639d813 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 12:10:38 -06:00
paul@snake-hub.snake.net
6d4dc91bbf mysqltest.c:
Fix typos.
2006-02-28 12:01:24 -06:00
dlenev@mysql.com
8dbdf5237e Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:00:07 +03:00
msvensson@neptunus.(none)
90e5ca96be Look for and "convert" paths that start with $MYSQL_TMP_DIR 2006-02-26 19:54:09 +01:00
paul@snake-hub.snake.net
082e9ddbe3 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-23 13:56:00 -06:00
paul@snake-hub.snake.net
b11c033f49 mysqltest.c:
Rearrange out of order options in option struct.
2006-02-23 13:54:55 -06:00
msvensson@neptunus.(none)
3ece1f3eda Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 10:54:56 +01:00
msvensson@neptunus.(none)
5c4bf37259 Merge fixup 2006-02-23 10:35:53 +01:00
msvensson@neptunus.(none)
f80555880a Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-23 10:30:31 +01:00
msvensson@neptunus.(none)
ec91a79c9f Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched. 2006-02-23 10:11:57 +01:00
msvensson@neptunus.(none)
8e760bc6cc Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 10:37:10 +01:00
msvensson@neptunus.(none)
40fe710394 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:40:18 +01:00
msvensson@neptunus.(none)
8e9d535676 Merge neptunus.(none):/home/msvensson/mysql/bug13809/my51-bug13809
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 09:11:59 +01:00
msvensson@neptunus.(none)
6006c9ac36 Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:11:03 +01:00
msvensson@neptunus.(none)
3d1f99f8f9 Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809
into  neptunus.(none):/home/msvensson/mysql/bug13809/my51-bug13809
2006-02-21 09:09:54 +01:00
msvensson@neptunus.(none)
3764d3dab1 Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:55:13 +01:00
msvensson@neptunus.(none)
ac336241b3 Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
into  neptunus.(none):/home/msvensson/mysql/bug16795/my51-bug16795
2006-02-21 08:54:08 +01:00
msvensson@neptunus.(none)
40fca5ca11 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
2006-02-20 15:06:18 +01:00
msvensson@neptunus.(none)
6a8be78acc Merge fix 2006-02-20 15:05:23 +01:00
msvensson@neptunus.(none)
ae174fbef8 Fix typo 2006-02-20 12:05:45 +01:00
kent@mysql.com
0120bac7f6 mysql-test-run.pl:
Added --restart-cleanup option
drop-on-restart.inc:
  DROP commands to cleanup on restart
  new file
mysqltest.c:
  Added option --include=<sql-file>
2006-02-20 00:32:07 +01:00
msvensson@neptunus.(none)
01cd7a05c7 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
2006-02-17 12:16:36 +01:00