Commit 90db4726 authored by bar@bar.myoffice.izhnet.ru's avatar bar@bar.myoffice.izhnet.ru
Browse files

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 

into  mysql.com:/home/bar/mysql-work/mysql-5.1.b29562v2
parents ab396c1d 664162d1

sql/ha_ndbcluster_binlog.cc

+2 −2
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ static int ndbcluster_create_ndb_apply_status_table(THD *thd) 
                   " log_name VARCHAR(255) BINARY NOT NULL, "

                   " start_pos BIGINT UNSIGNED NOT NULL, "

                   " end_pos BIGINT UNSIGNED NOT NULL, "

                   " PRIMARY KEY USING HASH (server_id) ) ENGINE=NDB CHARACTER SET utf8");

                   " PRIMARY KEY USING HASH (server_id) ) ENGINE=NDB CHARACTER SET latin1");



  const int no_print_error[4]= {ER_TABLE_EXISTS_ERROR,

                                701,
@@ -835,7 +835,7 @@ static int ndbcluster_create_schema_table(THD *thd) 
                   " id INT UNSIGNED NOT NULL,"

                   " version INT UNSIGNED NOT NULL,"

                   " type INT UNSIGNED NOT NULL,"

                   " PRIMARY KEY USING HASH (db,name) ) ENGINE=NDB CHARACTER SET utf8");

                   " PRIMARY KEY USING HASH (db,name) ) ENGINE=NDB CHARACTER SET latin1");



  const int no_print_error[4]= {ER_TABLE_EXISTS_ERROR,

                                701,