database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Code Activity
185,817 Commits 3,270 Branches 1,096 Tags
0bee021b78af8d45b2510a79244b9925032c4765
Commit Graph

3993 Commits

Author SHA1 Message Date
msvensson@neptunus.(none)
cc747a02b3 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 21:11:05 +01:00
unknown
c789301fcd Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_deadlock.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
include/my_sys.h:
  Manual merge, my_getpagesize broken out of "#ifdef HAVE_SYS_MMAN_H"
 2006-11-28 20:59:57 +01:00
msvensson@neptunus.(none)
04d5a42bbf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-28 20:59:57 +01:00
unknown
8143ab2357 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Manual merge
 2006-11-28 20:51:09 +01:00
msvensson@neptunus.(none)
e61b7b9f64 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-28 20:51:09 +01:00
unknown
e3a9d94935 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-28 20:00:54 +01:00
msvensson@neptunus.(none)
80d6de7e56 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 20:00:54 +01:00
unknown
e8d8ddadac Look for client binaries also in bin/ directory 2006-11-28 20:00:27 +01:00
msvensson@neptunus.(none)
fa8af12651 Look for client binaries also in bin/ directory 2006-11-28 20:00:27 +01:00
unknown
90c57042b6 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-28 19:54:52 +01:00
msvensson@neptunus.(none)
7c9d0abb19 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 19:54:52 +01:00
unknown
c5f7e0789f Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-28 19:54:37 +01:00
msvensson@neptunus.(none)
2346ee93ed Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-28 19:54:37 +01:00
unknown
92ac0e73dd Create new function "run_testcase_mark_logs' and use it to mark start of testcase 
in all cuurently known log files
 2006-11-28 19:54:16 +01:00
msvensson@neptunus.(none)
961ae4ab2f Create new function "run_testcase_mark_logs' and use it to mark start of testcase 
in all cuurently known log files
 2006-11-28 19:54:16 +01:00
unknown
d7403d0ac3 Merge kahlann.erinye.com:/home/df/mysql/build/51 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-merge


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
 2006-11-28 19:53:43 +01:00
df@kahlann.erinye.com
998b05f245 Merge kahlann.erinye.com:/home/df/mysql/build/51 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-merge
 2006-11-28 19:53:43 +01:00
unknown
bb4b8d381d Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-28 19:11:02 +01:00
msvensson@neptunus.(none)
6de56b75b2 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-28 19:11:02 +01:00
unknown
a60fe75f54 Only force mysqld to use log file up until 5.1.6 
After that it will by default use log tables. That setting can be overruled
by adding a -master.opt file like mysql_client_test has.
 2006-11-28 19:10:39 +01:00
msvensson@neptunus.(none)
a92c7700bb Only force mysqld to use log file up until 5.1.6 
After that it will by default use log tables. That setting can be overruled
by adding a -master.opt file like mysql_client_test has.
 2006-11-28 19:10:39 +01:00
unknown
a18d3effc0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/mysql-5.1-build


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged
 2006-11-28 18:31:53 +01:00
kent@kent-amd64.(none)
2264dc7da0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-28 18:31:53 +01:00
unknown
530b583038 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-28 16:25:41 +01:00
msvensson@neptunus.(none)
a4571e29d5 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-28 16:25:41 +01:00
unknown
c4558b8829 Remove the check for writable var dir, it has to be done later on 2006-11-28 16:24:31 +01:00
msvensson@neptunus.(none)
ac2ef7dd5a Remove the check for writable var dir, it has to be done later on 2006-11-28 16:24:31 +01:00
unknown
f3d2382ed8 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-28 16:23:13 +01:00
msvensson@neptunus.(none)
b73f090aa6 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 16:23:13 +01:00
unknown
039f806afe Add warnings and more error checks in the creation of vardirs 2006-11-28 16:22:59 +01:00
msvensson@neptunus.(none)
e5ff9ebcd8 Add warnings and more error checks in the creation of vardirs 2006-11-28 16:22:59 +01:00
unknown
d55f97d43d Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-28 15:54:23 +01:00
msvensson@neptunus.(none)
ed4b672fc7 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 15:54:23 +01:00
unknown
df75d387ef Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-28 15:52:18 +01:00
msvensson@neptunus.(none)
0e58c1ab46 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-28 15:52:18 +01:00
unknown
dc48e348d4 Some more checks to avoid removing unwanted directories. 2006-11-28 15:51:52 +01:00
msvensson@neptunus.(none)
acf75687fb Some more checks to avoid removing unwanted directories. 2006-11-28 15:51:52 +01:00
unknown
6ee057c676 No need to have a "created_by_mem" file, just read the link and 
if that is same as opt_mem it can be removed
 2006-11-28 15:39:23 +01:00
msvensson@neptunus.(none)
bccf144260 No need to have a "created_by_mem" file, just read the link and 
if that is same as opt_mem it can be removed
 2006-11-28 15:39:23 +01:00
unknown
3bf4108ea9 Rename function datadir_setup to datadir_list_setup to avoid mixup 
with the function where vardir's are created
 2006-11-28 15:15:01 +01:00
msvensson@neptunus.(none)
fc1f9bfede Rename function datadir_setup to datadir_list_setup to avoid mixup 
with the function where vardir's are created
 2006-11-28 15:15:01 +01:00
unknown
e1df89ffbb Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-28 13:57:42 +01:00
msvensson@neptunus.(none)
9fb79e9189 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 13:57:42 +01:00
unknown
5a21c5273f Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-11-28 13:57:38 +01:00
msvensson@neptunus.(none)
7239e6133a Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-28 13:57:38 +01:00
unknown
af46f14503 Bug#24354 option "--extern" of mysql-test-run.pl does not work anymore 
- Better control of when to create/remove vardir


mysql-test/mysql-test-run.pl:
  Split the part the function cleanup_stale_files in two parts
    - one that removes any old var directories
    - one that setup var in te proper location
  
  If running against extern server and no vardir has been created in the specified
  location, run the latter function to create the vardir structure. Else print
  message saying the vardir already exists and continue.
 2006-11-28 13:57:07 +01:00
msvensson@neptunus.(none)
896adf77ae Bug#24354 option "--extern" of mysql-test-run.pl does not work anymore 
- Better control of when to create/remove vardir
 2006-11-28 13:57:07 +01:00
unknown
2bced1dfba Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
 2006-11-28 12:39:22 +01:00
msvensson@neptunus.(none)
90d654646b Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-28 12:39:22 +01:00
unknown
58c571a493 Fix problem with mysqladmin logging to var/log before var has been created 
And if var/ has been created, it will be recreated later so the logs
from "mtr_kill_leftovers" will be lost anyway  


mysql-test/mysql-test-run.pl:
  Don't create vardir before mtr_kill_leftovers
mysql-test/lib/mtr_process.pl:
  Send output - if any - from mysqladmin to stdout/stderr. There shouldn't
  be any such errors and if any occur, it's good to know about them.
 2006-11-28 12:36:26 +01:00