database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

after merge fixes

Browse Source
This commit is contained in:
unknown
2004-09-07 16:56:31 +02:00
parent 77a8615488
commit 49d90b09f5
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/rpl_set_charset.result
View File

@ -1,9 +1,9 @@
slave stop; stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master; reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
slave start; start slave;
drop database if exists mysqltest1; drop database if exists mysqltest1;
create database mysqltest1 /*!40100 character set latin2 */; create database mysqltest1 /*!40100 character set latin2 */;
use mysqltest1; use mysqltest1;
@ -31,9 +31,6 @@ C0C1C2C3C4C5C6C7C8C9CACBCCCDCECF C0
D0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF D0 D0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF D0
E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEF E0 E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEF E0
F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF F0 F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF F0
show binlog events from 1979;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 1979 Query 1 1979 use `mysqltest1`; SET CHARACTER SET DEFAULT
use mysqltest1; use mysqltest1;
select "--- on slave ---"; select "--- on slave ---";
--- on slave --- --- on slave ---

7
mysql-test/t/rpl_set_charset.test
View File

@ -20,13 +20,6 @@ INSERT INTO t1 VALUES ('
INSERT INTO t1 VALUES ('<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','F0'); INSERT INTO t1 VALUES ('<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','F0');
select "--- on master ---"; select "--- on master ---";
select hex(a),b from t1 order by b; select hex(a),b from t1 order by b;
# It's complicated to verify that the charset is reset to default in
# the binlog after each query, except by checking the binlog. When you
# merge this into 4.1/5.0, the 1979 will have to be changed; all you have
# to do is read the var/log/master-bin.0*01 with mysqlbinlog, verify
# that a SET CHARACTER SET DEFAULT is just after the last INSERT, and
# replace 1979 by its position (the "# at" line above the SET).
show binlog events from 1979;
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;

5
sql/sql_table.cc
View File

@ -35,8 +35,7 @@
#define reenable_binlog(A) (A)->options= save_options; #define reenable_binlog(A) (A)->options= save_options;
//extern HASH open_cache; // leftover from the merge. to be deleted const char *primary_key_name="PRIMARY";
static const char *primary_key_name="PRIMARY";
static bool check_if_keyname_exists(const char *name,KEY *start, KEY *end); static bool check_if_keyname_exists(const char *name,KEY *start, KEY *end);
static char *make_unique_key_name(const char *field_name,KEY *start,KEY *end); static char *make_unique_key_name(const char *field_name,KEY *start,KEY *end);
@ -1398,7 +1397,7 @@ TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
open_table(). open_table().
*/ */
tmp_disable_binlog(thd); tmp_disable_binlog(thd);
if (mysql_create_table(thd,db,name,create_info,*extra_fields, if (!mysql_create_table(thd,db,name,create_info,*extra_fields,
*keys,0,select_field_count)) *keys,0,select_field_count))
{ {
if (!(table=open_table(thd,db,name,name,(bool*) 0))) if (!(table=open_table(thd,db,name,name,(bool*) 0)))