database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Code Activity
180,922 Commits 3,276 Branches 1,097 Tags
e9d9ca8c44c96e5943c0175177b3377a65b2d76f
Commit Graph

3901 Commits

Author SHA1 Message Date
msvensson@shellback.(none)
c74ebcc176 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-20 18:02:42 +02:00
unknown
802cddb93b Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-09-20 18:02:11 +02:00
msvensson@shellback.(none)
7029074c24 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-20 18:02:11 +02:00
unknown
a880b2d311 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-09-20 15:45:42 +02:00
msvensson@shellback.(none)
0c429abd29 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-20 15:45:42 +02:00
unknown
25fa9d266a Fix problem with testcase timeouts not working. The timeout value was always multiplied with 10 
since the $opt_valgrind variable was initialised to 0, thus being "defined"


mysql-test/mysql-test-run.pl:
  Increase the timeout values if $opt_valgrind are greater than 0. By default $opt_valgrind is set to 0.
 2006-09-20 15:41:46 +02:00
msvensson@shellback.(none)
339cd91a98 Fix problem with testcase timeouts not working. The timeout value was always multiplied with 10 
since the $opt_valgrind variable was initialised to 0, thus being "defined"
 2006-09-20 15:41:46 +02:00
unknown
54886b08cc Fix check of parameter type in mysqld_start. 2006-09-20 07:43:03 +02:00
msvensson@neptunus.(none)
f4c0e4efac Fix check of parameter type in mysqld_start. 2006-09-20 07:43:03 +02:00
unknown
1ab7ab5851 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-09-19 20:01:40 +02:00
msvensson@shellback.(none)
30e3cce970 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 20:01:40 +02:00
unknown
8776c21f65 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-09-19 20:00:01 +02:00
msvensson@shellback.(none)
9cb40c6e91 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 20:00:01 +02:00
unknown
f05cccab9b Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-09-19 19:58:51 +02:00
msvensson@shellback.(none)
be1187e171 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-19 19:58:51 +02:00
unknown
a4b1695376 Increase suite timeout even more - 6 times - when running with valgrind 
mysql-test/mysql-test-run.pl:
  Increase suite timeout even more when running with  valgrind
 2006-09-19 19:41:41 +02:00
msvensson@shellback.(none)
5a912955d5 Increase suite timeout even more - 6 times - when running with valgrind 2006-09-19 19:41:41 +02:00
unknown
d1ec10fbbe Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-09-19 19:11:41 +02:00
msvensson@shellback.(none)
d3d7c74954 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 19:11:41 +02:00
unknown
3b1ea5af76 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-09-19 19:10:31 +02:00
msvensson@shellback.(none)
bd6fc1ce66 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 19:10:31 +02:00
unknown
81df6ecde4 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Merge 5.0->5.1
 2006-09-19 18:41:48 +02:00
msvensson@shellback.(none)
d8870f2bb3 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-19 18:41:48 +02:00
unknown
dbe820a0b6 Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on 2006-09-19 18:39:04 +02:00
msvensson@shellback.(none)
883a3809c9 Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on 2006-09-19 18:39:04 +02:00
unknown
ae2603c1c7 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-09-19 17:47:53 +02:00
msvensson@shellback.(none)
ee5ca6e231 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 17:47:53 +02:00
unknown
7fef817a99 Fix warnings in mysql-test-run.pl 
mysql-test/mysql-test-run.pl:
  Initialise pid to 0 in arrays of masters and slaves
  Fix merge error
mysql-test/lib/mtr_cases.pl:
  Remove "chomp" on undefined
 2006-09-19 17:45:27 +02:00
msvensson@shellback.(none)
1b3094187a Fix warnings in mysql-test-run.pl 2006-09-19 17:45:27 +02:00
unknown
3b32e5dbb0 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-09-19 17:40:49 +02:00
msvensson@shellback.(none)
1515818276 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 17:40:49 +02:00
unknown
8ed01c83d7 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_stress.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge 5.0 -> 5.1
 2006-09-19 17:08:07 +02:00
msvensson@shellback.(none)
0e7d18d8e4 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-19 17:08:07 +02:00
unknown
0dc08b9040 Fix warnings in mysql-test-run.pl 
mysql-test/lib/mtr_stress.pl:
  Remove duplicate definition of variable
mysql-test/mysql-test-run.pl:
  Fix spelling error
  Fix warning about uninitialised warning
 2006-09-19 16:43:42 +02:00
msvensson@shellback.(none)
fa26e83fd2 Fix warnings in mysql-test-run.pl 2006-09-19 16:43:42 +02:00
unknown
76aad03502 Fix merge error, path_mysock has been renamed to path_sock 2006-09-18 19:38:59 +02:00
msvensson@shellback.(none)
db1adb2234 Fix merge error, path_mysock has been renamed to path_sock 2006-09-18 19:38:59 +02:00
unknown
bc6a7ac80c Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-09-18 18:06:10 +02:00
msvensson@shellback.(none)
7dabd8c683 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-18 18:06:10 +02:00
unknown
c8ac234643 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Merge 5.0->5.1
 2006-09-18 18:04:47 +02:00
msvensson@shellback.(none)
8244e4fb73 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-18 18:04:47 +02:00
unknown
cbafa0c6bc Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-09-18 17:47:26 +02:00
msvensson@shellback.(none)
781aaaba66 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-18 17:47:26 +02:00
unknown
a5576da753 Add character-sets-dir argument to "mysql". That avoids a local 
installed charset dir being used.


mysql-test/mysql-test-run.pl:
  Add character-sets-dir argument to "mysql". That avoids a local
  installed charset dir being used.
 2006-09-18 17:46:36 +02:00
msvensson@shellback.(none)
dafb50055f Add character-sets-dir argument to "mysql". That avoids a local 
installed charset dir being used.
 2006-09-18 17:46:36 +02:00
unknown
2b957c7345 No need to use environment variable NDB_STATUS_OK and NDB_SLAVE_STATUS_OK anymore 
when mysql-test-run.pl has full control of all ndb processes. It will now know if
install has failed.


BitKeeper/deleted/.del-have_ndb_status_ok.require:
  Delete: mysql-test/r/have_ndb_status_ok.require
mysql-test/include/have_ndb.inc:
  Remove the test to check if environment variable NDB_STATUS_OK is set
mysql-test/mysql-test-run.pl:
  Don't set env variable NDB_STATUS_OK or NDB_SLAVE_STATUS_OK
  Use 1 and 0 to indicate if cluster has been installed ok.
 2006-09-18 12:45:04 +02:00
msvensson@shellback.(none)
16c07bd02c No need to use environment variable NDB_STATUS_OK and NDB_SLAVE_STATUS_OK anymore 
when mysql-test-run.pl has full control of all ndb processes. It will now know if
install has failed.
 2006-09-18 12:45:04 +02:00
unknown
5bce387a88 Remove extra semicolon 2006-09-18 12:24:10 +02:00
msvensson@shellback.(none)
60b395a950 Remove extra semicolon 2006-09-18 12:24:10 +02:00
unknown
9e485394ce Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
include/my_net.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
 2006-09-18 11:34:07 +02:00