monty@narttu.mysql.fi
717284b85c
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-11-29 23:07:15 +02:00
monty@narttu.mysql.fi
2e8d2e3ef9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-29 22:54:11 +02:00
monty@mysql.com/narttu.mysql.fi
23263db66e
Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations
...
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
2006-11-29 22:51:09 +02:00
monty@mysql.com/narttu.mysql.fi
8aec636ba8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-11-29 17:25:23 +02:00
kent@kent-amd64.(none)
65183d54d2
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-29 14:28:05 +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
gkodinov@dl145s.mysql.com
32c9e11df9
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-11-28 17:14:16 +01:00
monty@mysql.com/nosik.monty.fi
93f246d4c1
Fixed portablity problem
...
Removed warnings from mysqltest scripts
2006-11-28 05:43:30 +02:00
monty@mysql.com/nosik.monty.fi
9c3a2a0d8e
Increased heap max length to > 4G for 64 bit machines
...
Initialize key_part->type on open. This caused key_copy() to fail for bit_fields. (key_copy is used in HANDLER and opt_range)
2006-11-28 00:47:21 +02: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
joerg@trift2.
fc49099e20
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into trift2.:/MySQL/M51/push-5.1
2006-11-27 20:40:56 +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
gkodinov@dl145s.mysql.com
e74c9add47
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-11-27 16:25:52 +01:00
monty@nosik.monty.fi
313f23a93a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into mysql.com:/home/my/mysql-5.1
2006-11-27 14:07:52 +02: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
jani/jamppa@bk-internal.mysql.com
e394d254fb
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2006-11-24 16:46:27 +01:00
df@kahlann.erinye.com
b1f020e52a
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-24 15:38:14 +01:00
df@kahlann.erinye.com
728357200c
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-24 15:36:51 +01:00
df@kahlann.erinye.com
34cedd8d77
fixes for mtr_unique.pl
2006-11-24 15:36:04 +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
gkodinov/kgeorge@macbook.gmz
9004d93b44
Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.1
...
into macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
2006-11-22 12:48:29 +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
gluh@mysql.com/gluh.(none)
e37d08155b
after merge fix
2006-11-21 16:45:05 +04:00
gluh@gluh.(none)
a128f60337
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2006-11-21 14:04:43 +04:00
gluh@mysql.com/gluh.(none)
ff38409128
Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crash
...
disable filling of I_S tables for EXPLAIN
2006-11-21 13:45:01 +04:00
monty@mysql.com/nosik.monty.fi
306b871d52
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-11-20 22:46:52 +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
iggy/Administrator@amd64.
3d1b9a66e4
Bug#23983 ps.test fails to open shared library
...
- When a shared library argument is supplied, it's checked for an OS
specific directory separator. The expected error is different
depending on the separator used. Create OS specific versions of these
tests.
2006-11-20 15:18:57 -05: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
gkodinov/kgeorge@macbook.gmz
2c82b5a97a
5.0-opt -> 5.1-opt merge fixed.
2006-11-20 12:46:47 +02:00
holyfoot/hf@deer.(none)
989117071a
Merge mysql.com:/home/hf/work/mysql-5.0-0mrg
...
into mysql.com:/home/hf/work/mysql-5.1-mrg
2006-11-19 22:26:36 +04:00
holyfoot/hf@mysql.com/deer.(none)
40b22f3910
merging
2006-11-18 21:49:59 +04: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
holyfoot/hf@deer.(none)
7d190dd6b1
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/mysql-5.1-mrg
2006-11-17 19:01:35 +04:00
holyfoot/hf@deer.(none)
dd0b81885d
Merge mysql.com:/home/hf/work/mysql-5.0-mrg
...
into mysql.com:/home/hf/work/mysql-5.1-mrg
2006-11-17 18:27:28 +04:00