← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/discover_xt.cc

  • Committer: Vijay Samuel
  • Date: 2010-09-10 21:03:37 UTC
  • mto: (1757.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1758.
  • Revision ID: vijay@vijay-20100910210337-rf7c2ymawtqj6tkv
Merge added utf 8 tamil test case suite and test case for creating a database in tamil.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/discover_xt.cc
15
15
 *
16
16
 * You should have received a copy of the GNU General Public License
17
17
 * along with this program; if not, write to the Free Software
18
 
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
18
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
19
 *
20
20
 *  Created by Leslie on 8/27/08.
21
21
 *
1147
1147
    goto err;
1148
1148
  }
1149
1149
 
1150
 
  MYSQL_LOCK(LOCK_open);
 
1150
  LOCK_open.lock;
1151
1151
  if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE))
1152
1152
  {
1153
1153
    if (!access(path,F_OK))
1261
1261
   */
1262
1262
  error= FALSE;
1263
1263
unlock_and_end:
1264
 
  MYSQL_UNLOCK(LOCK_open);
 
1264
  LOCK_open.unlock;
1265
1265
 
1266
1266
err:
1267
1267
  thd_proc_info(thd, "After create");
1325
1325
                                COLUMN_FORMAT_TYPE_FIXED,
1326
1326
#endif
1327
1327
                       NULL /*default_value*/, NULL /*on_update_value*/, &comment, NULL /*change*/, 
1328
 
                       NULL /*interval_list*/, info->field_charset, 0 /*uint_geom_type*/
1329
 
#ifdef MARIADB_BASE_VERSION
1330
 
                       , NULL /*vcol_info*/, NULL /* create options */
1331
 
#endif
1332
 
                       )) 
 
1328
                       NULL /*interval_list*/, info->field_charset, 0 /*uint_geom_type*/)) 
1333
1329
                        goto error;
1334
1330
 
1335
1331
 
1353
1349
        }
1354
1350
        
1355
1351
        /* Create an internal temp table */
1356
 
#ifdef WITH_PARTITION_STORAGE_ENGINE
1357
 
        partition_info *part_info;
1358
 
 
1359
 
        part_info = thd->work_part_info;
1360
 
#endif
1361
1352
        if (mysql_create_table_no_lock(thd, db, name, &mylex.create_info, &mylex.alter_info, 1, 0)) 
1362
1353
                goto error;
1363
 
#ifdef WITH_PARTITION_STORAGE_ENGINE
1364
 
        thd->work_part_info = part_info;
1365
 
#endif
1366
1354
 
1367
1355
        noerror:
1368
1356
        err = 0;