Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-06-14 11:51:57+05:00, bar@stripped +2 -0
Merge abarkov@stripped:/home/bk/mysql-5.1-rpl
into mysql.com:/home/bar/mysql-work/mysql-5.1.b26402
MERGE: 1.2500.38.1
sql/mysql_priv.h@stripped, 2007-06-14 11:51:53+05:00, bar@stripped +0 -0
Auto merged
MERGE: 1.509.1.3
sql/sql_table.cc@stripped, 2007-06-14 11:51:53+05:00, bar@stripped +0 -0
Auto merged
MERGE: 1.427.1.1
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: bar
# Host: bar.myoffice.izhnet.ru
# Root: /home/bar/mysql-work/mysql-5.1.b26402/RESYNC
--- 1.517/sql/mysql_priv.h 2007-06-13 01:12:33 +05:00
+++ 1.518/sql/mysql_priv.h 2007-06-14 11:51:53 +05:00
@@ -1921,6 +1921,10 @@ uint filename_to_tablename(const char *f
uint tablename_to_filename(const char *from, char *to, uint to_length);
uint build_table_filename(char *buff, size_t bufflen, const char *db,
const char *table, const char *ext, uint flags);
+
+#define MYSQL50_TABLE_NAME_PREFIX "#mysql50#"
+#define MYSQL50_TABLE_NAME_PREFIX_LENGTH 9
+
/* Flags for conversion functions. */
#define FN_FROM_IS_TMP (1 << 0)
#define FN_TO_IS_TMP (1 << 1)
--- 1.429/sql/sql_table.cc 2007-06-06 02:23:56 +05:00
+++ 1.430/sql/sql_table.cc 2007-06-14 11:51:53 +05:00
@@ -54,10 +54,6 @@ mysql_prepare_alter_table(THD *thd, TABL
HA_CREATE_INFO *create_info,
Alter_info *alter_info);
-#define MYSQL50_TABLE_NAME_PREFIX "#mysql50#"
-#define MYSQL50_TABLE_NAME_PREFIX_LENGTH 9
-
-
/*
Translate a file name to a table name (WL #1324).
| Thread |
|---|
| • bk commit into 5.1 tree (bar:1.2555) | bar | 14 Jun |
