Commit graph

40581 commits

Author SHA1 Message Date
anozdrin/alik@booka.
1efc862080 Polishing: use the same coding style everywhere. 2006-11-21 17:01:11 +03:00
kroki/tomash@moonlight.intranet
5ba9ab49b7 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23159
2006-11-21 17:00:42 +03:00
kroki/tomash@moonlight.intranet
cb69318963 Fix after manual merge. 2006-11-21 16:57:23 +03:00
kroki/tomash@moonlight.intranet
2bde57836c Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159
2006-11-21 16:53:33 +03:00
kroki/tomash@moonlight.intranet
0d588f8882 BUG#23159: prepared_stmt_count should be status variable
Make Prepared_stmt_count a global status variable, accessible via
SHOW STATUS LIKE 'Prepared_stmt_count';.  Documentation should be
updated.
2006-11-21 16:49:18 +03:00
mats@romeo.(none)
55b666441e Merge romeo.(none):/home/bkroot/mysql-5.1
into  romeo.(none):/home/bk/memcheck-mysql-5.1
2006-11-21 14:44:20 +01:00
mats@romeo.(none)
600a6a676c BUG#24403 (valgrind complaint on uninited st_table for innodb + rbr):
Removing DBUG_DUMP printouts for valgrind builds since they trigger warnings.
Removing valgrind memory checks completely.
Removing bzero() of record when opening table that was added earlier.
2006-11-21 13:57:52 +01: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
brian@zim.(none)
39458a6e1b This straightens up usage of have_ variables, and removes dead -skip-isam option. 2006-11-20 14:04:07 -08: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
mats@romeo.(none)
a8efaaee57 Merge romeo.(none):/home/bkroot/mysql-5.1
into  romeo.(none):/home/bk/memcheck-mysql-5.1
2006-11-20 21:37:48 +01:00
mats@romeo.(none)
3eabde4091 BUG#24403 (valgrind complained on uninited st_table for InnoDB and RBR):
Fix to correct behaviour of find_and_fetch_row() for tables that have primary keys stored
in storage engines that support the fast method to fetch rows given a primary key. The
method uses position() to retrieve the key for a given record and rnd_pos() to position
the internal "cursor" at the row. Rnd_pos() returns the found record in table->record[0],
so the record has to be moved to table->record[1] for further processing after calling
find_and_fetch_row().
2006-11-20 21:27:39 +01:00
iggy/Administrator@amd64.
8c82165013 Merge amd64.:D:/src/mysql-5.1
into  amd64.:D:/src/mysql-5.1_bug23983
2006-11-20 15:25:10 -05: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@shellback.(none)
d2c45ec3c5 Bug#24361 valgrind error when shutting down mysqld connected to cluster
- Disconnect from transporter before starting to delete objects
2006-11-20 21:11:45 +01:00
anozdrin/alik@booka.site
420d8b070b Polishing + make the code compiled on Windows. 2006-11-20 15:37:12 +03: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
de08856720 fix for the merge of --mem support in autopush.pl in 5.1-opt 2006-11-20 13:42:22 +02:00
gkodinov/kgeorge@macbook.gmz
2c82b5a97a 5.0-opt -> 5.1-opt merge fixed. 2006-11-20 12:46:47 +02:00
kostja@bodhi.local
c136e8d528 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  bodhi.local:/opt/local/work/m51lamp
2006-11-20 13:01:19 +03:00
anozdrin/alik@booka.site
61e684943b Polishing: eliminate warnings. 2006-11-20 10:05:24 +03:00
brian@zim.(none)
f0c661f1ac Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location. 2006-11-19 18:01:54 -08: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)
bcfed657e7 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/hf/work/mysql-5.0-mrg
2006-11-19 22:16:13 +04:00
holyfoot/hf@deer.(none)
bc840a7f8e Merge mysql.com:/home/hf/work/mysql-5.0-mrg
into  mysql.com:/home/hf/work/mysql-5.1-mrg
2006-11-19 22:13:20 +04:00
holyfoot/hf@mysql.com/deer.(none)
dbda18e9df Merge mysql.com:/home/hf/work/mysql-4.1-mrg
into  mysql.com:/home/hf/work/mysql-5.0-mrg
2006-11-19 20:48:26 +04:00
holyfoot/hf@mysql.com/deer.(none)
40b22f3910 merging 2006-11-18 21:49:59 +04:00
kostja@bodhi.local
2fc4562d63 Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for 
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
2006-11-18 01:34:44 +03:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
540eb5ac4c Bug #24403 valgrind complained on uninited st_table, rbr + innodb
open_table_from_share did not initialize table->record members. that was
  interpreted as the error by valgrind.
  
  Fixed with bzero-ing the members if compilation with -DHAVE_purify.
2006-11-17 23:44:14 +02:00
kostja@bodhi.local
d2248d973e A post-merge fix. 2006-11-17 20:07:52 +03: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
joerg@trift2.
16cb323429 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2006-11-17 16:33:11 +01:00
joerg@trift2.
f9e9ce60e8 Merge trift2.:/MySQL/M50/yassl-win-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-11-17 16:30:08 +01:00
kostja@bodhi.local
33bbdf5c25 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  bodhi.local:/opt/local/work/m51lamp
2006-11-17 18:19:49 +03:00
joerg@trift2.
0aee63517e Maintain the (old) VC project files, ehere yaSSL is concerned:
"mySTL" has become a subdirectory of "taocrypt", was a sibling previously.
2006-11-17 16:09:37 +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
anozdrin/alik@alik.
c6cd61a5cc Polishing: generate more warnings and make code warnings-free. 2006-11-17 16:45:29 +03:00
kostja@bodhi.local
7278f45bfd Replace the approach using Foo_thread_args + Foo_thread and manually
spawned threads with a reusable class Thread.

This is the second idea implemented in the Alik's patch for
BUG#22306: STOP INSTANCE can not be applied for instances in Crashed,
Failed and Abandoned.
Commiting separately to ease review process.
2006-11-17 16:11:04 +03:00
kroki/tomash@moonlight.intranet
f8149f79a3 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383
2006-11-17 15:04:26 +03:00
kroki/tomash@moonlight.intranet
f6e4e2317e Fix after manual merge: remove dead declaration. 2006-11-17 13:56:11 +03:00
holyfoot/hf@mysql.com/deer.(none)
5906c3868f ABI fix 2006-11-17 14:30:08 +04:00
kroki/tomash@moonlight.intranet
d1af1d5c29 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383
2006-11-17 12:41:17 +03:00
kroki/tomash@moonlight.intranet
e7ebeac561 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383
2006-11-17 12:40:42 +03:00
kroki/tomash@moonlight.intranet
8c55f4743d Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23383
2006-11-17 12:39:55 +03:00