Commit df9b4754 authored by unknown's avatar unknown
Browse files

Merge bodhi.netgear:/opt/local/work/tmp_merge 

into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0


mysql-test/r/create.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.cc:
  Auto merged
include/my_sys.h:
  Manual merge (second attempt).
mysql-test/r/bdb.result:
  Manual merge (second attempt).
mysql-test/t/bdb.test:
  Manual merge (second attempt).
mysys/my_malloc.c:
  Manual merge (second attempt).
mysys/safemalloc.c:
  Manual merge (second attempt).
sql/ha_federated.cc:
  Manual merge (second attempt).
sql/log_event.cc:
  Manual merge (second attempt).
sql/set_var.cc:
  Manual merge (second attempt).
sql/set_var.h:
  Manual merge (second attempt).
sql/slave.cc:
  Manual merge (second attempt).
sql/slave.h:
  Manual merge (second attempt).
sql/sql_class.h:
  Manual merge (second attempt).
sql/sql_table.cc:
  Manual merge (second attempt).
sql/sql_udf.cc:
  Manual merge (second attempt).
sql/sql_yacc.yy:
  Manual merge (second attempt).
parents d2b4e9c8 7982816b

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ extern gptr my_realloc(gptr oldpoint,uint Size,myf MyFlags); 
extern void my_no_flags_free(gptr ptr);

extern gptr my_memdup(const byte *from,uint length,myf MyFlags);

extern char *my_strdup(const char *from,myf MyFlags);

extern char *my_strndup(const byte *from, uint length,

extern char *my_strndup(const char *from, uint length,

				   myf MyFlags);

/* we do use FG (as a no-op) in below so that a typo on FG is caught */

#define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR))

mysql-test/r/create.result

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ create database mysqltest; 
use mysqltest;

drop database mysqltest;

create table test.t1 like x;

ERROR 42000: Incorrect database name 'NULL'

ERROR 3D000: No database selected

drop table if exists test.t1;

create database mysqltest;

use mysqltest;

mysql-test/r/ps.result

+105 −0
Original line number Diff line number Diff line
@@ -1158,3 +1158,108 @@ Warnings: 
Error	1146	Table 'test.t4' doesn't exist

deallocate prepare stmt;

drop table t1, t2, t3;

create database mysqltest_long_database_name_to_thrash_heap;

use test;

create table t1 (i int);

prepare stmt from "alter table test.t1 rename t1";

use mysqltest_long_database_name_to_thrash_heap;

execute stmt;

show tables like 't1';

Tables_in_mysqltest_long_database_name_to_thrash_heap (t1)

prepare stmt from "alter table test.t1 rename t1";

use test;

execute stmt;

show tables like 't1';

Tables_in_test (t1)

use mysqltest_long_database_name_to_thrash_heap;

show tables like 't1';

Tables_in_mysqltest_long_database_name_to_thrash_heap (t1)

t1

deallocate prepare stmt;

use mysqltest_long_database_name_to_thrash_heap;

prepare stmt_create from "create table t1 (i int)";

prepare stmt_insert from "insert into t1 (i) values (1)";

prepare stmt_update from "update t1 set i=2";

prepare stmt_delete from "delete from t1 where i=2";

prepare stmt_select from "select * from t1";

prepare stmt_alter from "alter table t1 add column (b int)";

prepare stmt_alter1 from "alter table t1 drop column b";

prepare stmt_analyze from "analyze table t1";

prepare stmt_optimize from "optimize table t1";

prepare stmt_show from "show tables like 't1'";

prepare stmt_truncate from "truncate table t1";

prepare stmt_drop from "drop table t1";

drop table t1;

use test;

execute stmt_create;

show tables like 't1';

Tables_in_test (t1)

use mysqltest_long_database_name_to_thrash_heap;

show tables like 't1';

Tables_in_mysqltest_long_database_name_to_thrash_heap (t1)

t1

use test;

execute stmt_insert;

select * from mysqltest_long_database_name_to_thrash_heap.t1;

i

1

execute stmt_update;

select * from mysqltest_long_database_name_to_thrash_heap.t1;

i

2

execute stmt_delete;

execute stmt_select;

i

execute stmt_alter;

show columns from mysqltest_long_database_name_to_thrash_heap.t1;

Field	Type	Null	Key	Default	Extra

i	int(11)	YES		NULL	

b	int(11)	YES		NULL	

execute stmt_alter1;

show columns from mysqltest_long_database_name_to_thrash_heap.t1;

Field	Type	Null	Key	Default	Extra

i	int(11)	YES		NULL	

execute stmt_analyze;

Table	Op	Msg_type	Msg_text

mysqltest_long_database_name_to_thrash_heap.t1	analyze	status	Table is already up to date

execute stmt_optimize;

Table	Op	Msg_type	Msg_text

mysqltest_long_database_name_to_thrash_heap.t1	optimize	status	Table is already up to date

execute stmt_show;

Tables_in_mysqltest_long_database_name_to_thrash_heap (t1)

t1

execute stmt_truncate;

execute stmt_drop;

show tables like 't1';

Tables_in_test (t1)

use mysqltest_long_database_name_to_thrash_heap;

show tables like 't1';

Tables_in_mysqltest_long_database_name_to_thrash_heap (t1)

drop database mysqltest_long_database_name_to_thrash_heap;

prepare stmt_create from "create table t1 (i int)";

ERROR 3D000: No database selected

prepare stmt_insert from "insert into t1 (i) values (1)";

ERROR 3D000: No database selected

prepare stmt_update from "update t1 set i=2";

ERROR 3D000: No database selected

prepare stmt_delete from "delete from t1 where i=2";

ERROR 3D000: No database selected

prepare stmt_select from "select * from t1";

ERROR 3D000: No database selected

prepare stmt_alter from "alter table t1 add column (b int)";

ERROR 3D000: No database selected

prepare stmt_alter1 from "alter table t1 drop column b";

ERROR 3D000: No database selected

prepare stmt_analyze from "analyze table t1";

ERROR 3D000: No database selected

prepare stmt_optimize from "optimize table t1";

ERROR 3D000: No database selected

prepare stmt_show from "show tables like 't1'";

ERROR 3D000: No database selected

prepare stmt_truncate from "truncate table t1";

ERROR 3D000: No database selected

prepare stmt_drop from "drop table t1";

ERROR 3D000: No database selected

create temporary table t1 (i int);

ERROR 3D000: No database selected

use test;

mysql-test/r/sp.result

+46 −0
Original line number Diff line number Diff line
@@ -5000,6 +5000,52 @@ CALL bug18037_p2()| 
DROP FUNCTION bug18037_f1|

DROP PROCEDURE bug18037_p1|

DROP PROCEDURE bug18037_p2|

use test|

create table t3 (i int)|

insert into t3 values (1), (2)|

create database mysqltest1|

use mysqltest1|

create function bug17199() returns varchar(2) deterministic return 'ok'|

use test|

select *, mysqltest1.bug17199() from t3|

i	mysqltest1.bug17199()

1	ok

2	ok

use mysqltest1|

create function bug18444(i int) returns int no sql deterministic return i + 1|

use test|

select mysqltest1.bug18444(i) from t3|

mysqltest1.bug18444(i)

2

3

drop database mysqltest1|

create database mysqltest1 charset=utf8|

create database mysqltest2 charset=utf8|

create procedure mysqltest1.p1()

begin

-- alters the default collation of database test 

alter database character set koi8r;

end|

use mysqltest1|

call p1()|

show create database mysqltest1|

Database	Create Database

mysqltest1	CREATE DATABASE `mysqltest1` /*!40100 DEFAULT CHARACTER SET koi8r */

show create database mysqltest2|

Database	Create Database

mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET utf8 */

alter database mysqltest1 character set utf8|

use mysqltest2|

call mysqltest1.p1()|

show create database mysqltest1|

Database	Create Database

mysqltest1	CREATE DATABASE `mysqltest1` /*!40100 DEFAULT CHARACTER SET koi8r */

show create database mysqltest2|

Database	Create Database

mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET utf8 */

drop database mysqltest1|

drop database mysqltest2|

use test|

drop table if exists t3|

drop procedure if exists bug15217|

create table t3 as select 1|

mysql-test/t/create.test

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ DROP TABLE t12913; 
create database mysqltest;

use mysqltest;

drop database mysqltest;

--error 1102

--error ER_NO_DB_ERROR 

create table test.t1 like x;

--disable_warnings

drop table if exists test.t1;