← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/slave.cc

  • Committer: Brian Aker
  • Date: 2008-10-06 19:59:47 UTC
  • Revision ID: brian@tangent.org-20081006195947-zc1046tvfugicesg
Random dead cleanup (mainly around SSL in the replication master.info)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/slave.cc
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
1186
                                           DRIZZLE_TYPE_LONGLONG));
1187
 
  field_list.push_back(new Item_empty_string("Master_SSL_Allowed", 7));
1188
 
  field_list.push_back(new Item_empty_string("Master_SSL_CA_File",
1189
 
                                             sizeof(mi->ssl_ca)));
1190
 
  field_list.push_back(new Item_empty_string("Master_SSL_CA_Path",
1191
 
                                             sizeof(mi->ssl_capath)));
1192
 
  field_list.push_back(new Item_empty_string("Master_SSL_Cert",
1193
 
                                             sizeof(mi->ssl_cert)));
1194
 
  field_list.push_back(new Item_empty_string("Master_SSL_Cipher",
1195
 
                                             sizeof(mi->ssl_cipher)));
1196
 
  field_list.push_back(new Item_empty_string("Master_SSL_Key",
1197
 
                                             sizeof(mi->ssl_key)));
1198
1187
  field_list.push_back(new Item_return_int("Seconds_Behind_Master", 10,
1199
1188
                                           DRIZZLE_TYPE_LONGLONG));
1200
 
  field_list.push_back(new Item_empty_string("Master_SSL_Verify_Server_Cert",
1201
 
                                             3));
1202
1189
  field_list.push_back(new Item_return_int("Last_IO_Errno", 4, DRIZZLE_TYPE_LONG));
1203
1190
  field_list.push_back(new Item_empty_string("Last_IO_Error", 20));
1204
1191
  field_list.push_back(new Item_return_int("Last_SQL_Errno", 4, DRIZZLE_TYPE_LONG));
1264
1251
    protocol->store(mi->rli.until_log_name, &my_charset_bin);
1265
1252
    protocol->store((uint64_t) mi->rli.until_log_pos);
1266
1253
 
1267
 
    protocol->store(mi->ssl? "Ignored":"No", &my_charset_bin);
1268
 
    protocol->store(mi->ssl_ca, &my_charset_bin);
1269
 
    protocol->store(mi->ssl_capath, &my_charset_bin);
1270
 
    protocol->store(mi->ssl_cert, &my_charset_bin);
1271
 
    protocol->store(mi->ssl_cipher, &my_charset_bin);
1272
 
    protocol->store(mi->ssl_key, &my_charset_bin);
1273
 
 
1274
1254
    /*
1275
1255
      Seconds_Behind_Master: if SQL thread is running and I/O thread is
1276
1256
      connected, we can compute it otherwise show NULL (i.e. unknown).
1307
1287
    {
1308
1288
      protocol->store_null();
1309
1289
    }
1310
 
    protocol->store(mi->ssl_verify_server_cert? "Yes":"No", &my_charset_bin);
1311
1290
 
1312
1291
    // Last_IO_Errno
1313
1292
    protocol->store(mi->last_error().number);