database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-10 02:01:19 +03:00
Code
177,831 Commits 2,973 Branches 353 Tags
Commit Graph

3843 Commits

Author SHA1 Message Date
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
msvensson@shellback.(none)
f415523c17 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-18 11:34:07 +02:00
unknown
519dc92cca BUG#22396 crash_commit_before 
- Disable generation of core file and stacktrace when running this testcase, which would
   otherwise mark the whole testsuite as failed.


mysql-test/mysql-test-run.pl:
  Allow --skip-core-file to be specified in master.opt file, which will turn
  off the default behaviour to generate core file.
  Remove the option --exit-info from being passed to myslqd when it's started. If used 
  it will just overwrite all the options for skip-stack-trace etc.
mysql-test/t/disabled.def:
  Enable crash_commit_before
mysql-test/t/crash_commit_before-master.opt:
  Run crash_commit_before test case without core file and stack trace.
 2006-09-17 20:54:06 +02:00
msvensson@shellback.(none)
dedcdda5df BUG#22396 crash_commit_before 
- Disable generation of core file and stacktrace when running this testcase, which would
   otherwise mark the whole testsuite as failed.
 2006-09-17 20:54:06 +02:00
unknown
0dfa6c953a Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
 2006-09-15 18:18:18 -04:00
cmiller@zippy.cornsilk.net
66808ead4e Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-15 18:18:18 -04:00
unknown
f1e6d23944 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge


BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2006-09-14 23:53:35 +04:00
dlenev@mockturtle.local
5ba1b83c98 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-14 23:53:35 +04:00
unknown
2e48f71759 Merge neptunus.(none):/home/msvensson/mysql/my50-netware-mtr 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-09-14 11:01:23 +02:00