1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

5.5 merge and fixes for compiler/test errors

This commit is contained in:
Sergei Golubchik
2013-09-18 13:07:31 +02:00
3617 changed files with 1904339 additions and 85313 deletions

View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2006, 2010, Oracle and/or its affiliates.
/* Copyright (c) 2006, 2013, Oracle and/or its affiliates.
Copyright (c) 2011, 2013, Monty Program Ab.
This program is free software; you can redistribute it and/or modify
@@ -120,6 +120,8 @@ enum enum_explain_filename_mode
#define FN_IS_TMP (FN_FROM_IS_TMP | FN_TO_IS_TMP)
#define NO_FRM_RENAME (1 << 2)
#define FRM_ONLY (1 << 3)
/** Don't check foreign key constraints while renaming table */
#define NO_FK_CHECKS (1 << 4)
uint filename_to_tablename(const char *from, char *to, uint to_length
#ifndef DBUG_OFF