← Back to branch summary

~percona-dev/percona-server/5.1.57-partially-ported

« back to all changes in this revision

Viewing changes to show_temp_51.patch

  • Committer: Oleg Tsarev
  • Date: 2011-05-10 00:07:01 UTC
  • Revision ID: oleg.tsarev@percona.com-20110510000701-l08jx5er0g8ogi6w
Patches ported to 5.1.57
ATTENTION, ATTENTION, ATTENTION
!!!
Some parts of innodb_split_buf_pool_mutex.patch was removed (for apply another patches)
You should revert changes in this commit from patch and do their right

!!! 
innodb_lru_dump_restore.patch has some changes, what should be reviewed

!!!
mysql-test.diff - I removed part for "mysql-test/include/mtr_warnings.sql", should be restored and fixed

All other looks fine.

UNFORTUNATELY, MYSQL DOESN'T BUILD (Compilation error in InnoDB).

ATTENTION, ATTENTION, ATTENTION

Show diffs side-by-side

added added

removed removed

Lines of Context:
show_temp_51.patch
8
8
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
9
9
--- a/sql/mysqld.cc     2010-08-27 15:24:41.663411604 +0900
10
10
+++ b/sql/mysqld.cc     2010-08-27 15:30:36.942106886 +0900
11
 
@@ -3238,6 +3238,7 @@
 
11
@@ -3244,6 +3244,7 @@
12
12
   {"show_table_status",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_TABLE_STATUS]), SHOW_LONG_STATUS},
13
13
   {"show_tables",          (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_TABLES]), SHOW_LONG_STATUS},
14
14
   {"show_thread_statistics",(char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_THREAD_STATS]), SHOW_LONG_STATUS},
41
41
   sql_command_flags[SQLCOM_SHOW_TABLE_STATUS]= (CF_STATUS_COMMAND |
42
42
                                                 CF_SHOW_TABLE_COMMAND |
43
43
                                                 CF_REEXECUTION_FRAGILE);
44
 
@@ -1819,6 +1822,8 @@
 
44
@@ -1833,6 +1836,8 @@
45
45
 
46
46
   case SCH_TABLE_NAMES:
47
47
   case SCH_TABLES:
50
50
   case SCH_VIEWS:
51
51
   case SCH_TRIGGERS:
52
52
   case SCH_EVENTS:
53
 
@@ -2318,6 +2323,7 @@
 
53
@@ -2332,6 +2337,7 @@
54
54
   }
55
55
   case SQLCOM_SHOW_DATABASES:
56
56
   case SQLCOM_SHOW_TABLES:
58
58
   case SQLCOM_SHOW_TRIGGERS:
59
59
   case SQLCOM_SHOW_TABLE_STATUS:
60
60
   case SQLCOM_SHOW_OPEN_TABLES:
61
 
@@ -5472,6 +5478,8 @@
 
61
@@ -5486,6 +5492,8 @@
62
62
 
63
63
   case SCH_TABLE_NAMES:
64
64
   case SCH_TABLES:
307
307
 
308
308
 /**
309
309
   @brief          Fill I_S table with data from FRM file only
310
 
@@ -6616,6 +6839,25 @@
 
310
@@ -6618,6 +6841,25 @@
311
311
   {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE}
312
312
 };
313
313
 
333
333
 
334
334
 ST_FIELD_INFO columns_fields_info[]=
335
335
 {
336
 
@@ -7276,6 +7518,9 @@
 
336
@@ -7278,6 +7520,9 @@
337
337
    fill_schema_files, 0, 0, -1, -1, 0, 0},
338
338
   {"GLOBAL_STATUS", variables_fields_info, create_schema_table,
339
339
    fill_status, make_old_format, 0, 0, -1, 0, 0},
343
343
   {"GLOBAL_VARIABLES", variables_fields_info, create_schema_table,
344
344
    fill_variables, make_old_format, 0, 0, -1, 0, 0},
345
345
   {"KEY_COLUMN_USAGE", key_column_usage_fields_info, create_schema_table,
346
 
@@ -7319,6 +7564,9 @@
 
346
@@ -7321,6 +7566,9 @@
347
347
    get_all_tables, make_table_names_old_format, 0, 1, 2, 1, 0},
348
348
   {"TABLE_PRIVILEGES", table_privileges_fields_info, create_schema_table,
349
349
    fill_schema_table_privileges, 0, 0, -1, -1, 0, 0},