← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/slave.cc

  • Committer: Patrick Galbraith
  • Date: 2008-07-27 19:30:42 UTC
  • mto: (212.1.4 codestyle)
  • mto: This revision was merged to the branch mainline in revision 217.
  • Revision ID: patg@ishvara-20080727193042-iie3dyo65v0grevw
Renamed all MYSQL_TYPE... to FIELD_TYPE...

It took less time than I thought.

All tests pass.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/slave.cc
1150
1150
  field_list.push_back(new Item_empty_string("Master_User",
1151
1151
                                                     sizeof(mi->user)));
1152
1152
  field_list.push_back(new Item_return_int("Master_Port", 7,
1153
 
                                           MYSQL_TYPE_LONG));
 
1153
                                           FIELD_TYPE_LONG));
1154
1154
  field_list.push_back(new Item_return_int("Connect_Retry", 10,
1155
 
                                           MYSQL_TYPE_LONG));
 
1155
                                           FIELD_TYPE_LONG));
1156
1156
  field_list.push_back(new Item_empty_string("Master_Log_File",
1157
1157
                                             FN_REFLEN));
1158
1158
  field_list.push_back(new Item_return_int("Read_Master_Log_Pos", 10,
1159
 
                                           MYSQL_TYPE_LONGLONG));
 
1159
                                           FIELD_TYPE_LONGLONG));
1160
1160
  field_list.push_back(new Item_empty_string("Relay_Log_File",
1161
1161
                                             FN_REFLEN));
1162
1162
  field_list.push_back(new Item_return_int("Relay_Log_Pos", 10,
1163
 
                                           MYSQL_TYPE_LONGLONG));
 
1163
                                           FIELD_TYPE_LONGLONG));
1164
1164
  field_list.push_back(new Item_empty_string("Relay_Master_Log_File",
1165
1165
                                             FN_REFLEN));
1166
1166
  field_list.push_back(new Item_empty_string("Slave_IO_Running", 3));
1172
1172
  field_list.push_back(new Item_empty_string("Replicate_Wild_Do_Table", 24));
1173
1173
  field_list.push_back(new Item_empty_string("Replicate_Wild_Ignore_Table",
1174
1174
                                             28));
1175
 
  field_list.push_back(new Item_return_int("Last_Errno", 4, MYSQL_TYPE_LONG));
 
1175
  field_list.push_back(new Item_return_int("Last_Errno", 4, FIELD_TYPE_LONG));
1176
1176
  field_list.push_back(new Item_empty_string("Last_Error", 20));
1177
1177
  field_list.push_back(new Item_return_int("Skip_Counter", 10,
1178
 
                                           MYSQL_TYPE_LONG));
 
1178
                                           FIELD_TYPE_LONG));
1179
1179
  field_list.push_back(new Item_return_int("Exec_Master_Log_Pos", 10,
1180
 
                                           MYSQL_TYPE_LONGLONG));
 
1180
                                           FIELD_TYPE_LONGLONG));
1181
1181
  field_list.push_back(new Item_return_int("Relay_Log_Space", 10,
1182
 
                                           MYSQL_TYPE_LONGLONG));
 
1182
                                           FIELD_TYPE_LONGLONG));
1183
1183
  field_list.push_back(new Item_empty_string("Until_Condition", 6));
1184
1184
  field_list.push_back(new Item_empty_string("Until_Log_File", FN_REFLEN));
1185
1185
  field_list.push_back(new Item_return_int("Until_Log_Pos", 10,
1186
 
                                           MYSQL_TYPE_LONGLONG));
 
1186
                                           FIELD_TYPE_LONGLONG));
1187
1187
  field_list.push_back(new Item_empty_string("Master_SSL_Allowed", 7));
1188
1188
  field_list.push_back(new Item_empty_string("Master_SSL_CA_File",
1189
1189
                                             sizeof(mi->ssl_ca)));
1196
1196
  field_list.push_back(new Item_empty_string("Master_SSL_Key",
1197
1197
                                             sizeof(mi->ssl_key)));
1198
1198
  field_list.push_back(new Item_return_int("Seconds_Behind_Master", 10,
1199
 
                                           MYSQL_TYPE_LONGLONG));
 
1199
                                           FIELD_TYPE_LONGLONG));
1200
1200
  field_list.push_back(new Item_empty_string("Master_SSL_Verify_Server_Cert",
1201
1201
                                             3));
1202
 
  field_list.push_back(new Item_return_int("Last_IO_Errno", 4, MYSQL_TYPE_LONG));
 
1202
  field_list.push_back(new Item_return_int("Last_IO_Errno", 4, FIELD_TYPE_LONG));
1203
1203
  field_list.push_back(new Item_empty_string("Last_IO_Error", 20));
1204
 
  field_list.push_back(new Item_return_int("Last_SQL_Errno", 4, MYSQL_TYPE_LONG));
 
1204
  field_list.push_back(new Item_return_int("Last_SQL_Errno", 4, FIELD_TYPE_LONG));
1205
1205
  field_list.push_back(new Item_empty_string("Last_SQL_Error", 20));
1206
1206
 
1207
1207
  if (protocol->send_fields(&field_list,