diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/r/status_user.result | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysql-test/r/status_user.result')
| -rw-r--r-- | mysql-test/r/status_user.result | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/mysql-test/r/status_user.result b/mysql-test/r/status_user.result index ace8d9f26bf..cd8e5af3004 100644 --- a/mysql-test/r/status_user.result +++ b/mysql-test/r/status_user.result @@ -94,6 +94,7 @@ show status like "rows%"; Variable_name Value Rows_read 6 Rows_sent 1 +Rows_tmp_read 0 show status like "ha%"; Variable_name Value Handler_commit 19 @@ -110,6 +111,8 @@ Handler_read_rnd_next 5 Handler_rollback 2 Handler_savepoint 0 Handler_savepoint_rollback 0 +Handler_tmp_update 0 +Handler_tmp_write 0 Handler_update 5 Handler_write 7 select variable_value - @global_read_key as "handler_read_key" from information_schema.global_status where variable_name="handler_read_key"; @@ -134,7 +137,7 @@ CONCURRENT_CONNECTIONS 0 ROWS_READ 6 ROWS_SENT 2 ROWS_DELETED 1 -ROWS_INSERTED 8 +ROWS_INSERTED 7 ROWS_UPDATED 5 SELECT_COMMANDS 3 UPDATE_COMMANDS 11 @@ -151,7 +154,7 @@ CONCURRENT_CONNECTIONS 0 ROWS_READ 6 ROWS_SENT 2 ROWS_DELETED 1 -ROWS_INSERTED 8 +ROWS_INSERTED 7 ROWS_UPDATED 5 SELECT_COMMANDS 3 UPDATE_COMMANDS 11 @@ -184,4 +187,33 @@ bytes_sent <> 0, binlog_bytes_written <> 0 from information_schema.client_statistics; connected_time <> 0 busy_time <> 0 bytes_received <> 0 bytes_sent <> 0 binlog_bytes_written <> 0 1 1 1 1 1 +create table t1 (a int) engine=innodb; +select @@in_transaction; +@@in_transaction +0 +begin; +select @@in_transaction; +@@in_transaction +1 +insert into t1 values (1); +select @@in_transaction; +@@in_transaction +1 +commit; +select @@in_transaction; +@@in_transaction +0 +set @@autocommit=0; +select @@in_transaction; +@@in_transaction +0 +insert into t1 values (2); +select @@in_transaction; +@@in_transaction +1 +set @@autocommit=1; +select @@in_transaction; +@@in_transaction +0 +drop table t1; set @@global.general_log=@save_general_log; |