View | Details | Raw Unified | Return to bug 171546
Collapse All | Expand All

(-)./files/patch-sql-sql__trigger.cc (+50 lines)
Line 0 Link Here
1 
--- sql/sql_trigger.cc.orig	2012-08-02 00:01:13.000000000 +0200
2 
+++ sql/sql_trigger.cc	2012-09-11 17:01:13.000000000 +0200
3 
@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]=
4 
 {
5 
   {
6 
     { C_STRING_WITH_LEN("triggers") },
7 
-    my_offsetof(class Table_triggers_list, definitions_list),
8 
+    static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
9 
     FILE_OPTIONS_STRLIST
10 
   },
11 
   {
12 
     { C_STRING_WITH_LEN("sql_modes") },
13 
-    my_offsetof(class Table_triggers_list, definition_modes_list),
14 
+    static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
15 
     FILE_OPTIONS_ULLLIST
16 
   },
17 
   {
18 
     { C_STRING_WITH_LEN("definers") },
19 
-    my_offsetof(class Table_triggers_list, definers_list),
20 
+    static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
21 
     FILE_OPTIONS_STRLIST
22 
   },
23 
   {
24 
     { C_STRING_WITH_LEN("client_cs_names") },
25 
-    my_offsetof(class Table_triggers_list, client_cs_names),
26 
+    static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
27 
     FILE_OPTIONS_STRLIST
28 
   },
29 
   {
30 
     { C_STRING_WITH_LEN("connection_cl_names") },
31 
-    my_offsetof(class Table_triggers_list, connection_cl_names),
32 
+    static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
33 
     FILE_OPTIONS_STRLIST
34 
   },
35 
   {
36 
     { C_STRING_WITH_LEN("db_cl_names") },
37 
-    my_offsetof(class Table_triggers_list, db_cl_names),
38 
+    static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
39 
     FILE_OPTIONS_STRLIST
40 
   },
41 
   { { 0, 0 }, 0, FILE_OPTIONS_STRING }
42 
@@ -226,7 +226,7 @@ static File_option triggers_file_parameters[]=
43 
 File_option sql_modes_parameters=
44 
 {
45 
   { C_STRING_WITH_LEN("sql_modes") },
46 
-  my_offsetof(class Table_triggers_list, definition_modes_list),
47 
+  static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
48 
   FILE_OPTIONS_ULLLIST
49 
 };
50
(-)./files/patch-sql-sql__view.cc (+64 lines)
Line 0 Link Here
1 
--- sql/sql_view.cc.orig	2012-08-02 00:01:13.000000000 +0200
2 
+++ sql/sql_view.cc	2012-09-11 17:01:13.000000000 +0200
3 
@@ -730,46 +730,46 @@ static const int required_view_parameters= 14;
4 
 */
5 
 static File_option view_parameters[]=
6 
 {{{ C_STRING_WITH_LEN("query")},
7 
-  my_offsetof(TABLE_LIST, select_stmt),
8 
+  static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
9 
   FILE_OPTIONS_ESTRING},
10 
  {{ C_STRING_WITH_LEN("md5")},
11 
-  my_offsetof(TABLE_LIST, md5),
12 
+  static_cast<int>(my_offsetof(TABLE_LIST, md5)),
13 
   FILE_OPTIONS_STRING},
14 
  {{ C_STRING_WITH_LEN("updatable")},
15 
-  my_offsetof(TABLE_LIST, updatable_view),
16 
+  static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
17 
   FILE_OPTIONS_ULONGLONG},
18 
  {{ C_STRING_WITH_LEN("algorithm")},
19 
-  my_offsetof(TABLE_LIST, algorithm),
20 
+  static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
21 
   FILE_OPTIONS_ULONGLONG},
22 
  {{ C_STRING_WITH_LEN("definer_user")},
23 
-  my_offsetof(TABLE_LIST, definer.user),
24 
+  static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
25 
   FILE_OPTIONS_STRING},
26 
  {{ C_STRING_WITH_LEN("definer_host")},
27 
-  my_offsetof(TABLE_LIST, definer.host),
28 
+  static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
29 
   FILE_OPTIONS_STRING},
30 
  {{ C_STRING_WITH_LEN("suid")},
31 
-  my_offsetof(TABLE_LIST, view_suid),
32 
+  static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
33 
   FILE_OPTIONS_ULONGLONG},
34 
  {{ C_STRING_WITH_LEN("with_check_option")},
35 
-  my_offsetof(TABLE_LIST, with_check),
36 
+  static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
37 
   FILE_OPTIONS_ULONGLONG},
38 
  {{ C_STRING_WITH_LEN("timestamp")},
39 
-  my_offsetof(TABLE_LIST, timestamp),
40 
+  static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
41 
   FILE_OPTIONS_TIMESTAMP},
42 
  {{ C_STRING_WITH_LEN("create-version")},
43 
-  my_offsetof(TABLE_LIST, file_version),
44 
+  static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
45 
   FILE_OPTIONS_ULONGLONG},
46 
  {{ C_STRING_WITH_LEN("source")},
47 
-  my_offsetof(TABLE_LIST, source),
48 
+  static_cast<int>(my_offsetof(TABLE_LIST, source)),
49 
   FILE_OPTIONS_ESTRING},
50 
  {{(char*) STRING_WITH_LEN("client_cs_name")},
51 
-  my_offsetof(TABLE_LIST, view_client_cs_name),
52 
+  static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
53 
   FILE_OPTIONS_STRING},
54 
  {{(char*) STRING_WITH_LEN("connection_cl_name")},
55 
-  my_offsetof(TABLE_LIST, view_connection_cl_name),
56 
+  static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
57 
   FILE_OPTIONS_STRING},
58 
  {{(char*) STRING_WITH_LEN("view_body_utf8")},
59 
-  my_offsetof(TABLE_LIST, view_body_utf8),
60 
+  static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
61 
   FILE_OPTIONS_ESTRING},
62 
  {{NullS, 0},			0,
63 
   FILE_OPTIONS_STRING}
64 

            






  

  Return to bug 171546