Commit graph

656 commits

Author SHA1 Message Date
mskold/marty@linux.site
6f0e7a2631 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-01 21:12:13 +01:00
mskold/marty@mysql.com/linux.site
cde79e4f79 Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
df@kahlann.erinye.com
f1ccd9cb30 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-11-30 22:47:50 +01:00
df@kahlann.erinye.com
9a6f9c8c44 late after-merge fix 2006-11-30 22:45:55 +01:00
kent@kent-amd64.(none)
cc71956401 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-29 14:26:47 +01:00
df@kahlann.erinye.com
756f104591 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-11-29 10:33:23 +01:00
df@kahlann.erinye.com
b6a83ccb7a Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-11-29 10:23:48 +01:00
df@kahlann.erinye.com
c134b8c332 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-11-29 10:22:43 +01:00
df@kahlann.erinye.com
1c46f7d841 minor fix 2006-11-29 10:21:59 +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
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
kent@kent-amd64.(none)
e99c548bcd Merge mysql.com:/home/kent/bk/mysql-5.0
into  mysql.com:/home/kent/bk/mysql-5.1
2006-11-27 23:12:05 +01:00
monty@mysql.com/nosik.monty.fi
73238029bc Disabled syncronization test at it fails on multiple platforms. (Bug #24529)
Fixed that test_thr_alarm works
2006-11-27 23:19:53 +02:00
kent@mysql.com/kent-amd64.(none)
029dbbc2b2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/mysql-5.0-merge
2006-11-27 21:45:16 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
c48c8e9015 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into  mysql.com:/Users/kent/mysql/bk/build/mysql-5.0-build
2006-11-27 19:09:21 +01:00
monty@nosik.monty.fi
becf45cd8e Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-11-27 01:51:50 +02:00
monty@mysql.com/nosik.monty.fi
fa81a82e7f Fixed a LOT of compiler warnings
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
2006-11-27 01:47:38 +02:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
9d328d7d62 mysql-test-run.pl:
Removed "use diagnostics", reduces Perl speed significantly. Can be
  enabled with "perl -Mdiagnostics mysql-test-run.pl".
mtr_report.pl:
  Don't try output "skipped" comment if there is none (bug#24471)
2006-11-24 18:26:53 +01:00
monty@mysql.com/nosik.monty.fi
501333f694 Added option --mtr-build-thread to mysql-test-run.pl
Load shared libraries from zlib (fixed that mysql-test-run.pl didn't work on some Solaris boxes)
Added connect timeout to test to make im_daemon_life_cycle more predictable
2006-11-23 18:39:10 +02:00
monty@mysql.com/nosik.monty.fi
fb9bb62b1e Added some missing DBUG_RETURN
Fixed that --valgrind works again with mysql-test-run.sh
Extended error messages when loosing connection during mysql_real_connect()
2006-11-23 16:41:21 +02:00
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-11-22 14:11:36 +02:00
monty@nosik.monty.fi
38a92caeb7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-11-21 23:12:45 +02:00
monty@mysql.com/nosik.monty.fi
f6682e2743 Added --debug-info to most clients to detect memory leaks in mysql-test-run
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
2006-11-21 22:32:58 +02:00
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02:00
msvensson@neptunus.(none)
8809a5e27e mysql_client_test not found when running from binary dist
Look in bin for myql_client_test executable
2006-11-20 13:02:49 +01:00
df@mysql.com/kahlann.erinye.com
98806bd6ec Merge mysql.com:/home/df/mysql/build/mysql-5.0-build-work
into  mysql.com:/home/df/mysql/build/mysql-5.1-build
2006-11-17 17:09:52 +01:00
dfischer/df@kahlann.erinye.com
bc8c59c1a8 adaption from 4.1 2006-11-17 17:02:28 +01:00
dfischer/df@kahlann.erinye.com
88ac15ddd1 MTR_BUILD_THREAD=auto selects a value for MTR_BUILD_THREAD from a pool (WL#2690) 2006-11-17 16:52:21 +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
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
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
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
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
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
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
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
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
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
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
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
df@kahlann.erinye.com
f1764fa99f add --report-features to mysql-test-run.pl 2006-11-10 13:12:08 +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
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
msvensson@neptunus.(none)
90d8d7b5cf Update of --mem flag after comments 2006-11-08 23:16:44 +01:00
msvensson@neptunus.(none)
174bfe9dd6 No need to pass an additional arg to to mtr_add_arg when there is no % sign 2006-11-08 22:56:06 +01:00
msvensson@neptunus.(none)
4dfbc712ed Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-08 22:54:22 +01:00
msvensson@neptunus.(none)
1437500c1b Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine. 2006-11-08 22:53:40 +01:00
msvensson@neptunus.(none)
34f2c99dfc Don't run mysqltest with both --silent and --verbose 2006-11-08 22:45:52 +01:00
anozdrin/alik@alik.
9421205b49 Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt
2006-11-08 22:20:58 +03:00
msvensson@neptunus.(none)
ad63d2bdbe Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-07 16:17:04 +01:00