← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Lee Bieber
  • Date: 2010-12-23 23:11:00 UTC
  • mfrom: (2024.1.1 clean)
  • Revision ID: kalebral@gmail.com-20101223231100-0rqirgz7ugkl10yp
Merge Brian - session list cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
1749
1749
  item->maybe_null = 1;
1750
1750
  field_list.push_back(item = new Item_empty_string("Msg_text", 255, cs));
1751
1751
  item->maybe_null = 1;
1752
 
  if (session->client->sendFields(&field_list))
 
1752
  if (session->getClient()->sendFields(&field_list))
1753
1753
    return true;
1754
1754
 
1755
1755
  for (table= tables; table; table= table->next_local)
1804
1804
    {
1805
1805
      char buff[FN_REFLEN + DRIZZLE_ERRMSG_SIZE];
1806
1806
      uint32_t length;
1807
 
      session->client->store(table_name);
1808
 
      session->client->store(operator_name);
1809
 
      session->client->store(STRING_WITH_LEN("error"));
 
1807
      session->getClient()->store(table_name);
 
1808
      session->getClient()->store(operator_name);
 
1809
      session->getClient()->store(STRING_WITH_LEN("error"));
1810
1810
      length= snprintf(buff, sizeof(buff), ER(ER_OPEN_AS_READONLY),
1811
1811
                       table_name);
1812
 
      session->client->store(buff, length);
 
1812
      session->getClient()->store(buff, length);
1813
1813
      transaction_services.autocommitOrRollback(session, false);
1814
1814
      session->endTransaction(COMMIT);
1815
1815
      session->close_thread_tables();
1816
1816
      lex->reset_query_tables_list(false);
1817
1817
      table->table=0;                           // For query cache
1818
 
      if (session->client->flush())
 
1818
      if (session->getClient()->flush())
1819
1819
        goto err;
1820
1820
      continue;
1821
1821
    }
1846
1846
      DRIZZLE_ERROR *err;
1847
1847
      while ((err= it++))
1848
1848
      {
1849
 
        session->client->store(table_name);
1850
 
        session->client->store(operator_name);
1851
 
        session->client->store(warning_level_names[err->level].str,
 
1849
        session->getClient()->store(table_name);
 
1850
        session->getClient()->store(operator_name);
 
1851
        session->getClient()->store(warning_level_names[err->level].str,
1852
1852
                               warning_level_names[err->level].length);
1853
 
        session->client->store(err->msg);
1854
 
        if (session->client->flush())
 
1853
        session->getClient()->store(err->msg);
 
1854
        if (session->getClient()->flush())
1855
1855
          goto err;
1856
1856
      }
1857
1857
      drizzle_reset_errors(session, true);
1858
1858
    }
1859
 
    session->client->store(table_name);
1860
 
    session->client->store(operator_name);
 
1859
    session->getClient()->store(table_name);
 
1860
    session->getClient()->store(operator_name);
1861
1861
 
1862
1862
    switch (result_code) {
1863
1863
    case HA_ADMIN_NOT_IMPLEMENTED:
1865
1865
        char buf[ERRMSGSIZE+20];
1866
1866
        uint32_t length=snprintf(buf, ERRMSGSIZE,
1867
1867
                             ER(ER_CHECK_NOT_IMPLEMENTED), operator_name);
1868
 
        session->client->store(STRING_WITH_LEN("note"));
1869
 
        session->client->store(buf, length);
 
1868
        session->getClient()->store(STRING_WITH_LEN("note"));
 
1869
        session->getClient()->store(buf, length);
1870
1870
      }
1871
1871
      break;
1872
1872
 
1873
1873
    case HA_ADMIN_OK:
1874
 
      session->client->store(STRING_WITH_LEN("status"));
1875
 
      session->client->store(STRING_WITH_LEN("OK"));
 
1874
      session->getClient()->store(STRING_WITH_LEN("status"));
 
1875
      session->getClient()->store(STRING_WITH_LEN("OK"));
1876
1876
      break;
1877
1877
 
1878
1878
    case HA_ADMIN_FAILED:
1879
 
      session->client->store(STRING_WITH_LEN("status"));
1880
 
      session->client->store(STRING_WITH_LEN("Operation failed"));
 
1879
      session->getClient()->store(STRING_WITH_LEN("status"));
 
1880
      session->getClient()->store(STRING_WITH_LEN("Operation failed"));
1881
1881
      break;
1882
1882
 
1883
1883
    case HA_ADMIN_REJECT:
1884
 
      session->client->store(STRING_WITH_LEN("status"));
1885
 
      session->client->store(STRING_WITH_LEN("Operation need committed state"));
 
1884
      session->getClient()->store(STRING_WITH_LEN("status"));
 
1885
      session->getClient()->store(STRING_WITH_LEN("Operation need committed state"));
1886
1886
      open_for_modify= false;
1887
1887
      break;
1888
1888
 
1889
1889
    case HA_ADMIN_ALREADY_DONE:
1890
 
      session->client->store(STRING_WITH_LEN("status"));
1891
 
      session->client->store(STRING_WITH_LEN("Table is already up to date"));
 
1890
      session->getClient()->store(STRING_WITH_LEN("status"));
 
1891
      session->getClient()->store(STRING_WITH_LEN("Table is already up to date"));
1892
1892
      break;
1893
1893
 
1894
1894
    case HA_ADMIN_CORRUPT:
1895
 
      session->client->store(STRING_WITH_LEN("error"));
1896
 
      session->client->store(STRING_WITH_LEN("Corrupt"));
 
1895
      session->getClient()->store(STRING_WITH_LEN("error"));
 
1896
      session->getClient()->store(STRING_WITH_LEN("Corrupt"));
1897
1897
      fatal_error=1;
1898
1898
      break;
1899
1899
 
1900
1900
    case HA_ADMIN_INVALID:
1901
 
      session->client->store(STRING_WITH_LEN("error"));
1902
 
      session->client->store(STRING_WITH_LEN("Invalid argument"));
 
1901
      session->getClient()->store(STRING_WITH_LEN("error"));
 
1902
      session->getClient()->store(STRING_WITH_LEN("Invalid argument"));
1903
1903
      break;
1904
1904
 
1905
1905
    default:                            // Probably HA_ADMIN_INTERNAL_ERROR
1908
1908
        uint32_t length=snprintf(buf, ERRMSGSIZE,
1909
1909
                             _("Unknown - internal error %d during operation"),
1910
1910
                             result_code);
1911
 
        session->client->store(STRING_WITH_LEN("error"));
1912
 
        session->client->store(buf, length);
 
1911
        session->getClient()->store(STRING_WITH_LEN("error"));
 
1912
        session->getClient()->store(buf, length);
1913
1913
        fatal_error=1;
1914
1914
        break;
1915
1915
      }
1938
1938
    session->endTransaction(COMMIT);
1939
1939
    session->close_thread_tables();
1940
1940
    table->table=0;                             // For query cache
1941
 
    if (session->client->flush())
 
1941
    if (session->getClient()->flush())
1942
1942
      goto err;
1943
1943
  }
1944
1944