Merge lp:~ubuntu-43/undrop-for-innodb/pierre into lp:undrop-for-innodb

[Aleksandr Kuzminsky]

[Aleksandr Kuzminsky (akuzminsky)]

conflicts fixed

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-09-03 23:24:55 +0000
+++ Makefile	2014-10-19 02:20:41 +0000
@@ -3,19 +3,23 @@
 SRCS = stream_parser.c include/mysql_def.h c_parser.c
 INC_PATH = -I./include
 LIBS = -pthread -lm
+BINDIR = ./bin
 
 CC ?= gcc
+INSTALL ?=install
 YACC = bison
 LEX = flex
 
-CFLAGS += -g -O3
+CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -g -O3 -pipe -fomit-frame-pointer -march=k8
+#LDFLAGS=-static
+INSTALLFLAGS ?=-s
 CentOS5 = $(findstring .el5,$(shell cat /proc/version))
 ifeq ($(CentOS5), .el5)
 CFLAGS += -DCentOS5
 endif
 
 all: $(TARGETS)
-	
+
 debug: LEX_DEBUG = -d 
 debug: YACC_DEBUG = -r all
 debug: CFLAGS += -DDEBUG -DSTREAM_PARSER_DEBUG
@@ -25,7 +29,7 @@
 	$(CC) $(CFLAGS) $(INC_PATH) -c $<
 
 stream_parser: stream_parser.o
-	$(CC) $(CFLAGS) $(INC_PATH) $(LIB_PATH) $(LIBS) $< -o $@
+	$(CC) $(CFLAGS) $(INC_PATH) $(LIB_PATH) $(LIBS) $(LDFLAGS) $< -o $@
 
 sql_parser.o: sql_parser.c
 	$(CC) $(CFLAGS) $(INC_PATH) -c $< 
@@ -49,17 +53,17 @@
 	$(CC) $(CFLAGS) $(INC_PATH) -c $<
 
 c_parser: sql_parser.o c_parser.o tables_dict.o print_data.o check_data.o
-	$(CC) $(CFLAGS) $(INC_PATH) $(LIB_PATH) $^ -o $@ $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(INC_PATH) $(LIB_PATH) $^ -o $@ $(LIBS)
 
 innochecksum_changer: innochecksum.c include/innochecksum.h
-	$(CC) $(CFLAGS) $(INC_PATH) -o $@ $<
+	$(CC) $(CFLAGS) $(LDFLAGS) $(INC_PATH) -o $@ $<
 
 sys_parser: sys_parser.c
 	@ which mysql_config || (echo "sys_parser needs mysql development package( either -devel or -dev)"; exit -1)
 	$(CC) `mysql_config --cflags` `mysql_config --libs` -o $@ $< 
 
 install: $(TARGETS)
-	$(INSTALL) $(INSTALLFLAGS) $(TARGETS) $(BINDIR)/$(TARGETS)
+	$(INSTALL) $(INSTALLFLAGS) $(TARGETS) $(BINDIR)
 
 clean:
 	rm -f $(OBJECTS) $(TARGETS) lex.yy.c sql_parser.c sql_parser.output sys_parser
 
=== modified file 'c_parser.c'
--- c_parser.c	2014-10-07 22:51:39 +0000
+++ c_parser.c	2014-10-19 02:20:41 +0000
@@ -89,12 +89,13 @@
 int use_filter_id = 0;
 
 FILE* f_result;
+FILE* f_sql;
 
 extern int load_table(char*);
 
 inline void error(char *msg) {
-    printf("Error: %s\n", msg);
-    exit(1);
+  fprintf(stderr, "Error: %s\n", msg);
+  exit(1);
 }
 
 
@@ -612,7 +613,7 @@
         }
     	fprintf(f_result, ", Records list: %s", is_page_valid? "Valid": "Invalid");
         expected_records_inheader = mach_read_from_2(page + PAGE_HEADER + PAGE_N_RECS);
-    	fprintf(f_result, ", Expected records: (%u %lu)", expected_records, expected_records_inheader);
+    	fprintf(f_result, ", Expected records: (%u %u)", expected_records, expected_records_inheader);
     	fprintf(f_result, "\n");
 	if (debug) printf("Starting offset: %lu (%lX). Checking %d table definitions.\n", offset, offset, table_definitions_cnt);
 	
@@ -692,8 +693,8 @@
 	while ((read_bytes = read(fn, page, UNIV_PAGE_SIZE)) == UNIV_PAGE_SIZE) {
         pos = lseek(fn, 0, SEEK_CUR);
         
-        if (pos % (UNIV_PAGE_SIZE * 10) == 0) {
-            fprintf(stderr, "-- %.2f%% done\n", 100.0 * pos / st.st_size);
+        if (pos % (UNIV_PAGE_SIZE * 512) == 0) {
+            fprintf(f_sql, "-- %.2f%% done\n", 100.0 * pos / st.st_size);
         }
 
 	    if (deleted_pages_only) {
@@ -746,6 +747,7 @@
 	  "    -f <InnoDB page(s)> -- InnoDB page or directory with pages(all pages should have same index_id)\n"
 	  "    -t <table.sql> -- CREATE statement of a table\n"
 	  "    -o <file> -- Save dump in this file. Otherwise print to stdout\n"
+	  "    -l <file> -- Save SQL statements in this file. Otherwise print to stderr\n"
 	  "    -h  -- Print this help\n"
 	  "    -d  -- Process only those pages which potentially could have deleted records (default = NO)\n"
 	  "    -D  -- Recover deleted rows only (default = NO)\n"
@@ -770,12 +772,19 @@
 	struct stat st;
 	char src[256] = "";
 
-	char buffer[16*1024];
+	char buffer[BUFSIZ];
         setvbuf(stdout, buffer, _IOFBF, sizeof(buffer));
 
 	f_result = stdout;
+	f_sql = stderr;
 	char result_file[1024];
+<<<<<<< TREE
 	while ((ch = getopt(argc, argv, "t:456hdDUVf:T:b:p:o:i:")) != -1) {
+=======
+	char sql_file[1024];
+
+	while ((ch = getopt(argc, argv, "t:456hdDUVf:T:b:p:o:l:")) != -1) {
+>>>>>>> MERGE-SOURCE
 		switch (ch) {
 			case 'd':
 				deleted_pages_only = 1;
@@ -794,10 +803,21 @@
 					exit(-1);
 					}
 				break;
+<<<<<<< TREE
 			case 'i':
 				strncpy(path_ibdata, optarg, sizeof(path_ibdata));
                 external_in_ibdata = 1;
 				break;
+=======
+                        case 'l':
+                                strncpy(sql_file, optarg, sizeof(sql_file));
+                                if(NULL == (f_sql = fopen(sql_file, "w"))){
+                                        fprintf(stderr, "Can't open file %s for writing\n", sql_file);
+                                        exit(-1);
+                                        }
+                                break;
+
+>>>>>>> MERGE-SOURCE
 			case 't':
                 if(load_table(optarg) != 0){
                     fprintf(stderr, "Failed to parse table structure\n");
@@ -882,63 +902,63 @@
 		close(fn);
 		}
 	table_def_t *table = &(table_definitions[0]);
-	fprintf(stderr, "SET FOREIGN_KEY_CHECKS=0;\n");
-	fprintf(stderr, "LOAD DATA LOCAL INFILE '");
+	fprintf(f_sql, "SET FOREIGN_KEY_CHECKS=0;\n");
+	fprintf(f_sql, "LOAD DATA LOCAL INFILE '");
 	if(f_result == stdout){
-		fprintf(stderr, "%s/dumps/%s/%s", getenv("PWD"), dump_prefix, table->name);
+		fprintf(f_sql, "%s/dumps/%s/%s", getenv("PWD"), dump_prefix, table->name);
 		}
 	else{
-		fprintf(stderr, "%s", result_file);
+		fprintf(f_sql, "%s", result_file);
 		}
-	fprintf(stderr, "' REPLACE INTO TABLE `%s` FIELDS TERMINATED BY '\\t' OPTIONALLY ENCLOSED BY '\"' LINES STARTING BY '%s\\t' ", table->name, table->name);
+	fprintf(f_sql, "' REPLACE INTO TABLE `%s` FIELDS TERMINATED BY '\\t' OPTIONALLY ENCLOSED BY '\"' LINES STARTING BY '%s\\t' ", table->name, table->name);
 	int i = 0;
 	int comma = 0;
 	int has_set = 0;
-	fprintf(stderr, "(");
+	fprintf(f_sql, "(");
 	for(i = 0; i < table->fields_count; i++) {
 		if(table->fields[i].type == FT_INTERNAL) continue;
-		if(comma) fprintf(stderr, ", ");
+		if(comma) fprintf(f_sql, ", ");
 		switch(table->fields[i].type){
 			case FT_BLOB:
 			case FT_BIN:
-				fprintf(stderr, "@var_%s", table->fields[i].name);
+				fprintf(f_sql, "@var_%s", table->fields[i].name);
 				has_set = 1;
 				break;
 			case FT_BIT:
-				fprintf(stderr, "@var_%s", table->fields[i].name);
+				fprintf(f_sql, "@var_%s", table->fields[i].name);
 				has_set = 1;
 				break;
 			default:
-				fprintf(stderr, "`%s`", table->fields[i].name);
+				fprintf(f_sql, "`%s`", table->fields[i].name);
 			}
 		comma = 1;
 		}
-	fprintf(stderr, ")");
+	fprintf(f_sql, ")");
 	comma = 0;
 	if(has_set){
-		fprintf(stderr, "\nSET\n");
+		fprintf(f_sql, "\nSET\n");
 		for(i = 0; i < table->fields_count; i++) {
 			if(table->fields[i].type == FT_INTERNAL) continue;
 			switch(table->fields[i].type){
 				case FT_BLOB:
 				case FT_BIN:
-					if(comma) fprintf(stderr, ",\n");
-					fprintf(stderr, "    %s = UNHEX(@var_%s)", table->fields[i].name, table->fields[i].name);
+					if(comma) fprintf(f_sql, ",\n");
+					fprintf(f_sql, "    %s = UNHEX(@var_%s)", table->fields[i].name, table->fields[i].name);
 					comma = 1;
 					break;
 				case FT_BIT:
-					if(comma) fprintf(stderr, ",\n");
-					fprintf(stderr, "    %s = CAST(@var_%s AS UNSIGNED)", table->fields[i].name, table->fields[i].name);
+					if(comma) fprintf(f_sql, ",\n");
+					fprintf(f_sql, "    %s = CAST(@var_%s AS UNSIGNED)", table->fields[i].name, table->fields[i].name);
 					comma = 1;
 					break;
 				default: break;
 				}
 			}
 		}
-	fprintf(stderr, ";\n");
+	fprintf(f_sql, ";\n");
 	if (!process_compact && !process_redundant) {
-        printf("Error: Please, specify what format your datafile in. Use -4 for mysql 4.1 and below and -5 for 5.X+\n");
-        usage();
+	  fprintf(stderr,"Error: Please, specify what format your datafile in. Use -4 for mysql 4.1 and below and -5 for 5.X+\n");
+	  usage();
 	}
 	
 	return 0;
 
=== modified file 'print_data.c'
--- print_data.c	2014-10-08 00:15:51 +0000
+++ print_data.c	2014-10-19 02:20:41 +0000
@@ -112,11 +112,19 @@
 void print_string_raw(char *value, ulint len) {
     ulint i;
     for(i = 0; i < len; i++) {
+<<<<<<< TREE
         if (value[i] == '"') fprintf(f_result, "\\\"");
         else if (value[i] == '\n') fprintf(f_result, "\\n");
         else if (value[i] == '\r') fprintf(f_result, "\\r");
         else fprintf(f_result, "%c", value[i]);
         }
+=======
+      if (value[i] == '"') fprintf(f_result,"\\\"");
+      else if (value[i] == '\n') fprintf(f_result,"\\n");
+      else if (value[i] == '\r') fprintf(f_result,"\\r");
+      else fprintf(f_result, "%c", value[i]);
+    }
+>>>>>>> MERGE-SOURCE
 }
 
 void print_hex(char *value, ulint len) {
@@ -196,10 +204,8 @@
 
 /*******************************************************************/
 inline void print_set(int value, field_def_t *field) {
-	int i;
-	int comma = 0;
-	fprintf(f_result, "%d", value);
-    /*
+  /*    int i;
+         int comma = 0
 	fprintf(f_result, "\"");
 	for(i=0; i<field->limits.set_values_count; i++){
 		if(((value>>i) % 2) == 1){
@@ -210,6 +216,7 @@
 	}
 	fprintf(f_result, "\"");
     */
+  fprintf(f_result, "%d", value);
 }
 
 /*******************************************************************/
@@ -336,7 +343,7 @@
 
 /*******************************************************************/
 inline void print_field_value(byte *value, ulint len, field_def_t *field) {
-	time_t t;
+  /* time_t t;*/
 
 	switch (field->type) {
 		case FT_INTERNAL:
@@ -481,9 +488,15 @@
                    if (len_sum >= extern_len)
                        break;
                } else {
+<<<<<<< TREE
                     fprintf(stderr, "-- #####CannotOpen_%s;\n", tmp);
                     perror("-- print_field_value_with_external(): open()");
                     break;
+=======
+		 fprintf(stderr, "-- #####CannotOpen_%s;\n", tmp);
+		 perror("External page:");
+		 break;
+>>>>>>> MERGE-SOURCE
                }
            }
            if (field->type == FT_TEXT) {