Commit graph

21556 commits

Author SHA1 Message Date
unknown
045158fc28 Fix for bug #10798: If relay log fails to rotate, slave will crash after
The relay log may not be open for some reason (e.g. disk error) after rotation,
and using it causes the slave crash.

Fix: check we have it open before access, return error otherwise.


sql/slave.cc:
  Fix for bug #10798: If relay log fails to rotate, slave will crash after
    - check if the relay log is open before any access.
2006-12-18 17:38:59 +04:00
unknown
3c04f839b9 support /etc/mysql/my.cnf in mysqld_multi as well. 2006-12-15 16:17:10 -08:00
unknown
449450804b Added support for /etc/mysql after /etc in the search path for my.cnf
bug #25104


mysys/default.c:
  Added support for /etc/mysql after /etc in the search path for my.cnf
2006-12-15 12:25:09 -08:00
unknown
7579130d2d Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
2006-12-15 11:38:41 -08:00
unknown
c804680134 Added support for sensible-editor from Debian, instead of emacs. 2006-12-15 10:57:58 -08:00
unknown
08dc2dcb5a Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint


mysql-test/r/myisam.result:
  SCCS merged
2006-12-15 07:59:09 +01:00
unknown
af38c456a2 Bug#17498 failed to put data file in custom directory use "data directory" option
- Result file was not properly committed.
- Update result file to match the new test case.


mysql-test/r/myisam.result:
  Bug#17498 failed to put data file in custom directory use "data directory" option
  
  - Update result file to match the new test case.
2006-12-15 07:56:01 +01:00
unknown
a6f4c958ca myisam.result: a test was moved from the .test file, but the results were not updated.
mysql-test/r/myisam.result:
  Fix results file - a test was moved from the .test file, but the results were not updated.
mysql-test/r/symlink.result:
  echo End of 4.1 tests while I'm here
mysql-test/t/myisam.test:
  echo End of 4.1 tests while I'm here
mysql-test/t/symlink.test:
  echo End of 4.1 tests while I'm here
2006-12-14 16:23:54 -07:00
unknown
b6eaf8cb2c Change permissions on $mysql_unix_port_dir if we create it so that everyone can access it. 2006-12-14 12:18:36 -08:00
unknown
833b235b18 Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2006-12-14 16:09:15 +01:00
unknown
e21242fef8 Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
into  naruto.:C:/cpp/mysql-4.1-maint
2006-12-14 16:02:43 +01:00
unknown
c4b2bee9a1 Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint


mysql-test/t/myisam.test:
  SCCS merged
2006-12-14 15:30:00 +01:00
unknown
e524063bee Bug#17498 failed to put data file in custom directory use "data directory" option
- When this bug was corrected it changed the behavior 
  for data/index directory in the myisam test case.
- This patch moves the OS depending tests to a non-windows
  test file.


mysql-test/r/myisam.result:
  moved test from myisam to symlink; new result file
mysql-test/r/symlink.result:
  moved test from myisam to symlink; new result file
mysql-test/t/myisam.test:
  moved test from myisam to symlink
mysql-test/t/symlink.test:
  moved test from myisam to symlink
2006-12-14 13:23:31 +01:00
unknown
ddb182e53d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug22377/my41-bug22377
2006-12-13 14:05:29 +04: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
e78b4fc276 Merge naruto.:C:/cpp/bug17489/my41-bug17489
into  naruto.:C:/cpp/mysql-4.1-maint
2006-12-11 13:06:59 +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
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
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
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
1267a7fb3c Bug#17498 failed to put data file in custom directory use "data directory" option
- Using DATA/INDEX DIRECTORY option on Windows put data/index file into
  default directory because the OS doesn't support readlink().
- The procedure for changing data/index file directory is 
  different under Windows.
- With this fix we report a warning if DATA/INDEX option is used,
  but OS doesn't support readlink().


mysql-test/r/windows.result:
  - updated result file.
mysql-test/t/windows.test:
  - Added test case to verify we get warnings if we specify DATA/INDEX
    DIRECTORY on a platform which doesn't support readlink().
sql/sql_parse.cc:
  - Added warnings if DATA/INDEX DIRECTORY option is used but not supported
    by the target platform.
2006-12-07 17:01:00 +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
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
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
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
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
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
c0612e453e Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


Makefile.am:
  Auto merged
client/mysqltest.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:06:42 +01:00
unknown
33fc8d5064 Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:01:31 +01:00
unknown
d2f1fd793b 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


client/mysqltest.c:
  Add CR_CONN_HOST_ERROR to errorcodes that trigger a reconnect
2006-12-04 15:48:34 +01:00
unknown
6b9d3ccb8b Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  example.com:/work/bug24395-v2/my41


myisam/mi_open.c:
  Auto merged
2006-12-01 23:11:44 +01:00
unknown
0184996b99 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2006-12-01 10:36:42 +01:00
unknown
5af42c1b25 minor fix to mtr_process.pl
mysql-test/lib/mtr_process.pl:
  print extra message _once_ every 60 seconds
2006-11-30 13:16:12 +01:00
unknown
7c9c5409a3 Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-11-30 12:20:24 +01:00
unknown
d242920922 Merge neptunus.(none):/home/msvensson/mysql/bug10608/my41-bug10608
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-30 11:58:23 +01:00
unknown
708bce0a97 Add "chmod" command to mysqltest 2006-11-30 10:54:50 +01:00
unknown
73079a2406 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
2006-11-30 01:58:57 +03:00
unknown
acce5337ec Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-29 22:50:10 +01:00
unknown
7bc069d164 After 5.1.6 just turn on logging, it will be sent to tables by default 2006-11-29 22:49:02 +01:00
unknown
3b1abddb25 Makefile.am:
Remove soft links before creating source TAR, to avoid file copies (bug#11865)


Makefile.am:
  Remove soft links before creating source TAR, to avoid file copies (bug#11865)
2006-11-29 20:22:58 +01:00
unknown
dee6b16555 Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt
2006-11-29 15:19:13 +01:00
unknown
0e7aae419b Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt
2006-11-29 11:16:50 +01:00
unknown
d765ed0c37 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2006-11-29 10:35:15 +01:00
unknown
3344298d19 minor fix
mysql-test/mysql-test-run.pl:
  remove dependency on Data::Dumper, it's not used anywhere
2006-11-29 10:21:59 +01:00
unknown
af6185240a 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.


client/mysqltest.c:
  it's used in embedded server only
2006-11-29 09:23:54 +04:00
unknown
760bd9d166 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  bodhi.local:/opt/local/work/mysql-4.1-runtime


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
2006-11-29 02:39:17 +03:00