← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/transaction_services.cc

  • Committer: Brian Aker
  • Date: 2011-02-22 04:19:44 UTC
  • mto: (2192.1.1 drizzle-staging)
  • mto: This revision was merged to the branch mainline in revision 2193.
  • Revision ID: brian@tangent.org-20110222041944-furz1h252ecz7mpd
Merge in modifications such that we check both schema and table for
replication option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/transaction_services.cc
1385
1385
  if (! replication_services.isActive())
1386
1386
    return false;
1387
1387
 
1388
 
  if (not table.getShare()->replicate())
 
1388
  if (not table.getShare()->is_replicated())
1389
1389
    return false;
1390
1390
 
1391
1391
  /**
1593
1593
  if (! replication_services.isActive())
1594
1594
    return;
1595
1595
 
1596
 
  if (not table.getShare()->replicate())
 
1596
  if (not table.getShare()->is_replicated())
1597
1597
    return;
1598
1598
 
1599
1599
  uint32_t next_segment_id= 1;
1855
1855
  if (! replication_services.isActive())
1856
1856
    return;
1857
1857
 
1858
 
  if (not table.getShare()->replicate())
 
1858
  if (not table.getShare()->is_replicated())
1859
1859
    return;
1860
1860
 
1861
1861
  uint32_t next_segment_id= 1;
1911
1911
                                      const message::Table &table)
1912
1912
{
1913
1913
  ReplicationServices &replication_services= ReplicationServices::singleton();
1914
 
  if (! replication_services.isActive())
 
1914
  if (not replication_services.isActive())
1915
1915
    return;
1916
1916
 
1917
 
  if (table.has_options() and table.options().has_dont_replicate() and table.options().dont_replicate())
 
1917
  if (not message::is_replicated(table))
1918
1918
    return;
1919
1919
 
1920
1920
  message::Transaction *transaction= getActiveTransactionMessage(session);
1947
1947
  if (! replication_services.isActive())
1948
1948
    return;
1949
1949
 
1950
 
  if (schema.has_replication_options() and schema.replication_options().has_dont_replicate() and schema.replication_options().dont_replicate())
 
1950
  if (not message::is_replicated(schema))
1951
1951
    return;
1952
1952
 
1953
1953
  message::Transaction *transaction= getActiveTransactionMessage(session);
1978
1978
                                     message::schema::const_reference schema)
1979
1979
{
1980
1980
  ReplicationServices &replication_services= ReplicationServices::singleton();
1981
 
  if (! replication_services.isActive())
 
1981
  if (not replication_services.isActive())
1982
1982
    return;
1983
1983
 
1984
 
  if (schema.has_replication_options() and schema.replication_options().has_dont_replicate() and schema.replication_options().dont_replicate())
 
1984
  if (not message::is_replicated(schema))
1985
1985
    return;
1986
1986
 
1987
1987
  message::Transaction *transaction= getActiveTransactionMessage(session);
2014
2014
  if (! replication_services.isActive())
2015
2015
    return;
2016
2016
 
2017
 
  if (old_schema.has_replication_options() and old_schema.replication_options().has_dont_replicate() and old_schema.replication_options().dont_replicate())
 
2017
  if (not message::is_replicated(old_schema))
2018
2018
    return;
2019
2019
 
2020
2020
  message::Transaction *transaction= getActiveTransactionMessage(session);
2052
2052
  if (! replication_services.isActive())
2053
2053
    return;
2054
2054
 
2055
 
  if (table.has_options() and table.options().has_dont_replicate() and table.options().dont_replicate())
 
2055
  if (not message::is_replicated(table))
2056
2056
    return;
2057
2057
 
2058
2058
  message::Transaction *transaction= getActiveTransactionMessage(session);
2089
2089
  if (! replication_services.isActive())
2090
2090
    return;
2091
2091
 
2092
 
  if (not table.getShare()->replicate())
 
2092
  if (not table.getShare()->is_replicated())
2093
2093
    return;
2094
2094
 
2095
2095
  message::Transaction *transaction= getActiveTransactionMessage(session);