diff options
| -rw-r--r-- | include/my_global.h | 7 | ||||
| -rw-r--r-- | mysql-test/r/create.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/create.test | 12 | ||||
| -rw-r--r-- | sql/sql_repl.cc | 2 |
4 files changed, 11 insertions, 17 deletions
diff --git a/include/my_global.h b/include/my_global.h index 79f4a16caa9..c978bf82b3a 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -285,13 +285,6 @@ C_MODE_START int __cxa_pure_virtual() {\ #include <alloca.h> #endif #ifdef HAVE_ATOMIC_ADD -#define __SMP__ -#ifdef HAVE_LINUX_CONFIG_H -#include <linux/config.h> /* May define CONFIG_SMP */ -#endif -#ifndef CONFIG_SMP -#define CONFIG_SMP -#endif #if defined(__ia64__) #define new my_arg_new #define need_to_restore_new 1 diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index a504823a2a9..de3840447dc 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -497,9 +497,9 @@ drop database mysqltest; select database(); database() NULL -select database(); -database() -NULL +select database(), user(); +database() user() +NULL mysqltest_1@localhost use test; create table t1 (a int, index `primary` (a)); ERROR 42000: Incorrect index name 'primary' @@ -563,7 +563,6 @@ select * from t2; b 1 drop table t1,t2; -use test; create table t1 (a int); create table t1 select * from t1; ERROR HY000: You can't specify target table 't1' for update in FROM clause diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index c6973b271ad..b73cd28c71c 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -403,14 +403,17 @@ drop database mysqltest; select database(); # Connect without a database -connect (user4,localhost,mysqltest_1,,*NO-ONE*); -select database(); +connect (user1,localhost,mysqltest_1,,*NO-ONE*); +connection user1; +select database(), user(); +connection default; +disconnect user1; +use test; # # Test for Bug 856 'Naming a key "Primary" causes trouble' # -use test; --error 1280 create table t1 (a int, index `primary` (a)); --error 1280 @@ -467,8 +470,6 @@ drop table t1,t2; # This tests two additional possible errors and a hang if # an improper fix is present. # -connection default; -use test; create table t1 (a int); --error 1093 create table t1 select * from t1; @@ -490,3 +491,4 @@ create table t1(xyz.t1.name int); create table t1(t1.name int); create table t2(test.t2.name int); drop table t1,t2; + diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 4249c9e1809..fe95ee26748 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -81,7 +81,7 @@ static int send_file(THD *thd) char fname[FN_REFLEN+1]; const char *errmsg = 0; int old_timeout; - uint packet_len; + unsigned long packet_len; char buf[IO_SIZE]; // It's safe to alloc this DBUG_ENTER("send_file"); |