msvensson@neptunus.(none)
3a4491c70a
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-08 16:50:54 +01:00
msvensson@neptunus.(none)
3e43b86329
Add missing space
2006-12-08 16:48:49 +01:00
msvensson@neptunus.(none)
9064723d1b
Bug#19410 Test 'kill' fails on Windows + SCO
...
- Use "mysql_field_count" to determine if there is a need to
call "mysql_store_result"
2006-12-08 16:43:50 +01:00
msvensson@neptunus.(none)
40927c0cb2
Bug#24498 Stack overflow in mysqltest
...
- Thanks to Vasil Dimov for the patch!
2006-12-08 16:08:54 +01:00
msvensson@neptunus.(none)
94eb027f6b
Only call mysql_server_end if mysql_server_init has been called.
...
Remove DBUG_ENTER in my_end
2006-12-06 23:43:36 +01:00
msvensson@neptunus.(none)
6d71f74743
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883
2006-12-05 18:46:08 +01:00
msvensson@neptunus.(none)
2f79d20bc3
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:36:53 +01:00
msvensson@neptunus.(none)
128b73fc36
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
544d0c909b
mysqltest
...
Close any statements that might be open before program exit
Close any statments that might be open when calling "disable_ps_protocol"
2006-12-04 19:16:55 +01:00
msvensson@neptunus.(none)
33c248eee5
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:06:42 +01:00
msvensson@neptunus.(none)
c2488ba10f
Bug#24389 mysqltest: Could not open connection 'default': 2013 Lost connection to MySQL
...
- Add CR_CONN_HOST_ERROR to list of errorcode that trigger another connection
attempt in mysqltest
2006-12-04 15:48:34 +01:00
df@kahlann.erinye.com
da7820c37d
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-01 13:02:54 +01:00
monty@mysql.com/narttu.mysql.fi
601e6f4b2a
Fixed compiler warnings
...
Don't assert if my_thread_end() is called twice (common case)
2006-11-30 21:56:03 +02:00
msvensson@neptunus.(none)
f883d68ad6
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-30 10:57:40 +01:00
msvensson@neptunus.(none)
a743e17d8c
Add "chmod" command to mysqltest
2006-11-30 10:54:50 +01:00
msvensson@neptunus.(none)
d3090cc3fe
Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-29 23:08:35 +01:00
msvensson@neptunus.(none)
db863d826c
Add command "chmod" to mysqltest
2006-11-29 23:02:06 +01:00
holyfoot/hf@mysql.com/deer.(none)
0434b70f3a
Merge mysql.com:/home/hf/work/thfix/my41-thfix
...
into mysql.com:/home/hf/work/thfix/my50-thfix
2006-11-29 09:24:35 +04:00
holyfoot/hf@mysql.com/deer.(none)
0b614d0025
fixed compilation failure on hpux
...
the problem is that client tools are compiled with UNDEF_THREADS_HACK
flag, and my thread-related additions to the mysqltest.c can't be compiled.
Easy solution is to disable these in not-embedded case completely.
2006-11-29 09:23:54 +04:00
msvensson@neptunus.(none)
cc747a02b3
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 21:11:05 +01:00
msvensson@neptunus.(none)
04d5a42bbf
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 20:59:57 +01:00
msvensson@neptunus.(none)
f25590d8b7
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-21 16:50:40 +01:00
msvensson@neptunus.(none)
fe0fc2d637
Merge 192.168.0.4:mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-21 16:42:07 +01:00
msvensson@neptunus.(none)
9594462f72
Remove unused variable
2006-11-21 16:34:10 +01:00
msvensson@shellback.(none)
a9eb1b709a
Add missing semicolon
2006-11-21 09:36:29 +01:00
msvensson@shellback.(none)
4dc0aeb7b6
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-20 23:38:22 +01:00
msvensson@shellback.(none)
3b57cf0f74
Fix mysqltest to automatically replace \ with / also in
...
$MYSQLTEST_VARDIR, for usage of vardir=e:/var<nnn> on windows
2006-11-20 21:03:40 +01:00
holyfoot/hf@mysql.com/deer.(none)
e95e23b0f3
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/mysql-5.0-0mrg
2006-11-17 10:30:16 +04:00
holyfoot/hf@mysql.com/deer.(none)
497ccd6b87
Merge mysql.com:/home/hf/work/mysql-4.1-mrg
...
into mysql.com:/home/hf/work/mysql-5.0-mrg
2006-11-16 23:16:44 +04:00
holyfoot/hf@mysql.com/deer.(none)
2963d8ddd2
merging
2006-11-16 21:23:34 +04:00
holyfoot/hf@mysql.com/deer.(none)
db5db841a9
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mysql-4.1-mrg
2006-11-16 20:44:37 +04:00
msvensson@neptunus.(none)
4dfbc712ed
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-08 22:54:22 +01:00
msvensson@neptunus.(none)
1437500c1b
Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine.
2006-11-08 22:53:40 +01:00
msvensson@neptunus.(none)
fa79d0fccb
Fix DBUG_PRINT in mysqltest, the real value to print is in ds_cmd
2006-11-03 16:06:13 +01:00
msvensson@shellback.(none)
64eb65533e
Make variables static to please Netware compiler
2006-10-31 18:51:23 +01:00
msvensson@neptunus.(none)
c972edc663
Enable the ATTRIBUTE_FORMAT macros to check format of variable arg parameters
2006-10-24 13:34:10 +02:00
holyfoot/hf@mysql.com/deer.(none)
97df0fce16
WL#3475 merging
2006-10-24 15:28:16 +05:00
holyfoot/hf@mysql.com/deer.(none)
836e159ff3
merging fix
2006-10-24 12:35:32 +05:00
holyfoot/hf@mysql.com/deer.(none)
cd5684543c
Merge mysql.com:/home/hf/work/w3475/my41-w3475
...
into mysql.com:/home/hf/work/w3475/my50-w3475
2006-10-23 16:50:01 +05:00
holyfoot/hf@mysql.com/deer.(none)
4d23559806
WL#3475 (Threads for the embedded server in mysqltest)
...
Necessary code added to mysqltest.c.
Disabled tests are available now.
2006-10-23 15:02:51 +05:00
msvensson@neptunus.(none)
9a5b4a1151
Add command "exit" to mysqltest, it will stop processing any more
...
commands and go directly to result file processing
2006-10-19 13:34:09 +02:00
msvensson@shellback.(none)
a9e60bab29
Use char as datatype for the byte that are read with my_fgetc, fixes problem with
...
mysqltest.test on Solaris and Mac. write_file produced nice files with all zeroes.
2006-10-14 17:09:06 +02:00
msvensson@shellback.(none)
d8b9f7cb0e
Improving debugging support in 'read_line' function
2006-10-14 17:02:43 +02:00
msvensson@shellback.(none)
de3f217e10
Use 'my_strnncoll_simple' instead of 'strncasecmp'
2006-10-13 11:38:32 +02:00
msvensson@shellback.(none)
889e7147f6
Add ATTRIBUTE_FORMAT specifier to _db_doprnt, which is used by DBUG_PRINT
...
This will hopefully avoiid annoying crashes when running with --debug
Fix warnings from the above in mysqltest.c
2006-10-12 20:15:56 +02:00
msvensson@shellback.(none)
6c31690bbd
Move the reconnect variable to beginning of function
...
Fix warning about value from "*ptr++" not being used. Changed it to ptr++
2006-10-12 13:50:50 +02:00
msvensson@shellback.(none)
71cb0e8dc5
Only print cur_file->filename if cur_file->file is set
...
MOve DBUG_ASSERT(result_file_name) to after DBUG_ENTER
Change type of "reconnect" variable from int to my_bool, reconnect didn't work on Solaris without that
2006-10-12 10:49:59 +02:00
msvensson@shellback.(none)
5b8312986c
Fixes for embedded server test
2006-10-11 21:53:43 +02:00
msvensson@shellback.(none)
f807b6e893
Fix some bad code in mysqltest.c which cause segfault
2006-10-11 11:21:44 +02:00
msvensson@shellback.(none)
8a84753acf
vsnprintf is not available on win2003-x86 host, as this is just a debug functionality - disable it for now.
2006-10-08 16:19:23 +02:00