database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Code Activity
184,511 Commits 3,273 Branches 1,096 Tags
35318d730ac1294e2c4b8327f686cebff277fde5
Commit Graph

3977 Commits

Author SHA1 Message Date
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
unknown
e0854cbc14 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-10 19:41:47 +01:00
tsmith@quadxeon.mysql.com
ce805aff3f Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
 2006-11-10 19:41:47 +01:00
unknown
0bd4eaa765 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-10 19:39:26 +01:00
tsmith@quadxeon.mysql.com
82b6712a27 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
 2006-11-10 19:39:26 +01:00
unknown
56934f9dd4 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0


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.sh:
  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/mysql_priv.h:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/time.cc:
  Auto merged
myisam/sort.c:
  Manual merge: "use local" (= 5.0 version).
mysql-test/mysql-test-run.pl:
  Manual merge, part of the fix for bug#17194.
 2006-11-10 19:07:52 +01:00
joerg@trift2.
32d9fdaa98 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-10 19:07:52 +01:00
unknown
0d087e0558 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:
  Auto merged
 2006-11-10 16:07:49 +01:00
msvensson@neptunus.(none)
b693d5fdb3 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-10 16:07:49 +01:00
unknown
68ae8da64c Look for "mysqlmanager" also in "bin" directory 
Improve log message
 2006-11-10 15:58:38 +01:00
msvensson@neptunus.(none)
43ef5e6a0c Look for "mysqlmanager" also in "bin" directory 
Improve log message
 2006-11-10 15:58:38 +01:00
unknown
744aadbef9 Merge trift2.:/MySQL/M41/clone-4.1 
into  trift2.:/MySQL/M41/push-4.1


myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge.
 2006-11-10 15:52:53 +01:00
joerg@trift2.
2ab3d0bfb4 Merge trift2.:/MySQL/M41/clone-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2006-11-10 15:52:53 +01:00
unknown
694227c08a Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


mysql-test/mysql-test-run.pl:
  merge
 2006-11-10 14:44:01 +01:00
df@kahlann.erinye.com
403ecf18c6 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-10 14:44:01 +01:00
unknown
9cbd8a0414 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/51


mysql-test/mysql-test-run.pl:
  SCCS merged
 2006-11-10 13:27:50 +01:00
df@kahlann.erinye.com
abd8eeaaa7 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/51
 2006-11-10 13:27:50 +01:00
unknown
fbd4378b85 Bug#10608 mysqladmin breaks on "database" variable in my.cnf 
- Add printout of "Warning" or "Note" for non error messages in default_reporter
 - Add test for the above in new mysqladmin.test


mysql-test/mysql-test-run.pl:
  Add support for mysqladmin to mysql-test-run.pl
mysys/my_getopt.c:
  Add printout of Warning: or Info: in 'default_reporter', this
  will make the user aware of the problem but can filter it
  as a warning or note.
mysql-test/r/mysqladmin.result:
  New BitKeeper file ``mysql-test/r/mysqladmin.result''
mysql-test/t/mysqladmin.test:
  New BitKeeper file ``mysql-test/t/mysqladmin.test''
 2006-11-10 13:25:10 +01:00
msvensson@neptunus.(none)
7c935a9964 Bug#10608 mysqladmin breaks on "database" variable in my.cnf 
- Add printout of "Warning" or "Note" for non error messages in default_reporter
 - Add test for the above in new mysqladmin.test
 2006-11-10 13:25:10 +01:00
unknown
0f8e62b492 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-10 13:14:21 +01:00
df@kahlann.erinye.com
59e33edf22 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-10 13:14:21 +01:00
unknown
df1b6ae6e1 add --report-features to mysql-test-run.pl 
mysql-test/mysql-test-run.pl:
  add --report-features
mysql-test/include/report-features.test:
  test file showing server features for mysql-test-run.pl --report-features
 2006-11-10 13:12:08 +01:00
df@kahlann.erinye.com
f1764fa99f add --report-features to mysql-test-run.pl 2006-11-10 13:12:08 +01:00
unknown
1707d5e6e0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-09 15:36:13 -05:00
iggy@rolltop.ignatz42.dyndns.org
5343242c67 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
 2006-11-09 15:36:13 -05:00
unknown
2eeb38ac7d 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:
  Merge
 2006-11-09 11:01:37 +01:00
msvensson@neptunus.(none)
fb25c02b17 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-09 11:01:37 +01:00
unknown
fc449ac174 Fix problem when running mysql_client_test in "binary dist", path should include the binary name 2006-11-09 09:48:50 +01:00
msvensson@neptunus.(none)
023c0d03e6 Fix problem when running mysql_client_test in "binary dist", path should include the binary name 2006-11-09 09:48:50 +01:00
unknown
1a0a6142a9 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51


client/mysql_upgrade.c:
  Auto merged
configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_time.h:
  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/im_daemon_life_cycle.imtest:
  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
 2006-11-09 00:38:34 +01:00
tsmith@quadxeon.mysql.com
a7b142446f Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
 2006-11-09 00:38:34 +01:00
unknown
b1520eb3e2 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:
  Auto merged
 2006-11-08 23:17:09 +01:00
msvensson@neptunus.(none)
a620a3abd1 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-08 23:17:09 +01:00
unknown
d3b049a6bf Update of --mem flag after comments 
mysql-test/mysql-test-run.pl:
  Allow --mem to be specified as a flag or --mem=<dir>
  Add /tmp to locations to search
  Update comments and usage description
 2006-11-08 23:16:44 +01:00