Commit a34a9d73 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  eel.(none):/home/jonas/src/mysql-5.0-push
parents fec16a64 6b52ad9a

mysql-test/r/insert_select.result

+10 −0
Original line number Diff line number Diff line
@@ -668,3 +668,13 @@ ERROR 42S22: Unknown column 't2.a' in 'field list' 
insert into t1 select t2.a from t2 group by t2.a on duplicate key update a= t1.a + t2.b;

ERROR 42S22: Unknown column 't2.b' in 'field list'

drop table t1,t2,t3;

create table t1(f1 varchar(5) key);

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

select * from t1;

f1

2000

2001

2002

drop table t1;

mysql-test/t/insert_select.test

+10 −0
Original line number Diff line number Diff line
@@ -202,4 +202,14 @@ insert into t1 select t2.a from t2 on duplicate key update t2.a= a + t2.b; 
insert into t1 select t2.a from t2 group by t2.a on duplicate key update a= t1.a + t2.b;

drop table t1,t2,t3;



#

# Bug #12695 Item_func_isnull::update_used_tables() did not update 

#            const_item_cache

create table t1(f1 varchar(5) key);

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;

select * from t1;

drop table t1;



# End of 4.1 tests

server-tools/instance-manager/options.cc

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static struct my_option my_long_options[] = 
    (gptr *) &Options::port_number, (gptr *) &Options::port_number,

    0, GET_UINT, REQUIRED_ARG, DEFAULT_PORT, 0, 0, 0, 0, 0 },



  { "password-file", OPT_PASSWORD_FILE, "Look for Instane Manager users"

  { "password-file", OPT_PASSWORD_FILE, "Look for Instance Manager users"

                                        " and passwords here.",

    (gptr *) &Options::password_file_name,

    (gptr *) &Options::password_file_name,

sql/sql_parse.cc

+0 −3
Original line number Diff line number Diff line
@@ -3516,7 +3516,6 @@ mysql_execute_command(THD *thd) 
	 !db_ok_with_wild_table(lex->name)))

    {

      my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));

      reset_one_shot_variables(thd);

      break;

    }

#endif
@@ -3551,7 +3550,6 @@ mysql_execute_command(THD *thd) 
	 !db_ok_with_wild_table(lex->name)))

    {

      my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));

      reset_one_shot_variables(thd);

      break;

    }

#endif
@@ -3592,7 +3590,6 @@ mysql_execute_command(THD *thd) 
	 !db_ok_with_wild_table(db)))

    {

      my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));

      reset_one_shot_variables(thd);

      break;

    }

#endif