← Back to branch summary

~mysql/mysql-server/mysql-6.0

« back to all changes in this revision

Viewing changes to storage/falcon/TableSpaceManager.cpp

auto-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/falcon/TableSpaceManager.cpp
1
 
/* Copyright (C) 2007 MySQL AB
 
1
/* Copyright � 2007-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
2
2
 
3
3
   This program is free software; you can redistribute it and/or modify
4
4
   it under the terms of the GNU General Public License as published by
538
538
                infoTable->putString(2, tableSpaceFileType(resultSet->getString(1)));   // FILE_TYPE NOT NULL
539
539
                infoTable->setNotNull(3);               // TABLESPACE_NAME
540
540
                infoTable->putString(3, resultSet->getString(1));
541
 
                infoTable->putString(4, "def");         // TABLE_CATALOG
 
541
                infoTable->putString(4, "def");         // TABLE_CATALOG
542
542
                infoTable->setNull(5);                  // TABLE_SCHEMA
543
543
                infoTable->setNull(6);                  // TABLE_NAME
544
544
                infoTable->setNull(7);                  // LOGFILE_GROUP_NAME