Merge bk-internal:/home/bk/mysql-5.1-new-maint

into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c

mysql-test/t/rpl_row_stop_middle.test

@@ -4,8 +4,8 @@
 # forget to close its tables.
 
 # Can be run with statement-based but no interest (and long test)
-source include/have_binlog_format_row.inc;
-source include/master-slave.inc;
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
 
 connection master;
 create table t1 (a int not null auto_increment primary key, b int, key(b));

sql/ha_federated.h

@@ -38,85 +38,6 @@
 #define FEDERATED_QUERY_BUFFER_SIZE STRING_BUFFER_USUAL_SIZE * 5
 #define FEDERATED_RECORDS_IN_RANGE 2
 
-#define FEDERATED_INFO " SHOW TABLE STATUS LIKE "
-#define FEDERATED_INFO_LEN (sizeof(FEDERATED_INFO) -1)
-#define FEDERATED_SELECT "SELECT "
-#define FEDERATED_SELECT_LEN (sizeof(FEDERATED_SELECT) -1)
-#define FEDERATED_WHERE " WHERE "
-#define FEDERATED_WHERE_LEN (sizeof(FEDERATED_WHERE) -1)
-#define FEDERATED_FROM " FROM "
-#define FEDERATED_FROM_LEN (sizeof(FEDERATED_FROM) -1)
-#define FEDERATED_PERCENT "%"
-#define FEDERATED_PERCENT_LEN (sizeof(FEDERATED_PERCENT) -1)
-#define FEDERATED_IS " IS "
-#define FEDERATED_IS_LEN (sizeof(FEDERATED_IS) -1)
-#define FEDERATED_NULL " NULL "
-#define FEDERATED_NULL_LEN (sizeof(FEDERATED_NULL) -1)
-#define FEDERATED_ISNULL " IS NULL "
-#define FEDERATED_ISNULL_LEN (sizeof(FEDERATED_ISNULL) -1)
-#define FEDERATED_LIKE " LIKE "
-#define FEDERATED_LIKE_LEN (sizeof(FEDERATED_LIKE) -1)
-#define FEDERATED_TRUNCATE "TRUNCATE "
-#define FEDERATED_TRUNCATE_LEN (sizeof(FEDERATED_TRUNCATE) -1)
-#define FEDERATED_DELETE "DELETE "
-#define FEDERATED_DELETE_LEN (sizeof(FEDERATED_DELETE) -1)
-#define FEDERATED_INSERT "INSERT INTO "
-#define FEDERATED_INSERT_LEN (sizeof(FEDERATED_INSERT) -1)
-#define FEDERATED_OPTIMIZE "OPTIMIZE TABLE "
-#define FEDERATED_OPTIMIZE_LEN (sizeof(FEDERATED_OPTIMIZE) -1)
-#define FEDERATED_REPAIR "REPAIR TABLE "
-#define FEDERATED_REPAIR_LEN (sizeof(FEDERATED_REPAIR) -1)
-#define FEDERATED_QUICK " QUICK"
-#define FEDERATED_QUICK_LEN (sizeof(FEDERATED_QUICK) -1)
-#define FEDERATED_EXTENDED " EXTENDED"
-#define FEDERATED_EXTENDED_LEN (sizeof(FEDERATED_EXTENDED) -1)
-#define FEDERATED_USE_FRM " USE_FRM"
-#define FEDERATED_USE_FRM_LEN (sizeof(FEDERATED_USE_FRM) -1)
-#define FEDERATED_LIMIT1 " LIMIT 1"
-#define FEDERATED_LIMIT1_LEN (sizeof(FEDERATED_LIMIT1) -1)
-#define FEDERATED_VALUES "VALUES "
-#define FEDERATED_VALUES_LEN (sizeof(FEDERATED_VALUES) -1)
-#define FEDERATED_UPDATE "UPDATE "
-#define FEDERATED_UPDATE_LEN (sizeof(FEDERATED_UPDATE) -1)
-#define FEDERATED_SET " SET "
-#define FEDERATED_SET_LEN (sizeof(FEDERATED_SET) -1)
-#define FEDERATED_AND " AND "
-#define FEDERATED_AND_LEN (sizeof(FEDERATED_AND) -1)
-#define FEDERATED_CONJUNCTION ") AND ("
-#define FEDERATED_CONJUNCTION_LEN (sizeof(FEDERATED_CONJUNCTION) -1)
-#define FEDERATED_OR " OR "
-#define FEDERATED_OR_LEN (sizeof(FEDERATED_OR) -1)
-#define FEDERATED_NOT " NOT "
-#define FEDERATED_NOT_LEN (sizeof(FEDERATED_NOT) -1)
-#define FEDERATED_STAR "* "
-#define FEDERATED_STAR_LEN (sizeof(FEDERATED_STAR) -1)
-#define FEDERATED_SPACE " "
-#define FEDERATED_SPACE_LEN (sizeof(FEDERATED_SPACE) -1)
-#define FEDERATED_SQUOTE "'"
-#define FEDERATED_SQUOTE_LEN (sizeof(FEDERATED_SQUOTE) -1)
-#define FEDERATED_COMMA ", "
-#define FEDERATED_COMMA_LEN (sizeof(FEDERATED_COMMA) -1)
-#define FEDERATED_BTICK "`" 
-#define FEDERATED_BTICK_LEN (sizeof(FEDERATED_BTICK) -1)
-#define FEDERATED_OPENPAREN " ("
-#define FEDERATED_OPENPAREN_LEN (sizeof(FEDERATED_OPENPAREN) -1)
-#define FEDERATED_CLOSEPAREN ") "
-#define FEDERATED_CLOSEPAREN_LEN (sizeof(FEDERATED_CLOSEPAREN) -1)
-#define FEDERATED_NE " != "
-#define FEDERATED_NE_LEN (sizeof(FEDERATED_NE) -1)
-#define FEDERATED_GT " > "
-#define FEDERATED_GT_LEN (sizeof(FEDERATED_GT) -1)
-#define FEDERATED_LT " < "
-#define FEDERATED_LT_LEN (sizeof(FEDERATED_LT) -1)
-#define FEDERATED_LE " <= "
-#define FEDERATED_LE_LEN (sizeof(FEDERATED_LE) -1)
-#define FEDERATED_GE " >= "
-#define FEDERATED_GE_LEN (sizeof(FEDERATED_GE) -1)
-#define FEDERATED_EQ " = "
-#define FEDERATED_EQ_LEN (sizeof(FEDERATED_EQ) -1)
-#define FEDERATED_FALSE " 1=0"
-#define FEDERATED_FALSE_LEN (sizeof(FEDERATED_FALSE) -1)
-
 /*
   FEDERATED_SHARE is a structure that will be shared amoung all open handlers
   The example implements the minimum of what you will probably need.

storage/myisam/myisam_ftdump.c

@@ -86,7 +86,8 @@ int main(int argc,char *argv[])
 
   init_key_cache(dflt_key_cache,MI_KEY_BLOCK_LENGTH,USE_BUFFER_INIT, 0, 0);
 
-  if (!(info=mi_open(argv[0],2,HA_OPEN_ABORT_IF_LOCKED|HA_OPEN_FROM_SQL_LAYER)))
+  if (!(info=mi_open(argv[0], O_RDONLY,
+                     HA_OPEN_ABORT_IF_LOCKED|HA_OPEN_FROM_SQL_LAYER)))
   {
     error=my_errno;
     goto err;