← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/tables.cc

[patch 112/129] Merge patch for revision 1925 from InnoDB SVN:
revno: 1925
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6169
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6163
committer: calvin
timestamp: Thu 2009-11-12 12:40:43 +0000
message:
  branches/zip: add test case for bug#46676
  
  This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
  But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
  Add test case to catch future regression.
added:
  mysql-test/innodb_bug46676.result 6169@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug46676.result
  mysql-test/innodb_bug46676.test 6169@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug46676.test
diff:
=== added file 'mysql-test/innodb_bug46676.result'

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_dictionary/tables.cc
68
68
 
69
69
bool TablesTool::Generator::nextTable()
70
70
{
71
 
  drizzled::message::table::shared_ptr table_ptr;
 
71
  const drizzled::message::Table *table_ptr;
72
72
  while ((table_ptr= all_tables_generator))
73
73
  {
74
74
    table_message.CopyFrom(*table_ptr);
89
89
  return false;
90
90
}
91
91
 
 
92
void TablesTool::Generator::pushType(message::Table::Field::FieldType type)
 
93
{
 
94
  switch (type)
 
95
  {
 
96
  default:
 
97
  case message::Table::Field::VARCHAR:
 
98
    push(VARCHAR);
 
99
    break;
 
100
  case message::Table::Field::DOUBLE:
 
101
    push(DOUBLE);
 
102
    break;
 
103
  case message::Table::Field::BLOB:
 
104
    push(BLOB);
 
105
    break;
 
106
  case message::Table::Field::ENUM:
 
107
    push(ENUM);
 
108
    break;
 
109
  case message::Table::Field::INTEGER:
 
110
    push(INTEGER);
 
111
    break;
 
112
  case message::Table::Field::BIGINT:
 
113
    push(BIGINT);
 
114
    break;
 
115
  case message::Table::Field::DECIMAL:
 
116
    push(DECIMAL);
 
117
    break;
 
118
  case message::Table::Field::DATE:
 
119
    push(DATE);
 
120
    break;
 
121
  case message::Table::Field::TIMESTAMP:
 
122
    push(TIMESTAMP);
 
123
    break;
 
124
  case message::Table::Field::DATETIME:
 
125
    push(DATETIME);
 
126
    break;
 
127
  }
 
128
}
 
129
 
92
130
void TablesTool::Generator::fill()
93
131
{
94
132