1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-03 14:33:32 +03:00
Commit Graph

6409 Commits

Author SHA1 Message Date
unknown
befbebcfdb Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


client/mysqltest.c:
  Auto merged
Makefile.am:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
2006-11-28 21:11:05 +01:00
unknown
e3a9d94935 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-28 20:00:54 +01:00
unknown
e8d8ddadac Look for client binaries also in bin/ directory 2006-11-28 20:00:27 +01:00
unknown
90c57042b6 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-28 19:54:52 +01:00
unknown
92ac0e73dd Create new function "run_testcase_mark_logs' and use it to mark start of testcase
in all cuurently known log files
2006-11-28 19:54:16 +01:00
unknown
a60fe75f54 Only force mysqld to use log file up until 5.1.6
After that it will by default use log tables. That setting can be overruled
by adding a -master.opt file like mysql_client_test has.
2006-11-28 19:10:39 +01:00
unknown
c4558b8829 Remove the check for writable var dir, it has to be done later on 2006-11-28 16:24:31 +01:00
unknown
f3d2382ed8 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-28 16:23:13 +01:00
unknown
039f806afe Add warnings and more error checks in the creation of vardirs 2006-11-28 16:22:59 +01:00
unknown
d55f97d43d 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-28 15:54:23 +01:00
unknown
dc48e348d4 Some more checks to avoid removing unwanted directories. 2006-11-28 15:51:52 +01:00
unknown
6ee057c676 No need to have a "created_by_mem" file, just read the link and
if that is same as opt_mem it can be removed
2006-11-28 15:39:23 +01:00
unknown
3bf4108ea9 Rename function datadir_setup to datadir_list_setup to avoid mixup
with the function where vardir's are created
2006-11-28 15:15:01 +01:00
unknown
e1df89ffbb 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-28 13:57:42 +01:00
unknown
af46f14503 Bug#24354 option "--extern" of mysql-test-run.pl does not work anymore
- Better control of when to create/remove vardir


mysql-test/mysql-test-run.pl:
  Split the part the function cleanup_stale_files in two parts
    - one that removes any old var directories
    - one that setup var in te proper location
  
  If running against extern server and no vardir has been created in the specified
  location, run the latter function to create the vardir structure. Else print
  message saying the vardir already exists and continue.
2006-11-28 13:57:07 +01:00
unknown
58c571a493 Fix problem with mysqladmin logging to var/log before var has been created
And if var/ has been created, it will be recreated later so the logs
from "mtr_kill_leftovers" will be lost anyway  


mysql-test/mysql-test-run.pl:
  Don't create vardir before mtr_kill_leftovers
mysql-test/lib/mtr_process.pl:
  Send output - if any - from mysqladmin to stdout/stderr. There shouldn't
  be any such errors and if any occur, it's good to know about them.
2006-11-28 12:36:26 +01:00
unknown
f4fc220727 Backport of patch for bug#24471
mysql-test/lib/mtr_report.pl:
  Don't output "skipped" comment if there is none (bug#24471)
mysql-test/mysql-test-run.pl:
  Removed "use diagnostics", reduces Perl speed significantly. Can be
  enabled with "perl -Mdiagnostics mysql-test-run.pl".
2006-11-28 12:33:36 +01:00
unknown
8f813df45c Fix problem with mysqladmin logging to var/log before var has been created
And if var/ has been created, it will be recreated later so the logs will
be lost  


mysql-test/lib/mtr_process.pl:
  Send output - if any - from mysqladmin to stdout/stderr. There shouldn't
  be any such errors and if any occur, it's good to know about them.
mysql-test/mysql-test-run.pl:
  Don't create vardir before mtr_kill_leftovers
2006-11-28 11:43:56 +01:00
unknown
4532ac3b14 Backport of patch for bug#24471
mysql-test-run.pl:
    Removed "use diagnostics", reduces Perl speed significantly. Can be
    enabled with "perl -Mdiagnostics mysql-test-run.pl".
mtr_report.pl:
   Don't try output "skipped" comment if there is none (bug#24471)


mysql-test/lib/mtr_report.pl:
  Don't try output "skipped" comment if there is none (bug#24471)
mysql-test/mysql-test-run.pl:
  Removed "use diagnostics", reduces Perl speed significantly. Can be
  enabled with "perl -Mdiagnostics mysql-test-run.pl".
2006-11-28 10:31:07 +01:00
unknown
eb63927caa Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/kent/bk/mysql-4.1-merge
2006-11-27 21:38:53 +01:00
unknown
6de6b97eee fixes for mtr_unique.pl
mysql-test/lib/mtr_unique.pl:
  - add info message to mtr_require_unique_id_and_wait as suggested
  - fix for security issue
  - locks for pids of processes that don't exist anymore are reused, if ps is present and working as expected
2006-11-24 15:36:04 +01:00
unknown
6f637271bc Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-24 13:39:41 +01:00
unknown
e703227a23 Fix merge conflicts 2006-11-24 13:39:09 +01:00
unknown
4d2665f01e Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
traces in Valgrind (broken libc6-dbg).
Installing libc6-dbg on Debian will still provide proper bactraces, even
without setting LD_LIBRARY_PATH explicitly.


mysql-test/lib/mtr_io.pl:
  Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
  traces in Valgrind.
mysql-test/mysql-test-run.pl:
  Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
  traces in Valgrind.
2006-11-24 12:38:39 +01:00
unknown
87e3047501 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/Makefile.am:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge of changes for RPM
2006-11-24 12:12:25 +01:00
unknown
de9980f4c6 Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-24 12:04:58 +01:00
unknown
7695cab8aa Make source_dist a "local" global variable
And it's not an "opt"
2006-11-23 17:30:32 +01:00
unknown
a865876b1d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug21789/my41-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged
2006-11-22 14:06:37 +04:00
unknown
c65ce2e09f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug22029/my41-bug22029


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
2006-11-22 10:30:46 +04:00
unknown
d4aadb0613 Get name for .reject and .log files from result file name 2006-11-21 15:16:12 +01:00
unknown
c3d6927d58 MTR_BUILD_THREAD=auto selects a value for MTR_BUILD_THREAD from a pool (WL#2690)
mysql-test/lib/mtr_unique.pl:
  Library file used by mysql-test-run.pl to determine unique test run identifiers.
2006-11-17 16:52:21 +01:00
unknown
0bfad0da5c Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-17 14:47:14 +01:00
unknown
0c9530f2ae Remove unused variables/options that does not have any effect
Update usage description
2006-11-17 13:36:10 +01:00
unknown
a57542e84c Cleanup --extern implementation, remove some unused variables and check arguments 2006-11-17 13:30:42 +01:00
unknown
c341ca2272 BUG#24354 option "--extern" of mysql-test-run.pl does not work anymore
mysql-test/mysql-test-run.pl:
  Don't require restart if master is not started when running with --extern
2006-11-17 13:20:48 +01:00
unknown
02cd4f5ada BUG#24274 option "--big-test" of mysql-test-run.pl does not work anymore
mysql-test/lib/mtr_cases.pl:
  Don't look at lines that start with # ie. a comment
mysql-test/mysql-test-run.pl:
  Set env BIG_TEST if --big-test passed
2006-11-17 13:14:07 +01:00
unknown
f3e8cb194f remove junk comment 2006-11-17 13:10:54 +01:00
unknown
17c238a15b Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/home/hf/work/mysql-4.1-mrg


include/mysql.h:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_class.h:
  Auto merged
Makefile.am:
  merging
client/mysqltest.c:
  merging
mysql-test/t/mysql_client.test:
  merging
2006-11-16 20:44:37 +04:00
unknown
6ce5681b12 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  example.com:/work/bug24219/my41
2006-11-16 16:29:06 +01:00
unknown
d274d475f8 Put more spcific paths at the top of list to search for binaries 2006-11-16 15:23:13 +01:00
unknown
fb1aab1a4d Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Manual merge of fix for location of mysql_client_test
2006-11-16 15:11:12 +01:00
unknown
f754fd2543 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug23653/my41-bug23653
2006-11-16 16:19:10 +04:00
unknown
09fc514bd5 Fix for bug#24219 ALTER TABLE ... RENAME TO ... , DISABLE KEYS leads to crash
There was an improper order of doing chained operations.

To the documentor: ENABLE|DISABLE KEYS combined with RENAME TO, and no other
ALTER TABLE clause, leads to server crash independent of the presence of
indices and data in the table.


mysql-test/r/alter_table.result:
  update result
mysql-test/t/alter_table.test:
  add test for bug#24129
sql/sql_table.cc:
  If there is operation on the KEYS, first do it
  and then do a rename if there is such. Or, we will crash because
  the underlying table has changed.
2006-11-16 13:18:37 +01:00
unknown
6bd194d7ca Merge mysql.com:/home/bkroot/mysql-4.1-rpl
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
2006-11-15 12:39:21 +01:00
unknown
9cde979eb7 bug#19402 SQL close to the size of the max_allowed_packet fails on the slave
mending windows test.


mysql-test/r/rpl_packet.result:
  results changed
mysql-test/t/rpl_packet.test:
  removing because of the connection with windows client can be lost instead of
  the error code back (source: manual).
2006-11-15 12:53:07 +02:00
unknown
cab0dc6544 Merge polly.local:/tmp/maint/bug22129/my41-bug22129
into  polly.local:/home/kaa/src/maint/mysql-4.1-maint
2006-11-14 16:36:31 +03:00
unknown
b295756927 make dist now copies .test files in mysql-test/include
mysql-test/Makefile.am:
  add include/*.test to dist-hook and install-data-local targets to include the three .test files in mysql-test/include with make dist
2006-11-14 14:29:05 +01:00
unknown
178dddb54f Fix "make dist" 2006-11-14 09:42:01 +01:00
unknown
6da91bfff3 Use mysql-test-run.pl
mysql-test/mysql-test-run-shell.sh:
  Rename: mysql-test/mysql-test-run.sh -> mysql-test/mysql-test-run-shell.sh
mysql-test/Makefile.am:
  Remove build of mysql_test_run_new
  Symlink mysql-test-run.pl to mysql-test-run
  Rename mysql-test-run.sh to mysql-test-run-shell.sh
2006-11-13 19:12:34 +01:00
unknown
e56742d7a9 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  rakia.gmz:/home/kgeorge/mysql/autopush/B19216-4.1-opt
2006-11-13 15:40:19 +02:00