Merge lp:~stewart/drizzle/bug911643 into lp:~drizzle-trunk/drizzle/development

[Stewart Smith]

yet another odd thing I've hit with the CATALOG work :)

and this time, fixed so that "make distcheck" works - namely because we were using test/ as directory for txn log, which doesn't work when (without restarting server) you try and DROP SCHEMA test (a whole bunch later in drizzledump_restore test).

i.e. thi sshould merge okay now

[David Shrewsbury (dshrews)]

Good catch.

review: Approve

[Mark Atwood (fallenpegasus)]

Fails in Jenkins build testing

http://jenkins.drizzle.org/view/Drizzle-build/job/drizzle-build-ubuntu10.10-32bit/1168/console

main.drizzledump_restore [ fail ]
ERROR 1006 (HY000) at line 11: Can't create schema 'test' (errno: 17)
drizzletest: At line 123: command "$DRIZZLE < $drizzledumpfile" failed

The result from queries just before the failure was:
< snip >
#
# Bug#550091 in Drizzle: "drizzledump dumps data_dictionary"
#
CREATE TABLE t1 (a char(100), b int);
INSERT INTO t1 values ('a',100);
INSERT INTO t1 values ('b',200);
CREATE SCHEMA drizzledump_test;
USE drizzledump_test;
CREATE TABLE t1 (a int, b char(100));
INSERT INTO t1 VALUES (1, 'abbazabba');
DROP original schemas
DROP DATABASE test;
DROP DATABASE drizzledump_test;
Ensure we don't have those tables (verify we restored something)
SELECT * FROM test.t1;
Got one of the listed errors
SELECT * FROM drizzledump_test.t1;
Got one of the listed errors
Restoring from dumpfile
exec of './tests/var/../../client/drizzle --no-defaults --host=localhost --user=root --password= --port=9090 < /home/hudson/hudson/workspace/drizzle-build-ubuntu10.10-32bit/drizzle7-2011.11.29.2488/_build/tests/var/tmp/drizzledumpfile.sql' failed, error: 256, status: 1, errno: 11

More results from queries before failure can be found in /home/hudson/hudson/workspace/drizzle-build-ubuntu10.10-32bit/drizzle7-2011.11.29.2488/_build/tests/var/log/drizzledump_restore.log

Stopping All Servers
Restoring snapshot of databases
Resuming Tests

review: Needs Fixing

=== modified file 'plugin/transaction_log/hexdump_transaction_message.cc'
--- plugin/transaction_log/hexdump_transaction_message.cc	2011-08-22 19:14:08 +0000
+++ plugin/transaction_log/hexdump_transaction_message.cc	2012-01-16 00:41:25 +0000
@@ -99,7 +99,7 @@
    * a pool of TransactionLogReader objects that can be 
    * re-used.
    */
-  const string &filename= transaction_log->getLogFilename();
+  const string &filename= transaction_log->getLogFilepath();
   int log_file= open(filename.c_str(), O_RDONLY);
   if (log_file == -1)
   {

=== modified file 'plugin/transaction_log/print_transaction_message.cc'
--- plugin/transaction_log/print_transaction_message.cc	2011-04-14 21:56:22 +0000
+++ plugin/transaction_log/print_transaction_message.cc	2012-01-16 00:41:25 +0000
@@ -99,7 +99,7 @@
    * a pool of TransactionLogReader objects that can be 
    * re-used.
    */
-  const string &filename= transaction_log->getLogFilename();
+  const string &filename= transaction_log->getLogFilepath();
   int log_file= open(filename.c_str(), O_RDONLY);
   if (log_file == -1)
   {

=== added file 'plugin/transaction_log/tests/r/bug911643.result'
--- plugin/transaction_log/tests/r/bug911643.result	1970-01-01 00:00:00 +0000
+++ plugin/transaction_log/tests/r/bug911643.result	2012-01-16 00:41:25 +0000
@@ -0,0 +1,71 @@
+CREATE TABLE t1 (
+pk INT NOT NULL AUTO_INCREMENT,
+col_int1 INT,
+col_int2 INT,
+col_int_not_null INT NOT NULL,
+PRIMARY KEY (pk));
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (1,1,1);
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (NULL,1,1);
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (2,1,3);
+SET GLOBAL transaction_log_truncate_debug= true;
+BEGIN;
+UPDATE t1 SET col_int_not_null = col_int1 WHERE col_int2 = 1;
+ERROR 23000: Column 'col_int_not_null' cannot be null
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (5,5,5);
+COMMIT;
+
+We should have a Transaction with a single insert Statement
+SELECT PRINT_TRANSACTION_MESSAGE('test/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
+PRINT_TRANSACTION_MESSAGE('test/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS))
+transaction_context {
+  server_id: 1
+  TRANSACTION_ID
+  START_TIMESTAMP
+  END_TIMESTAMP
+}
+statement {
+  type: INSERT
+  START_TIMESTAMP
+  END_TIMESTAMP
+  insert_header {
+    table_metadata {
+      schema_name: "test"
+      table_name: "t1"
+    }
+    field_metadata {
+      type: INTEGER
+      name: "pk"
+    }
+    field_metadata {
+      type: INTEGER
+      name: "col_int1"
+    }
+    field_metadata {
+      type: INTEGER
+      name: "col_int2"
+    }
+    field_metadata {
+      type: INTEGER
+      name: "col_int_not_null"
+    }
+  }
+  insert_data {
+    segment_id: 1
+    end_segment: true
+    record {
+      insert_value: "4"
+      insert_value: "5"
+      insert_value: "5"
+      insert_value: "5"
+      is_null: false
+      is_null: false
+      is_null: false
+      is_null: false
+    }
+  }
+}
+segment_id: 1
+end_segment: true
+
+DROP TABLE t1;
+SET GLOBAL transaction_log_truncate_debug= true;

=== added file 'plugin/transaction_log/tests/t/bug911643-master.opt'
--- plugin/transaction_log/tests/t/bug911643-master.opt	1970-01-01 00:00:00 +0000
+++ plugin/transaction_log/tests/t/bug911643-master.opt	2012-01-16 00:41:25 +0000
@@ -0,0 +1,1 @@
+--transaction-log.enable --scheduler=multi_thread  --transaction-message-threshold=131072 --allow-all-authentication.allow_anonymous=true --transaction-log.file=../local/transaction.log

=== added file 'plugin/transaction_log/tests/t/bug911643.test'
--- plugin/transaction_log/tests/t/bug911643.test	1970-01-01 00:00:00 +0000
+++ plugin/transaction_log/tests/t/bug911643.test	2012-01-16 00:41:25 +0000
@@ -0,0 +1,28 @@
+CREATE TABLE t1 (
+  pk INT NOT NULL AUTO_INCREMENT,
+  col_int1 INT,
+  col_int2 INT,
+  col_int_not_null INT NOT NULL,
+  PRIMARY KEY (pk));
+
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (1,1,1);
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (NULL,1,1);
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (2,1,3);
+
+SET GLOBAL transaction_log_truncate_debug= true;
+
+--test with no previous Statement message
+BEGIN;
+--ERROR ER_BAD_NULL_ERROR
+UPDATE t1 SET col_int_not_null = col_int1 WHERE col_int2 = 1;
+INSERT INTO t1 (col_int1, col_int2, col_int_not_null) VALUES (5,5,5);
+COMMIT;
+
+--echo
+--echo We should have a Transaction with a single insert Statement
+--replace_regex /transaction_id: [0-9]+/TRANSACTION_ID/ /start_timestamp: [0-9]+/START_TIMESTAMP/g /end_timestamp: [0-9]+/END_TIMESTAMP/g /creation_timestamp: [0-9]+/CREATE_TIMESTAMP/ /update_timestamp: [0-9]+/UPDATE_TIMESTAMP/
+
+SELECT PRINT_TRANSACTION_MESSAGE('test/transaction.log',(select max(entry_offset) from DATA_DICTIONARY.TRANSACTION_LOG_TRANSACTIONS));
+
+DROP TABLE t1;
+SET GLOBAL transaction_log_truncate_debug= true;