Commit e7340d5c authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
parents 49daaae0 7d8ea692

.bzrignore

+1 −1
Original line number Diff line number Diff line
@@ -1120,6 +1120,7 @@ server-tools/instance-manager/messages.cpp 
server-tools/instance-manager/mysql_connection.cpp

server-tools/instance-manager/mysqlmanager

server-tools/instance-manager/mysqlmanager.cpp

server-tools/instance-manager/net_serv.cc

server-tools/instance-manager/options.cpp

server-tools/instance-manager/parse.cpp

server-tools/instance-manager/parse_output.cpp
@@ -1780,4 +1781,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
server-tools/instance-manager/net_serv.cc

client/mysqldump.c

+23 −1
Original line number Diff line number Diff line
@@ -1643,9 +1643,15 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
      field= mysql_fetch_field_direct(result, 0);

      if (strcmp(field->name, "View") == 0)

      {

        char *scv_buff = NULL;



        if (verbose)

          fprintf(stderr, "-- It's a view, create dummy table for view\n");



        /* save "show create" statement for later */

        if ((row= mysql_fetch_row(result)) && (scv_buff=row[1]))

          scv_buff= my_strdup(scv_buff, MYF(0));



        mysql_free_result(result);



        /*
@@ -1663,9 +1669,22 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
                    "SHOW FIELDS FROM %s", result_table);

        if (mysql_query_with_error_report(sock, 0, query_buff))

        {

          /*

            View references invalid or privileged table/col/fun (err 1356),

            so we cannot create a stand-in table.  Be defensive and dump

            a comment with the view's 'show create' statement. (Bug #17371)

          */



          if (mysql_errno(sock) == ER_VIEW_INVALID)

            fprintf(sql_file, "\n-- failed on view %s: %s\n\n", result_table, scv_buff ? scv_buff : "");



          my_free(scv_buff, MYF(MY_ALLOW_ZERO_PTR));



          safe_exit(EX_MYSQLERR);

          DBUG_RETURN(0); 

        }

        else

          my_free(scv_buff, MYF(MY_ALLOW_ZERO_PTR));



        if ((result= mysql_store_result(sock)))

        {
@@ -1706,6 +1725,9 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
        }

        mysql_free_result(result);



        if (path)

          my_fclose(sql_file, MYF(MY_WME));



        seen_views= 1;

        DBUG_RETURN(0);

      }

mysql-test/r/binlog_row_blackhole.result

+0 −4
Original line number Diff line number Diff line
@@ -111,17 +111,13 @@ master-bin.000001 # Query 1 # use `test`; drop table t1,t2 
master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int) engine=blackhole

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Query	1	#	use `test`; create table t2 (a varchar(200)) engine=blackhole

master-bin.000001	#	Table_map	1	#	table_id: # (test.t2)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Query	1	#	use `test`; alter table t1 add b int

master-bin.000001	#	Query	1	#	use `test`; alter table t1 drop b

master-bin.000001	#	Query	1	#	use `test`; create table t3 like t1

mysql-test/r/binlog_stm_blackhole.result

+0 −9
Original line number Diff line number Diff line
@@ -110,27 +110,18 @@ master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 
master-bin.000001	#	Query	1	#	use `test`; drop table t1,t2

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int) engine=blackhole

master-bin.000001	#	Query	1	#	use `test`; delete from t1 where a=10

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Query	1	#	use `test`; update t1 set a=11 where a=15

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(1)

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Query	1	#	use `test`; insert ignore into t1 values(1)

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Query	1	#	use `test`; replace into t1 values(100)

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Query	1	#	use `test`; create table t2 (a varchar(200)) engine=blackhole

master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Execute_load_query	1	#	use `test`; load data infile '../std_data_ln/words.dat' into table t2 ;file_id=1

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Query	1	#	use `test`; alter table t1 add b int

master-bin.000001	#	Query	1	#	use `test`; alter table t1 drop b

master-bin.000001	#	Query	1	#	use `test`; create table t3 like t1

master-bin.000001	#	Query	1	#	use `test`; insert into t1 select * from t3

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Query	1	#	use `test`; replace into t1 select * from t3

master-bin.000001	#	Query	1	#	use `test`; COMMIT

drop table t1,t2,t3;

reset master;

create table t1 (a int) engine=blackhole;

mysql-test/r/ctype_ucs.result

+26 −0
Original line number Diff line number Diff line
@@ -704,6 +704,32 @@ select f1 from t1 where f1 like 'a%'; 
f1

a

drop table t1;

create table t1 (utext varchar(20) character set ucs2);

insert into t1 values ("lily");

insert into t1 values ("river");

prepare stmt from 'select utext from t1 where utext like ?';

set @param1='%%';

execute stmt using @param1;

utext

lily

river

execute stmt using @param1;

utext

lily

river

select utext from t1 where utext like '%%';

utext

lily

river

drop table t1;

deallocate prepare stmt;

CREATE TABLE t1 (id int, s char(5) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci);

INSERT INTO t1 VALUES (1, 'ZZZZZ'), (1, 'ZZZ'), (2, 'ZZZ'), (2, 'ZZZZZ');

SELECT id, MIN(s) FROM t1 GROUP BY id;

id	MIN(s)

1	ZZZ

2	ZZZ

DROP TABLE t1;

CREATE TABLE t1 (a varchar(64) character set ucs2, b decimal(10,3));

INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0);

update t1 set b=a;