1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b29562v2
This commit is contained in:
bar@bar.myoffice.izhnet.ru 2007-12-14 20:12:55 +04:00
commit 90db472666
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/ha_ndbcluster_binlog.cc
View File

@ -775,7 +775,7 @@ static int ndbcluster_create_ndb_apply_status_table(THD *thd)
" log_name VARCHAR(255) BINARY NOT NULL, " " log_name VARCHAR(255) BINARY NOT NULL, "
" start_pos BIGINT UNSIGNED NOT NULL, " " start_pos BIGINT UNSIGNED NOT NULL, "
" end_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, const int no_print_error[4]= {ER_TABLE_EXISTS_ERROR,
701, 701,
@ -835,7 +835,7 @@ static int ndbcluster_create_schema_table(THD *thd)
" id INT UNSIGNED NOT NULL," " id INT UNSIGNED NOT NULL,"
" version INT UNSIGNED NOT NULL," " version INT UNSIGNED NOT NULL,"
" type 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, const int no_print_error[4]= {ER_TABLE_EXISTS_ERROR,
701, 701,