Commit graph

33938 commits

Author SHA1 Message Date
unknown
23fbae1f19 Put the DBUG_DUMP inside ifdef DEBUG_DATA_PACKETS 2006-12-14 21:48:08 +01:00
unknown
266d2ea447 change all auto_ptr in yaSSL to mySTL since some lack reset
extra/yassl/src/ssl.cpp:
  change all auto_ptr to mySTL since some lack reset
2006-12-13 23:30:20 +01:00
unknown
bb5457ae7a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
2006-12-11 17:04:14 +01:00
unknown
58558f0686 Wait for INSERT DELAYED to finish i.e sleep in while loop until
"select count" is one more.
2006-12-11 16:43:21 +01:00
unknown
4693771f28 Bug#20225 mysqltest runs in an endless loop when trying to start rpl_sys test suite
- Add printout in safe_connect indicating that mysqltest is in a loop waiting for
connection to mysqld. Will be printed when --verbose is passed as argument to
  mysqltest


client/mysqltest.c:
  Bug#20225 mysqltest runs in an endless loop when trying to start rpl_sys test suite
   - Add printout in safe_connect indicating that mysqltest is in a loop waiting for
  connection to mysqld
2006-12-11 15:39:15 +01:00
unknown
49b4cf286f Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-11 13:12:54 +01:00
unknown
0295084e49 Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-11 13:08:05 +01:00
unknown
a63a66cb46 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-12-11 12:33:44 +01:00
unknown
0ce5985f11 Pass --no-defaults to embedded server to avoid that it reads any defaults file
mysql-test/mysql-test-run.pl:
  Pass "--no-defaults" to embedded server as "--server-arg=--no-defaults"
2006-12-11 12:16:20 +01:00
unknown
bf6239c9aa Fix merge error in mysql-test/Makefile.am
mysql-test/Makefile.am:
  Fix merge error
2006-12-11 12:06:12 +01:00
unknown
721b8f87f2 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


sql/sql_class.h:
  Auto merged
2006-12-11 11:28:11 +01:00
unknown
29ff97f8cc Bug#23735 mysqlbinlog client fails when reading binlog from stdin
- Windows opens stdin in text mode by default. Certain characters
   such as CTRL-Z are interpeted as events and the read() method
   will stop. CTRL-Z is the EOF marker in Windows. to get past this
   you have to open stdin in binary mode. Setmode() is used to set
   stdin in binary mode. Errors on setting this mode result in
   halting the function and printing an error message to stderr.


client/mysqlbinlog.cc:
  Apply fix to 5.0 as well
2006-12-11 11:25:45 +01:00
unknown
fdf1a6332c Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/41
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50


sql/sql_class.h:
  Auto merged
Makefile.am:
  Manual merge.
2006-12-08 16:26:41 -07:00
unknown
b8151c7e44 Makefile.am
- test* targets are identical (as much as possible) to 5.0 & 5.1 versions
    - use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
    - PHONY: target includes all test targets


Makefile.am:
  - test* targets are identical (as much as possible) to 5.0 & 5.1 versions
  - use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
  - PHONY: target includes all test targets
2006-12-08 16:17:46 -07:00
unknown
3288ddf671 Merge polly.local:/tmp/maint/bug24261/my50-bug24261
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


mysql-test/r/func_in.result:
  Auto merged
mysql-test/t/func_in.test:
  Auto merged
sql/opt_range.cc:
  Auto merged
2006-12-08 22:38:03 +03:00
unknown
8ba0259a5f Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/t/kill.test:
  Auto merged
2006-12-08 17:09:43 +01:00
unknown
0abeff727d Bug#19410 Test 'kill' fails on Windows + SCO
mysql-test/t/kill.test:
  Move the connect of second connection to just before the query to be killed are sent.
  This introduces less variance since the connect time is not included in the delay
  we want between send of query and kill.
2006-12-08 17:09:07 +01:00
unknown
47b8d63d47 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqladmin.test:
  Auto merged
sql/sql_class.h:
  Auto merged
2006-12-08 16:50:54 +01:00
unknown
8fc4864ed7 Add missing space 2006-12-08 16:48:49 +01:00
unknown
e8d82549af Bug#19410 Test 'kill' fails on Windows + SCO
- Use "mysql_field_count" to determine if there is a need to
   call "mysql_store_result"


client/mysqltest.c:
  Only call 'mysql_store_result' if 'mysql_field_count' is greater than 0
  indicating that this query has a result set.  This change is mainly since
  if mysql_store_result fails the value returned by mysql_field_count will be reset.
2006-12-08 16:43:50 +01:00
unknown
33a098bf76 Bug#24498 Stack overflow in mysqltest
- Thanks to Vasil Dimov for the patch!


client/mysqltest.c:
  Use my_snprintf to protect against exceeding size of buff
  Since variable name and valu might not be null terminated it's necessary to
  provide the length of the format specifiers.
2006-12-08 16:08:54 +01:00
unknown
ca1aebbd57 Backport fix for mysqladmin on windows test failure 2006-12-08 13:37:40 +01:00
unknown
9a864bb70a Fix problems with "make dist" and running from "binary dist"
mysql-test/Makefile.am:
  Add missing ($DESTDIR) wich cause "make discheck" to fail
scripts/make_binary_distribution.sh:
  Add std_data/*.MY* files to binary dist
2006-12-08 12:13:43 +01:00
unknown
8b5787fa4a Having MYSQL_VERSION_ID defined correctly made this KILL_QUERY enum item visible. This is a
forwards-incompatible change.
2006-12-07 12:53:32 -05:00
unknown
ae9596ad1b Merge jpipes@bk-internal:/home/bk/mysql-5.0-maint
into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
2006-12-07 08:52:59 -05:00
unknown
dae79371d8 Merge shakedown.(none):/home/jpipes/dev/bug20246/my41-bug20246
into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint


include/mysql.h:
  Auto merged
2006-12-07 08:49:53 -05:00
unknown
9e48e73f9a Fix for Bug (enum mysql_enum_shutdown_level not well-defined in mysql_com.h)
MYSQL_VERSION_ID is tested before it has been defined.  This leads to
a warning when compiling with -Wundef and it also will break the
internal logic of mysql_com.h as soon as MYSQL_VERSION_ID exceeds
50000.

The fix entailed a simple re-ordering of included files in mysql.h


include/mysql.h:
  Fix for Bug  (enum mysql_enum_shutdown_level not well-defined in mysql_com.h)
  
  MYSQL_VERSION_ID is tested before it has been defined.  This leads to
  a warning when compiling with -Wundef and it also will break the
  internal logic of mysql_com.h as soon as MYSQL_VERSION_ID exceeds
  50000.
  
  Placed the #include for mysql_version.h above mysql_com.h to resolve conflict
2006-12-06 19:13:00 -05:00
unknown
d5e094d798 Only call mysql_server_end if mysql_server_init has been called.
Remove DBUG_ENTER in my_end


client/mysqltest.c:
  Call 'mysql_server_end' as last function in 'free_used_memory'
  Don't use DBUG_VOID_RETURN after mysql_server_end in free_used_memory
  Only call mysql_server_end if mysql_server_init has been called
2006-12-06 23:43:36 +01:00
unknown
ca7ee3755f Flush stderr after print of error message to get predictable output 2006-12-06 22:03:56 +01:00
unknown
c0efc71780 Adjust replace to mask win paths 2006-12-06 16:44:31 +01:00
unknown
8ef1be3de8 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-05 19:56:49 +01:00
unknown
c586037a45 Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-05 19:47:24 +01:00
unknown
429cf98807 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-12-05 19:14:09 +01:00
unknown
b121562b38 Remove hack that removes vardir 2006-12-05 19:13:31 +01:00
unknown
00cfa1c0f2 Merge bk-internal:/home/bk/mysql-4.1-build
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-12-05 19:12:12 +01:00
unknown
afba0de814 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883
client/mysqltest.c:
  Exclude
2006-12-05 18:46:08 +01:00
unknown
eb765373f9 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-12-05 10:33:11 -05:00
unknown
8766e95430 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


sql/sql_class.cc:
  Auto merged
2006-12-05 10:32:38 -05:00
unknown
784f0aab0c Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836


sql/sql_class.cc:
  manual merge
2006-12-05 09:39:48 -05:00
unknown
1d216487e1 Bug#20836 Selecting into variables results in wrong results being returned
- Comment Cleanup.


sql/sql_class.cc:
  Removed misleading comment.
2006-12-05 09:29:32 -05:00
unknown
c7457bdf93 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-05 11:18:00 +01:00
unknown
5f2e2a5c5c re-enable multiple test runs in sequence for 4.1 on non-windows
mysql-test/mysql-test-run.pl:
  delete $default_vardir if the 4.1 vardir trick is to be used to re-enable more than one test run in sequence
2006-12-05 10:03:24 +01:00
unknown
96fa010c66 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-05 06:38:08 +01:00
unknown
fa52873b35 Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
into  kpdesk.mysql.com:/home/thek/dev/tmp/mysql-5.0-maint
2006-12-04 23:51:54 +01:00
unknown
3b8e73fb2d Disabled flush2 until pushbuild framework can handle test which
disables binlog.


mysql-test/t/disabled.def:
  disabled test flush2.
2006-12-04 22:46:12 +01:00
unknown
ea67b2fd3e Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


sql/sql_class.h:
  Auto merged
2006-12-04 15:33:53 -05:00
unknown
d0482fee0a Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2006-12-04 15:32:16 -05:00
unknown
cd38313c5c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
2006-12-04 19:36:53 +01:00
unknown
2e5a6f9eaa Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
Docs/Makefile.am:
  Auto merged
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/Makefile.am:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_handler.cc:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Manual merge with import of upstream yaSSL
2006-12-04 19:28:38 +01:00
unknown
9f1fa169c5 mysqltest
Close any statements that might be open before program exit
Close any statments that might be open when calling "disable_ps_protocol"


client/mysqltest.c:
  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