diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /scripts/fill_help_tables.sql | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'scripts/fill_help_tables.sql')
| -rw-r--r-- | scripts/fill_help_tables.sql | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/fill_help_tables.sql b/scripts/fill_help_tables.sql index 2a0124afce9..7751c37cbc3 100644 --- a/scripts/fill_help_tables.sql +++ b/scripts/fill_help_tables.sql @@ -12,9 +12,7 @@ -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software --- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - --- DO NOT EDIT THIS FILE. It is generated automatically. +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- To use this file, load its contents into the mysql database. For example, -- with the mysql client program, process the file like this, where @@ -2013,4 +2011,3 @@ insert into help_relation (help_topic_id,help_keyword_id) values (206,447); insert into help_relation (help_topic_id,help_keyword_id) values (464,447); insert into help_relation (help_topic_id,help_keyword_id) values (198,448); insert into help_relation (help_topic_id,help_keyword_id) values (464,449); - |