mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50644 commits 2784 branches 343 tags 1.6 GiB
Commit graph

493 commits

Author SHA1 Message Date
msvensson@pilot.(none)
b44ccd77bf Merge pilot.(none):/data/msvensson/mysql/bug18415/my50-bug18415 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-27 09:21:05 +02:00
msvensson@pilot.(none)
b2b4f13b7b Merge pilot.(none):/data/msvensson/mysql/bug18415/my50-bug18415 
into  pilot.(none):/data/msvensson/mysql/bug18415/my51-bug18415
 2007-06-27 09:20:25 +02:00
msvensson@pilot.(none)
c126fe0c8d Merge pilot.(none):/data/msvensson/mysql/bug25657/my50-bug25657-new2 
into  pilot.(none):/data/msvensson/mysql/bug25657/my51-bug25657
 2007-06-26 12:28:45 +02:00
msvensson@pilot.(none)
5c3273f19d Bug#25657 mysql-test-run.pl kill itself under ActiveState perl 
- Various fixes for running mysql-test-run.pl on ActiveState perl
   for windows. Reading it's source in win32/win32.c helps...
 2007-06-26 12:26:21 +02:00
istruewing@chilla.local
9d3c6858af Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-24 16:46:16 +02:00
tsmith@maint1.mysql.com
28242f775c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-21 22:10:40 +02:00
msvensson@pilot.(none)
8e65f66378 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-21 16:58:22 +02:00
msvensson@pilot.(none)
840344589e Add name of test that generated the warning to "warnings" file 2007-06-21 16:37:13 +02:00
msvensson@pilot.(none)
896faea0d3 Merge pilot.(none):/data/msvensson/mysql/bug28742/my50-bug28742 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-21 14:14:36 +02:00
msvensson@pilot.(none)
4d3f3f676f Bug#28742 mysql-test-run is very slow on "Stopping All Servers" step 
- Improve shutdown algorithm 
 - Wait up to 5 seconds for processes to exit after their port is free
 2007-06-20 11:47:55 +02:00
bar@mysql.com/bar.myoffice.izhnet.ru
020eedd446 mtr_report.pl: 
Ignore warning about file name
  having question marks.
 2007-06-19 15:34:21 +05:00
lars/lthalmann@dl145j.mysql.com
ae52876fd0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-18 09:42:22 +02:00
msvensson@pilot.(none)
69cfa9b06e Bug#18415 known problem when mysql-test-run.pl run ActiveState perl for windows 
- Select STDOUT as default handle after having cloned the child
 - Disable check for "$error eq $output" to ptoperly redirect $error
 2007-06-15 17:42:03 +02:00
lars/lthalmann@dl145k.mysql.com
c9d1b262e3 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-11 09:55:34 +02:00
msvensson@pilot.(none)
f116004a62 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-08 07:21:36 +02:00
msvensson@pilot.(none)
9ed0e74db3 Bug#28369 rpl test cases fail with binlog disabled 2007-06-08 07:16:36 +02:00
msvensson@pilot.(none)
d9b259454a Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-07 20:27:19 +02:00
msvensson@pilot.(none)
597c75d2fd Fix typo 
Mark one more test as needing binlog
 2007-06-07 20:25:22 +02:00
msvensson@pilot.(none)
6ca8329d12 Merge pilot.(none):/data/msvensson/mysql/bug28369/my51-bug28369 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-07 19:48:34 +02:00
msvensson@pilot.(none)
ad2419050e Merge pilot.(none):/data/msvensson/mysql/bug28369/my50-bug28369 
into  pilot.(none):/data/msvensson/mysql/bug28369/my51-bug28369
 2007-06-07 19:19:29 +02:00
msvensson@pilot.(none)
1afb1c8ddf Bug#28369 rpl test cases fail with binlog disabled 
- Turn on binlog only for tests that need it
 - Skip those tests if --skip-binlog is used
 2007-06-07 19:18:01 +02:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
89639e7679 yellow warnings on pb. Setting the plug of a harmless warning. 2007-06-06 14:34:17 +03:00
tsmith@quadxeon.mysql.com
13adcedc90 mtr_report.pl: 
Add another exception to the acceptable mysqld errors, for test case for bug 28436
 2007-06-06 03:49:24 +02:00
tsmith@quadxeon.mysql.com
4b93804592 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
 2007-06-05 17:51:30 +02:00
msvensson@pilot.(none)
f6b5eb54b5 Merge pilot.(none):/data/msvensson/mysql/my51-m-bug24168 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-01 14:34:26 +02:00
msvensson@pilot.(none)
cc45f1b79a Bug #24168 mysql-test-run not functioning in autotest (cannot use external cluster) 
- Removed the global variable(s) glob_use_running_cluster/slave
   and put a property on each "cluster" called "use_running" which
   is set to 1 if user passed either ndb_connectstring or 
   ndb_connectstring_slave. Thus mtr.pl should not start/stop the
   cluster.
 2007-06-01 14:32:26 +02:00
kostja@bodhi.(none)
16633169e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-06-01 12:12:06 +04:00
jani@a88-113-38-195.elisa-laajakaista.fi
2c8f4f9791 Added casts to avoid compiler warnings and fixed a wrong type. 
---
Added casts and fixed wrong type.
---
Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning.
 2007-05-31 17:45:22 +03:00
kostja@vajra.(none)
0162745cff Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  vajra.(none):/opt/local/work/mysql-5.1-runtime
 2007-05-24 19:34:14 +04:00
thek@adventure.(none)
63e6a020b7 Merge adventure.(none):/home/thek/Development/cpp/bug28644/my50-bug28644 
into  adventure.(none):/home/thek/Development/cpp/bug28644/my51-bug28644
 2007-05-24 13:54:32 +02:00
thek@adventure.(none)
edd4f76056 Merge adventure.(none):/home/thek/Development/cpp/bug28644/my41-bug28644 
into  adventure.(none):/home/thek/Development/cpp/bug28644/my50-bug28644
 2007-05-24 13:53:49 +02:00
thek@adventure.(none)
dec5c2e048 Bug#28644 Memory status report confused with memory leak 
This patch removes a false memory leak error report from the test suite.
There is a test case that puposely provokes a SAFEMALLOC leak report,
even though there is no actual leak.
 2007-05-24 13:11:45 +02:00
svoj@mysql.com/june.mysql.com
fbb5c31aa9 BUG#25659 - memory leak via "plugins" test 
- Added suppressions for dlopen to make plugin test pass.
- Do not pass empty string to mysqld, since my_getopt is
  not capable to handle it.
- Re-enabled trailing UNINSTALL PLUGIN statement of plugin.test.

The memory leak described in the bug report happens in libdl, not
in mysqld. On some valgrind installations this error is suppressed
by default, no idea why it isn't suppressed on pb-valgrind.

<observation>
If library remains open after thread has finished, and is closed by
another thread, we get memory leak. But in case library is opened and
closed by the same thread no leak occurs.
</observation>
 2007-05-21 17:48:29 +05:00
acurtis/antony@ltamd64.xiphis.org
a4dbc0990c Merge xiphis.org:/home/antony/work2/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
 2007-05-04 23:35:14 -07:00
tsmith@quadxeon.mysql.com
13cfd9471d Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-01 10:38:19 +02:00
tsmith@quadxeon.mysql.com
5d7a264cf4 mtr_report.pl: 
this has been driving me crazy: s/where/were/ in some messages
 2007-04-28 10:13:27 +02:00
istruewing@chilla.local
e327818c28 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two
 2007-04-27 19:09:39 +02:00
msvensson@pilot.blaudden
b941ef8633 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-23 13:28:09 +02:00
msvensson@pilot.blaudden
7411813e48 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 11:03:40 +02:00
msvensson@pilot.blaudden
d26965c361 Protect against killing pid's that would "killall" or "kill self" 2007-04-23 11:01:22 +02:00
tsmith@siva.hindu.god
9232def96b Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-04-18 14:55:42 -06:00
msvensson@pilot.blaudden
a4681af19c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 16:50:14 +02:00
msvensson@pilot.blaudden
84d60374e5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 16:49:10 +02:00
serg@janus.mylan
f6b222ddda mysql-test/mysql-test-run.pl 
set --language correctly even for --help (to have full plugin help)
mysql-test/lib/mtr_cases.pl
    more robust check for innodb
 2007-04-18 14:24:09 +02:00
msvensson@pilot.blaudden
a247bd582e Make it possible to define how many slaves to start by 
writing --slave-num=n in <testname>-master.opt file
 2007-04-18 13:50:54 +02:00
jani@ua141d10.elisa.omakaista.fi
1e38c22ef8 Small fixes for merge. 2007-04-10 18:01:29 +03:00
msvensson@pilot.blaudden
ff0ee38bd7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-04 15:43:03 +02:00
msvensson@pilot.blaudden
bc675fb568 Only check for warnings produced by mysqltest if --check-testcases 2007-04-04 10:59:00 +02:00
msvensson@pilot.blaudden
39cca0323c Look for "testname.warnings" file produced by mysqltest, could find 
problems like misspelled -- commands
 2007-04-02 22:58:25 +02:00
msvensson@shellback.(none)
724573f7ff Cset exclude: msvensson@shellback.(none)|ChangeSet|20070330134336|02280 2007-03-30 16:43:15 +02:00
msvensson@shellback.(none)
060fb5ed39 Bug#25657 mysql-test-run.pl kill itself under ActiveState perl 
- Read the pid from pidfile in order to be able to kill the real process
instead of the pseudo process. Most platforms will have the same real_pid
as pid
- Kill using the real pid
 2007-03-30 15:43:36 +02:00
msvensson@pilot.blaudden
37ffc0c391 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-29 11:37:21 +02:00
msvensson@pilot.blaudden
0e04aec960 Make the script detect --default-storage-engine=x and 
mark the test as requiring that storage engine(if we need to do that)
Make --ndb and --with-ndbcluster and alias for
--mysqld=--default-storage-engine=ndbcluster
 2007-03-29 11:31:50 +02:00
msvensson@pilot.blaudden
184fef6303 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-28 10:24:47 +02:00
msvensson@pilot.blaudden
5901765694 Dont' redirect stderr in ActiveState perl 
Improve comments
 2007-03-28 10:24:33 +02:00
tsmith@quadxeon.mysql.com
c92e7b13b2 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
 2007-03-07 10:32:23 +01:00
msvensson@pilot.blaudden
d1d64ba50f Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-01 19:10:07 +01:00
msvensson@pilot.blaudden
f5778fc73e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-01 18:12:56 +01:00
msvensson@pilot.blaudden
51a71fb667 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-01 14:53:32 +01:00
msvensson@pilot.blaudden
c1f8e7f913 MySQL versions before 5.0 still use cygwin, no need 
to convert path
 2007-03-01 11:41:29 +01:00
msvensson@pilot.blaudden
162f0803bb Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 16:40:50 +01:00
msvensson@pilot.blaudden
05ed84a3d2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
 2007-02-28 15:04:20 +01:00
msvensson@pilot.blaudden
3fc549d430 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Build lib/init-db.sql from the output of mysql_create_system_tables
 - Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql
 - Leave netware/init_db.sql until 5.0 where we should soon have possibility
   to test with mysql-test-run.pl
 2007-02-28 15:03:47 +01:00
msvensson@pilot.blaudden
a3317f8554 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 10:53:34 +01:00
msvensson@pilot.blaudden
3a11b2be7e Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 10:53:06 +01:00
msvensson@pilot.blaudden
44959af241 Bug#26416 mysql-test-run exits with "Hangup" when piped to grep 
- Thanks to Christian for the patch!
 2007-02-28 10:52:51 +01:00
msvensson@pilot.blaudden
258fbc3a1e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 10:39:47 +01:00
msvensson@pilot.blaudden
0df3d939b1 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 10:39:12 +01:00
msvensson@pilot.blaudden
3393c1e489 Bug#26686 mysql-test-run.pl aborts when waitpid returns -1 
- Add error handling for waitpid returns -1 for "simple run of command"
 2007-02-28 10:37:32 +01:00
msvensson@pilot.blaudden
f6e31a2cd1 Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
 2007-02-26 14:25:59 +01:00
msvensson@pilot.blaudden
c550a45522 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Use mysql_system_tables.sql to create MySQL system tables in
   all places where we create them(mysql_install_db, mysql-test-run-pl
   and mysql_fix_privilege_tables.sql)
 2007-02-26 11:49:24 +01:00
monty@mysql.com/narttu.mysql.fi
f0ae3ce9b9 Fixed compiler warnings 
Fixed compile-pentium64 scripts
Fixed wrong estimate of update_with_key_prefix in sql-bench
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc
Split handle_one_connection() into reusable sub functions.
Split create_new_thread() into reusable sub functions.
Added thread_scheduler; Preliminary interface code for future thread_handling code.

Use 'my_thread_id' for internal thread id's
Make thr_alarm_kill() to depend on thread_id instead of thread
Make thr_abort_locks_for_thread() depend on thread_id instead of thread
In store_globals(), set my_thread_var->id to be thd->thread_id.
Use my_thread_var->id as basis for my_thread_name()
The above changes makes the connection we have between THD and threads more soft.

Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions
Fixed compiler warnings
Fixed core dumps when running with --debug
Removed setting of signal masks (was never used)
Made event code call pthread_exit() (portability fix)
Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called.
Made handling of thread_id and thd->variables.pseudo_thread_id uniform.
Removed one common 'not freed memory' warning from mysqltest
Fixed a couple of usage of not initialized warnings (unlikely cases)
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
 2007-02-23 13:13:55 +02:00
monty@mysql.com/narttu.mysql.fi
222e128b34 Fixed unsafe define of uint4korr() 
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
 2007-02-21 13:02:57 +02:00
msvensson@pilot.blaudden
03b71c9209 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-16 15:32:51 +01:00
msvensson@pilot.blaudden
b57994a7c2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-16 15:23:27 +01:00
msvensson@neptunus.(none)
8931166e55 Workaround for problem where cygwin's bash/sh randomly fails with error 128 which 
mainly occurs on win2003 64bit.
 - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..."
 2007-02-16 15:19:38 +01:00
msvensson@neptunus.(none)
6502f4300b Merge neptunus.(none):/home/msvensson/mysql/my41-nmj 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2007-02-06 14:42:40 +01:00
msvensson@neptunus.(none)
08cbe04670 Always use two masters for ndb tests 
Abandon attempt to only use one for some tests that don't use the second master
 2007-01-16 09:47:03 +01:00
msvensson@neptunus.(none)
47583ddf3e Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-01-16 09:35:53 +01:00
msvensson@neptunus.(none)
f44d73a58d Always use two masters for ndb tests 2007-01-16 09:35:14 +01:00
cmiller@zippy.cornsilk.net
896e2623eb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-11 09:43:44 -05:00
cmiller@zippy.cornsilk.net
a16eaf3301 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
 2007-01-07 09:31:49 -05:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s: 
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
 2006-12-31 01:02:27 +01:00
tsmith/tim@siva.hindu.god
0cb9cee7f4 Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
 2006-12-26 16:49:10 -07:00
tsmith/tim@siva.hindu.god
8075fc447e Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-21 18:23:14 -07:00
tsmith/tim@siva.hindu.god
f204db4dd1 Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-21 18:20:09 -07:00
tsmith/tim@siva.hindu.god
93bbb19fc1 Merge siva.hindu.god:/usr/home/tim/m/bk/g41 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-12-21 18:18:27 -07:00
msvensson@pilot.mysql.com
c862eae163 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2006-12-22 01:13:02 +01:00
msvensson@neptunus.(none)
fe0a11d194 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-20 23:59:34 +01:00
msvensson@neptunus.(none)
da6773f97b Count number of masters the test is actually using and only start as 
many as neeeded
 2006-12-20 23:44:53 +01:00
baker@bk-internal.mysql.com
b1d173f510 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-18 17:57:34 +01:00
msvensson@neptunus.(none)
8bc9d6dd41 Improve error message that describes waitpid($pid) returned unexpected result 2006-12-12 12:28:02 +01:00
patg@radha.myhome.westell.com
b892f9adf8 WL #3031 
* New result files due to new error message/error numbers
* Fixed system_mysql_db tests to work with servers table
* Added UTF8 charset to table defs
 2006-12-11 11:44:03 -05:00
df@kahlann.erinye.com
78e1df3e9f Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
 2006-12-11 10:51:29 +01:00
df@kahlann.erinye.com
476632aad9 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-11 10:49:31 +01:00
df@kahlann.erinye.com
024597b3e1 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-11 10:45:39 +01:00
patg@govinda.patg.net
f9097b86af Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge
 2006-12-08 22:30:18 -05:00
df@kahlann.erinye.com
8fffa20a5a Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-07 16:08:55 +01:00
df@kahlann.erinye.com
75c7114124 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-07 16:07:14 +01:00