1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

more fixes for test cases

mysql-test/suite/innodb/include/restart_and_reinit.inc:
  drop and recreate mysql.innodb* tables when deleting innodb table spaces
mysql-test/t/ssl_8k_key-master.opt:
  with loose- prefix ssl errors are ignored
sql-common/client.c:
  compiler warnings
sql/field.cc:
  use the new function
sql/item.cc:
  don't convert time to double or decimal via longlong,
  this loses sub-second part.
  Use dedicated functions.
sql/item.h:
  incorrect cast_to_int type for params
sql/item_strfunc.cc:
  use the new function
sql/lex.h:
  unused
sql/my_decimal.h:
  helper macro
sql/sql_plugin.cc:
  workaround for a compiler warning
sql/sql_yacc.yy:
  unused
sql/transaction.cc:
  fix the merge for SERVER_STATUS_IN_TRANS_READONLY protocol flag
storage/sphinx/CMakeLists.txt:
  compiler warnings
This commit is contained in:
Sergei Golubchik
2012-10-01 13:15:29 +02:00
parent adf6e145f7
commit 416d0aebbf
54 changed files with 377 additions and 1089 deletions

View File

@ -75,28 +75,28 @@ Warning 1265 Data truncated for column 'c' at row 1
SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS
d238cb191361f39845a6adb2961f5501 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0
85d75a1b361e6afe5460639bddfc88ed SELECT ? FROM t1 1 0 0 0
83d5ef3dc373ad216098b07c72e61063 SELECT ? FROM `t1` 1 0 0 0
ea6492426a33544a059bc12766c5ba3d SELECT ?, ... FROM t1 2 0 0 0
c050a704c0817ec2865ead136ceea6ec SELECT ? FROM t2 1 0 0 0
a98062477bd693dacfc0df96c68c5585 SELECT ?, ... FROM t2 2 0 0 0
72470fa90a09ac60fb0ab822a3d6ade0 INSERT INTO t1 VALUES (?) 1 1 0 0
3f5fd5225f11e3e8d5e8bda8ee6c1546 INSERT INTO t2 VALUES (?) 1 1 0 0
2057d54e44b8760b5414781df21e53e5 INSERT INTO t3 VALUES (...) 1 1 0 0
b6becf79cc1c5b9faf07bcd4680e87d1 INSERT INTO t4 VALUES (...) 1 1 0 0
7d68bb708120922be9668e8c29b2ba7e INSERT INTO t5 VALUES (...) 1 1 0 0
16760e44bae66c003e39919411b8adbb INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0
29df714911c3f9b83460385a21b5386d INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0
5504ad628fc868be29157ccf556c6175 INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0
0babf2f70315be35a2a9ad6d3d800960 SELECT ? + ? 3 0 0 0
060c9d59b5b13bc4ec6188ec4f2822b1 SELECT ? 1 0 0 0
05a0fd27e76f6e38420b5dcae970c1d1 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0
cc0d093a57fbe1694ee003da61a18f50 SELECT ? FROM t1 1 0 0 0
0bf450b7940cf3dd7fc720fdd6281d77 SELECT ? FROM `t1` 1 0 0 0
3ea6d9e2c71e6fe84643d647f257ef22 SELECT ?, ... FROM t1 2 0 0 0
e9d6214db9270d8e3b12694483a7ece0 SELECT ? FROM t2 1 0 0 0
8bfd768d8ce6c88ca3ace9e9eaf74fad SELECT ?, ... FROM t2 2 0 0 0
49358f164df227c622fa9438e17c5a45 INSERT INTO t1 VALUES (?) 1 1 0 0
b5777ff47c7e7d37c738c3bbc99a5f50 INSERT INTO t2 VALUES (?) 1 1 0 0
b8f5b0056d36e62b060d605227e26bfb INSERT INTO t3 VALUES (...) 1 1 0 0
835ec262d10fbedce1e31c397bdae877 INSERT INTO t4 VALUES (...) 1 1 0 0
c0cfc65392e6ea3d51708967b0795f09 INSERT INTO t5 VALUES (...) 1 1 0 0
3e743e4d942c7b76fccddbf15211367e INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0
6048c5411fb3037b4db7a24eed82b83c INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0
2312fd042d1232cd30e4172c69b0b2e4 INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0
33ebf25ca2afeea44fd5390801df4a0a SELECT ? + ? 3 0 0 0
eb4368e66ef2ee0713b22abe1b94b5e7 SELECT ? 1 0 0 0
bce3f7384ae2ab78354b031184fde12d CREATE SCHEMA statements_digest_temp 2 2 0 0
2a0e36afeaac85dc117c3856388a4fae DROP SCHEMA statements_digest_temp 2 0 0 0
8761fd6b83357bdd00acd0b301cd1d43 SELECT ? FROM t11 1 0 0 1
2707097430c8f6e7b8c60d15d1f3ff9a CREATE TABLE t11 ( c CHARACTER (?) ) 2 0 0 1
503e81940feaf05afaafc435903f6bc3 INSERT INTO t11 VALUES (?) 1 1 1 0
cb0f8f969018eb9b6019e9fe069f6e2a SHOW WARNINGS 1 0 0 0
5a6f99b35d55cdcb4c9bd755ff6bed58 SELECT ? FROM t11 1 0 0 1
88305d7ed153aeef764d4fb992f28034 CREATE TABLE t11 ( c CHARACTER (?) ) 2 0 0 1
2a533c9f7e3b5d9dac18c4f8a0a49e53 INSERT INTO t11 VALUES (?) 1 1 1 0
35c70a6aa7abc3da331ef84b3663534b SHOW WARNINGS 1 0 0 0
####################################
# CLEANUP
####################################