~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_parse.cc

Committer: Brian Aker
Date: 2008-07-07 16:07:49 UTC
mfrom: (80.1.1 food)
Revision ID: brian@tangent.org-20080707160749-qj89fnnwufz4xgop

Clean up install, we no longer have system tables.

files removed:
scripts/mysql_system_tables.sql

scripts/mysql_system_tables_fix.sql

scripts/mysql_test_data_timezone.sql

files modified:
include/my_bitmap.h

include/my_global.h

include/my_pthread.h

include/myisam.h

mysql-test/mysql-test-run.pl

mysql-test/r/information_schema.result

mysql-test/r/join.result

mysql-test/r/lock.result

mysql-test/t/information_schema.test

mysql-test/t/join.test

mysql-test/t/lock.test

mysys/my_getsystime.c

mysys/typelib.c

scripts/Makefile.am

sql-common/my_time.c

sql-common/pack.c

sql/field.cc

sql/handler.h

sql/item.cc

sql/item.h

sql/item_func.cc

sql/item_sum.cc

sql/item_sum.h

sql/item_timefunc.cc

sql/log_event.h

sql/mysql_priv.h

sql/set_var.cc

sql/sql_delete.cc

sql/sql_lex.cc

sql/sql_parse.cc

sql/sql_plugin.cc

sql/sql_repl.cc

sql/sql_select.cc

sql/sql_udf.h

sql/time.cc

storage/archive/archive_performance.c

storage/archive/archive_test.c

storage/myisam/mi_create.c

storage/myisam/myisampack.c

strings/ctype-ucs2.c

strings/decimal.c

strings/my_strtoll10.c

Show diffs side-by-side

added added

removed removed

sql/sql_parse.cc

1048

if (!(uptime= (ulong) (thd->start_time - server_start_time)))

1049

queries_per_second1000= 0;

1050

else

1051

queries_per_second1000= thd->query_id * LL(1000) / uptime;

1051

queries_per_second1000= thd->query_id * 1000LL / uptime;

1052

1053

length= my_snprintf((char*) buff, buff_len - 1,

1054

"Uptime: %lu Threads: %d Questions: %lu "

Older »