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
181,320 Commits 3,276 Branches 1,097 Tags
0c20b247de0c1cc7f993e1eba6c4e3367c20e2c4
Commit Graph

3910 Commits

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


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge backport
 2006-11-17 13:41:18 +01:00
msvensson@neptunus.(none)
4eb86ec2cc Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-17 13:41:18 +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
msvensson@neptunus.(none)
f0d89307a8 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
msvensson@neptunus.(none)
d98ffb2ccf 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
msvensson@neptunus.(none)
3f2c3f04bf BUG#24354 option "--extern" of mysql-test-run.pl does not work anymore 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
msvensson@neptunus.(none)
770a4f7c68 BUG#24274 option "--big-test" of mysql-test-run.pl does not work anymore 2006-11-17 13:14:07 +01:00
unknown
f3e8cb194f remove junk comment 2006-11-17 13:10:54 +01:00
msvensson@neptunus.(none)
b3a5d6196f remove junk comment 2006-11-17 13:10:54 +01:00
unknown
060c768c2b Bug#24274 option "--big-test" of mysql-test-run.pl does not work anymore 
- Set environment variable BIG_TEST when using --big-test
 - Skip comment lines when looking for features a test case supports.


mysql-test/lib/mtr_cases.pl:
  Skip all lines that start with # when looking for features required by the test case
mysql-test/mysql-test-run.pl:
  Set environment variable BIG_TEST if option --big-test passed.
 2006-11-17 11:01:09 +01:00
msvensson@neptunus.(none)
dbdd10752c Bug#24274 option "--big-test" of mysql-test-run.pl does not work anymore 
- Set environment variable BIG_TEST when using --big-test
 - Skip comment lines when looking for features a test case supports.
 2006-11-17 11:01:09 +01:00
unknown
f142723e0e Bug#24354 option "--extern" of mysql-test-run.pl does not work anymore 
- Dont require restart when using extern and there is no record of
   master being started(pid is not known) 


mysql-test/mysql-test-run.pl:
  Don't require restart when running against extern server and no
  record of master being started
 2006-11-17 10:46:21 +01:00
msvensson@neptunus.(none)
d032660b5f Bug#24354 option "--extern" of mysql-test-run.pl does not work anymore 
- Dont require restart when using extern and there is no record of
   master being started(pid is not known)
 2006-11-17 10:46:21 +01:00
unknown
a30f7c7655 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Manual merge of backport
 2006-11-16 15:54:50 +01:00
msvensson@neptunus.(none)
4ea853e072 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-16 15:54:50 +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
msvensson@neptunus.(none)
81c81296df 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
msvensson@neptunus.(none)
7e3a654785 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-16 15:11:12 +01:00
unknown
12e6eca40c Modify search path for mysql_client_test to look in "bin" not to look for "bin", 
this caused mysql_client_test to fail when running from binary dist 


mysql-test/mysql-test-run.pl:
  Modify search path for mysql_client_test to look in "bin" not to look for "bin"
 2006-11-13 20:44:22 +01:00
msvensson@neptunus.(none)
d54846ab3e Modify search path for mysql_client_test to look in "bin" not to look for "bin", 
this caused mysql_client_test to fail when running from binary dist
 2006-11-13 20:44:22 +01:00
unknown
8b01c318c0 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql_upgrade.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-13 16:39:44 +01:00
msvensson@neptunus.(none)
bf8a9e544c Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 16:39:44 +01:00
unknown
5900506c95 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint-mysql_upgrade 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/deleted/.del-abi_check.ic:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge
 2006-11-13 13:40:37 +01:00
msvensson@neptunus.(none)
5687847387 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint-mysql_upgrade 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 13:40:37 +01:00
unknown
8c598f607f Make it possible for .test suites to run "mysql_upgrade" 
Add new test file mysql_upgrade.test


BitKeeper/deleted/.del-abi_check.ic:
  Rename: include/abi_check.ic -> BitKeeper/deleted/.del-abi_check.ic
client/mysql_upgrade.c:
  Make mysql_upgrade search also in "client" dir so it can be run from a source dist.
mysql-test/mysql-test-run.pl:
  Make it possible for .test scripts to run "mysql_upgrade"
mysql-test/r/mysql_upgrade.result:
  New BitKeeper file ``mysql-test/r/mysql_upgrade.result''
mysql-test/t/mysql_upgrade.test:
  New BitKeeper file ``mysql-test/t/mysql_upgrade.test''
 2006-11-13 13:39:49 +01:00
msvensson@neptunus.(none)
5110d91ec3 Make it possible for .test suites to run "mysql_upgrade" 
Add new test file mysql_upgrade.test
 2006-11-13 13:39:49 +01:00
unknown
e5d88949c5 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


include/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-13 13:33:33 +01:00
msvensson@neptunus.(none)
3eff32965d Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 13:33:33 +01:00
unknown
27a0ce64ff Make --mem a pure flag. If there is need to specifically set the location 
use MTR_MEM environment variable
 2006-11-13 12:44:12 +01:00
msvensson@neptunus.(none)
716621db3f Make --mem a pure flag. If there is need to specifically set the location 
use MTR_MEM environment variable
 2006-11-13 12:44:12 +01:00
unknown
47bdda0b9d Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-11 14:46:06 +01:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
746ece99e0 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1
 2006-11-11 14:46:06 +01:00
unknown
3af223ed9b Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-11-11 14:32:10 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
1319f3552c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-11-11 14:32:10 +01:00
unknown
c6d317831a mysql-test-run.pl: 
Test for base directory when a RPM install corrected


mysql-test/mysql-test-run.pl:
  Test for base directory when a RPM install corrected
 2006-11-11 14:12:30 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
cddbb0f817 mysql-test-run.pl: 
Test for base directory when a RPM install corrected
 2006-11-11 14:12:30 +01:00
unknown
09a65b47be Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my41-mtr_winfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-10 15:53:34 -05:00
iggy@rolltop.ignatz42.dyndns.org
3488f21817 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my41-mtr_winfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
 2006-11-10 15:53:34 -05:00
unknown
16ce16adef Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-10 15:52:49 -05:00
iggy@rolltop.ignatz42.dyndns.org
b808c8e829 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-11-10 15:52:49 -05:00
unknown
c838a52ff3 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my41-mtr_winfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-10 15:49:10 -05:00
iggy@rolltop.ignatz42.dyndns.org
82ad2e5e92 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my41-mtr_winfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix
 2006-11-10 15:49:10 -05:00
unknown
7a0e75103f Test Suite failing on Windows because the $opt_report_features variable was not defined before use. 
mysql-test/mysql-test-run.pl:
  Defined global variable.
 2006-11-10 15:47:11 -05:00
iggy@rolltop.ignatz42.dyndns.org
73ff367be3 Test Suite failing on Windows because the $opt_report_features variable was not defined before use. 2006-11-10 15:47:11 -05:00
unknown
0b2cb6628f Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1


BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Auto merged
configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/time.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
 2006-11-10 20:02:33 +01:00
joerg@trift2.
ca06382435 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-10 20:02:33 +01:00