2971 Marc Alff 2009-11-25
Misc cleanup: whitespace and copyright
modified:
mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result
mysql-test/suite/perfschema/r/func_file_io.result
mysql-test/suite/perfschema/r/selects.result
mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test
mysql-test/suite/perfschema/t/func_file_io.test
mysql-test/suite/perfschema/t/selects.test
mysql-test/suite/perfschema_stress/README
mysql-test/suite/perfschema_stress/t/modify.test
mysql-test/suite/perfschema_stress/t/read.test
mysql-test/suite/perfschema_stress/t/setup.test
sql/sql_insert.cc
2970 Marc Alff 2009-11-25 [merge]
Merge mysql-next-mr (revno 2941) --> mysql-trunk-perfschema
modified:
client/mysqladmin.cc
client/mysqldump.c
client/mysqlimport.c
client/mysqlslap.c
client/mysqltest.cc
client/sql_string.cc
configure.in
extra/comp_err.c
extra/replace.c
include/config-netware.h
include/config-win.h
include/my_alarm.h
include/my_global.h
include/my_pthread.h
include/violite.h
libmysql/libmysql.c
mysql-test/r/drop.result
mysql-test/r/errors.result
mysql-test/r/group_by.result
mysql-test/r/insert_notembedded.result
mysql-test/r/lock.result
mysql-test/r/lock_multi.result
mysql-test/r/myisam.result
mysql-test/r/query_cache_notembedded.result
mysql-test/r/sp-error.result
mysql-test/r/sp.result
mysql-test/r/status.result
mysql-test/r/view.result
mysql-test/t/drop.test
mysql-test/t/errors.test
mysql-test/t/group_by.test
mysql-test/t/insert_notembedded.test
mysql-test/t/lock.test
mysql-test/t/lock_multi.test
mysql-test/t/myisam.test
mysql-test/t/query_cache_notembedded.test
mysql-test/t/sp-error.test
mysql-test/t/sp.test
mysql-test/t/status.test
mysql-test/t/view.test
mysys/errors.c
mysys/hash.c
mysys/mf_iocache2.c
mysys/mf_loadpath.c
mysys/mf_path.c
mysys/my_append.c
mysys/my_clock.c
mysys/my_copy.c
mysys/my_fstream.c
mysys/my_getwd.c
mysys/my_lib.c
mysys/my_lockmem.c
mysys/my_pthread.c
mysys/my_redel.c
mysys/my_wincond.c
mysys/stacktrace.c
mysys/thr_alarm.c
mysys/thr_lock.c
sql/derror.cc
sql/discover.cc
sql/field.cc
sql/filesort.cc
sql/ha_partition.cc
sql/handler.cc
sql/handler.h
sql/init.cc
sql/item.cc
sql/item_cmpfunc.cc
sql/lock.cc
sql/log.cc
sql/log_event.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_range.h
sql/protocol.cc
sql/records.cc
sql/set_var.cc
sql/slave.cc
sql/slave.h
sql/sp_head.cc
sql/sp_pcontext.cc
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_db.cc
sql/sql_insert.cc
sql/sql_map.cc
sql/sql_parse.cc
sql/sql_prepare.cc
sql/sql_select.cc
sql/sql_servers.cc
sql/sql_show.cc
sql/sql_string.cc
sql/sql_table.cc
sql/sql_test.cc
sql/sql_update.cc
sql/table.cc
sql/udf_example.c
sql/uniques.cc
sql/unireg.cc
sql/unireg.h
storage/archive/ha_archive.cc
storage/heap/hp_clear.c
storage/heap/hp_test1.c
storage/heap/hp_test2.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/include/srv0srv.h
storage/innobase/os/os0thread.c
storage/innobase/srv/srv0srv.c
storage/myisam/ft_eval.c
storage/myisam/ha_myisam.cc
storage/myisam/mi_changed.c
storage/myisam/mi_check.c
storage/myisam/mi_create.c
storage/myisam/mi_dbug.c
storage/myisam/mi_delete.c
storage/myisam/mi_delete_all.c
storage/myisam/mi_dynrec.c
storage/myisam/mi_info.c
storage/myisam/mi_locking.c
storage/myisam/mi_log.c
storage/myisam/mi_open.c
storage/myisam/mi_packrec.c
storage/myisam/mi_panic.c
storage/myisam/mi_rsame.c
storage/myisam/mi_statrec.c
storage/myisam/mi_test1.c
storage/myisam/mi_test2.c
storage/myisam/mi_test3.c
storage/myisam/mi_update.c
storage/myisam/mi_write.c
storage/myisam/myisamchk.c
storage/myisam/myisamlog.c
storage/myisam/myisampack.c
storage/myisam/sort.c
storage/myisammrg/myrg_create.c
storage/myisammrg/myrg_open.c
strings/str_test.c
tests/mysql_client_test.c
tests/thread_test.c
vio/viosocket.c
=== modified file 'mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result'
--- a/mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result 2009-11-19 19:48:19 +0000
+++ b/mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result 2009-11-25 19:52:40 +0000
@@ -4,5 +4,6 @@ ERROR 42000: Access denied for user 'roo
truncate table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME;
ALTER TABLE performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME ADD INDEX test_index(THREAD_ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
-CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME(THREAD_ID);
+CREATE UNIQUE INDEX test_index
+ON performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME(THREAD_ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
=== modified file 'mysql-test/suite/perfschema/r/func_file_io.result'
--- a/mysql-test/suite/perfschema/r/func_file_io.result 2009-11-24 10:28:12 +0000
+++ b/mysql-test/suite/perfschema/r/func_file_io.result 2009-11-25 19:52:40 +0000
@@ -13,7 +13,7 @@ id b
1 initial value
SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
-WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
+WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD'));
SELECT IF(@before_count > 0, 'Success', 'Failure') has_instrumentation;
has_instrumentation
@@ -25,7 +25,7 @@ id b
3 initial value
SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
-WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
+WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (1 = 1));
SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_ff1_timed;
test_ff1_timed
@@ -33,7 +33,7 @@ Success
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled='NO';
SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
-WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
+WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (2 = 2));
SELECT * FROM t1 WHERE id < 6;
id b
@@ -44,7 +44,7 @@ id b
5 initial value
SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
-WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
+WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (3 = 3));
SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_ff2_timed;
test_ff2_timed
@@ -62,17 +62,17 @@ id b
7 initial value
8 initial value
SELECT * FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
-WHERE TIMER_WAIT != NULL
+WHERE TIMER_WAIT != NULL
OR TIMER_START != NULL
OR TIMER_END != NULL;
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
SELECT * FROM performance_schema.EVENTS_WAITS_HISTORY
-WHERE TIMER_WAIT != NULL
+WHERE TIMER_WAIT != NULL
OR TIMER_START != NULL
OR TIMER_END != NULL;
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
SELECT * FROM performance_schema.EVENTS_WAITS_CURRENT
-WHERE TIMER_WAIT != NULL
+WHERE TIMER_WAIT != NULL
OR TIMER_START != NULL
OR TIMER_END != NULL;
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
@@ -87,7 +87,7 @@ SELECT SUM(COUNT_READ) AS sum_count_read
SUM(COUNT_WRITE) AS sum_count_write,
SUM(SUM_NUMBER_OF_BYTES_READ) AS sum_num_bytes_read,
SUM(SUM_NUMBER_OF_BYTES_WRITE) AS sum_num_bytes_write
-FROM performance_schema.FILE_SUMMARY_BY_INSTANCE
+FROM performance_schema.FILE_SUMMARY_BY_INSTANCE
WHERE FILE_NAME LIKE CONCAT('%', @@tmpdir, '%') ORDER BY NULL;
SELECT EVENT_NAME, COUNT_STAR, AVG_TIMER_WAIT, SUM_TIMER_WAIT
FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_EVENT_NAME
=== modified file 'mysql-test/suite/perfschema/r/selects.result'
--- a/mysql-test/suite/perfschema/r/selects.result 2009-11-19 18:13:44 +0000
+++ b/mysql-test/suite/perfschema/r/selects.result 2009-11-25 19:52:40 +0000
@@ -78,14 +78,14 @@ id c
DROP TRIGGER t_ps_trigger;
CREATE PROCEDURE t_ps_proc(IN tid INT, OUT pid INT)
BEGIN
-SELECT id FROM performance_schema.PROCESSLIST
+SELECT id FROM performance_schema.PROCESSLIST
WHERE THREAD_ID = tid INTO pid;
END;
|
CALL t_ps_proc(0, @p_id);
CREATE FUNCTION t_ps_func(tid INT) RETURNS int
BEGIN
-return (SELECT id FROM performance_schema.PROCESSLIST
+return (SELECT id FROM performance_schema.PROCESSLIST
WHERE THREAD_ID = tid);
END;
|
=== modified file 'mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test'
--- a/mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test 2009-11-19 19:48:19 +0000
+++ b/mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test 2009-11-25 19:52:40 +0000
@@ -27,5 +27,6 @@ truncate table performance_schema.EVENTS
ALTER TABLE performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME ADD INDEX test_index(THREAD_ID);
-- error ER_DBACCESS_DENIED_ERROR
-CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME(THREAD_ID);
+CREATE UNIQUE INDEX test_index
+ ON performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME(THREAD_ID);
=== modified file 'mysql-test/suite/perfschema/t/func_file_io.test'
--- a/mysql-test/suite/perfschema/t/func_file_io.test 2009-11-24 21:36:48 +0000
+++ b/mysql-test/suite/perfschema/t/func_file_io.test 2009-11-25 19:52:40 +0000
@@ -52,7 +52,7 @@ SELECT * FROM t1 WHERE id = 1;
SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
- WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
+ WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD'));
SELECT IF(@before_count > 0, 'Success', 'Failure') has_instrumentation;
@@ -61,7 +61,7 @@ SELECT * FROM t1 WHERE id < 4;
SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
- WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
+ WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (1 = 1));
SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_ff1_timed;
@@ -70,14 +70,14 @@ UPDATE performance_schema.SETUP_INSTRUME
SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
- WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
+ WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (2 = 2));
SELECT * FROM t1 WHERE id < 6;
SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
- WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
+ WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (3 = 3));
SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_ff2_timed;
@@ -98,17 +98,17 @@ TRUNCATE TABLE performance_schema.EVENTS
SELECT * FROM t1 WHERE id > 4;
SELECT * FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
-WHERE TIMER_WAIT != NULL
+WHERE TIMER_WAIT != NULL
OR TIMER_START != NULL
OR TIMER_END != NULL;
SELECT * FROM performance_schema.EVENTS_WAITS_HISTORY
-WHERE TIMER_WAIT != NULL
+WHERE TIMER_WAIT != NULL
OR TIMER_START != NULL
OR TIMER_END != NULL;
SELECT * FROM performance_schema.EVENTS_WAITS_CURRENT
-WHERE TIMER_WAIT != NULL
+WHERE TIMER_WAIT != NULL
OR TIMER_START != NULL
OR TIMER_END != NULL;
@@ -127,7 +127,7 @@ SELECT SUM(COUNT_READ) AS sum_count_read
SUM(COUNT_WRITE) AS sum_count_write,
SUM(SUM_NUMBER_OF_BYTES_READ) AS sum_num_bytes_read,
SUM(SUM_NUMBER_OF_BYTES_WRITE) AS sum_num_bytes_write
-FROM performance_schema.FILE_SUMMARY_BY_INSTANCE
+FROM performance_schema.FILE_SUMMARY_BY_INSTANCE
WHERE FILE_NAME LIKE CONCAT('%', @@tmpdir, '%') ORDER BY NULL;
--enable_result_log
=== modified file 'mysql-test/suite/perfschema/t/selects.test'
--- a/mysql-test/suite/perfschema/t/selects.test 2009-11-24 10:28:12 +0000
+++ b/mysql-test/suite/perfschema/t/selects.test 2009-11-25 19:52:40 +0000
@@ -123,7 +123,7 @@ delimiter |;
CREATE PROCEDURE t_ps_proc(IN tid INT, OUT pid INT)
BEGIN
- SELECT id FROM performance_schema.PROCESSLIST
+ SELECT id FROM performance_schema.PROCESSLIST
WHERE THREAD_ID = tid INTO pid;
END;
@@ -139,7 +139,7 @@ delimiter |;
CREATE FUNCTION t_ps_func(tid INT) RETURNS int
BEGIN
- return (SELECT id FROM performance_schema.PROCESSLIST
+ return (SELECT id FROM performance_schema.PROCESSLIST
WHERE THREAD_ID = tid);
END;
=== modified file 'mysql-test/suite/perfschema_stress/README'
--- a/mysql-test/suite/perfschema_stress/README 2009-11-19 18:13:44 +0000
+++ b/mysql-test/suite/perfschema_stress/README 2009-11-25 19:52:40 +0000
@@ -1,3 +1,17 @@
+# Copyright (C) 2009 Sun Microsystems, Inc
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
WL#4818 - Stress testing of PERFORMANCE_SCHEMA
@@ -7,7 +21,7 @@ load.
NFS1: 20 threads doing read of performance data (both mutex and
disk), 5 threads changing what is being instrumented, 25 threads doing
-DML and DDL so that the statistics are updated. Connections should frequently
+DML and DDL so that the statistics are updated. Connections should frequently
disconnect or be KILLed, and reconnect.
The database should not crash under any circumstance.
=== modified file 'mysql-test/suite/perfschema_stress/t/modify.test'
--- a/mysql-test/suite/perfschema_stress/t/modify.test 2009-11-19 18:13:44 +0000
+++ b/mysql-test/suite/perfschema_stress/t/modify.test 2009-11-25 19:52:40 +0000
@@ -27,22 +27,22 @@ UPDATE performance_schema.SETUP_INSTRUME
UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'NO';
-UPDATE performance_schema.SETUP_TIMERS
+UPDATE performance_schema.SETUP_TIMERS
SET TIMER_NAME = 'NANOSECOND' WHERE NAME = 'Wait';
# Let it run some time with the new timer name and instruments
--sleep 1
-UPDATE performance_schema.SETUP_TIMERS
+UPDATE performance_schema.SETUP_TIMERS
SET TIMER_NAME = 'CYCLE' WHERE NAME = 'Wait';
UPDATE performance_schema.SETUP_INSTRUMENTS SET TIMED = 'YES';
-UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'YES'
-WHERE NAME IN ('wait/io/file/sql/FRM',
- 'thread/sql/Connection',
- 'wait/synch/cond/sql/COND_mdl',
- 'wait/synch/rwlock/sql/LOCK_sys_init_connect',
+UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'YES'
+WHERE NAME IN ('wait/io/file/sql/FRM',
+ 'thread/sql/Connection',
+ 'wait/synch/cond/sql/COND_mdl',
+ 'wait/synch/rwlock/sql/LOCK_sys_init_connect',
'wait/synch/mutex/sql/LOCK_mdl');
# Two short lived changes to see that switching does not lead
=== modified file 'mysql-test/suite/perfschema_stress/t/read.test'
--- a/mysql-test/suite/perfschema_stress/t/read.test 2009-11-19 18:13:44 +0000
+++ b/mysql-test/suite/perfschema_stress/t/read.test 2009-11-25 19:52:40 +0000
@@ -26,12 +26,12 @@ WHERE SPINS != NULL;
SELECT * FROM performance_schema.PROCESSLIST p,
performance_schema.EVENTS_WAITS_CURRENT e
-WHERE p.THREAD_ID = e.THREAD_ID
+WHERE p.THREAD_ID = e.THREAD_ID
AND TIMER_START = 0
ORDER BY e.EVENT_ID;
SELECT * FROM performance_schema.EVENTS_WAITS_CURRENT
-WHERE THREAD_ID IN (SELECT THREAD_ID
+WHERE THREAD_ID IN (SELECT THREAD_ID
FROM performance_schema.PROCESSLIST
ORDER BY THREAD_ID)
AND TIMER_END = 0
@@ -43,7 +43,7 @@ SELECT SUM(COUNT_READ) AS sum_count_read
SUM(COUNT_WRITE) AS sum_count_write,
SUM(SUM_NUMBER_OF_BYTES_READ) AS sum_num_bytes_read,
SUM(SUM_NUMBER_OF_BYTES_WRITE) AS sum_num_bytes_write
-FROM performance_schema.FILE_SUMMARY_BY_INSTANCE
+FROM performance_schema.FILE_SUMMARY_BY_INSTANCE
WHERE FILE_NAME LIKE CONCAT('%', @@tmpdir, '%') ORDER BY NULL;
--enable_result_log
=== modified file 'mysql-test/suite/perfschema_stress/t/setup.test'
--- a/mysql-test/suite/perfschema_stress/t/setup.test 2009-11-19 18:13:44 +0000
+++ b/mysql-test/suite/perfschema_stress/t/setup.test 2009-11-25 19:52:40 +0000
@@ -51,11 +51,11 @@ while (`SELECT MAX(id) < $num_stress_row
UPDATE performance_schema.SETUP_INSTRUMENTS SET TIMED = 'YES';
UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'NO';
-UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'YES'
-WHERE NAME IN ('wait/io/file/sql/FRM',
- 'thread/sql/Connection',
- 'wait/synch/cond/sql/COND_mdl',
- 'wait/synch/rwlock/sql/LOCK_sys_init_connect',
+UPDATE performance_schema.SETUP_INSTRUMENTS SET ENABLED = 'YES'
+WHERE NAME IN ('wait/io/file/sql/FRM',
+ 'thread/sql/Connection',
+ 'wait/synch/cond/sql/COND_mdl',
+ 'wait/synch/rwlock/sql/LOCK_sys_init_connect',
'wait/synch/mutex/sql/LOCK_mdl');
UPDATE performance_schema.SETUP_CONSUMERS SET ENABLED = 'YES';
=== modified file 'sql/sql_insert.cc'
--- a/sql/sql_insert.cc 2009-11-25 19:06:24 +0000
+++ b/sql/sql_insert.cc 2009-11-25 19:52:40 +0000
@@ -2418,9 +2418,9 @@ pthread_handler_t handle_delayed_insert(
{
int error;
#if defined(HAVE_BROKEN_COND_TIMEDWAIT)
- error= mysql_cond_wait(&di->cond,&di->mutex);
+ error= mysql_cond_wait(&di->cond, &di->mutex);
#else
- error= mysql_cond_timedwait(&di->cond,&di->mutex,&abstime);
+ error= mysql_cond_timedwait(&di->cond, &di->mutex, &abstime);
#ifdef EXTRA_DEBUG
if (error && error != EINTR && error != ETIMEDOUT)
{
Attachment: [text/bzr-bundle] bzr/marc.alff@sun.com-20091125195240-b8tvp791uaz0qak4.bundle
| Thread |
|---|
| • bzr push into mysql-trunk-perfschema branch (marc.alff:2970 to 2971) | Marc Alff | 25 Nov |
