Commit a681af90 authored by unknown's avatar unknown
Browse files

mergemerged 


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents 15eb5a1f 61c12aa2

include/my_global.h

+0 −7
Original line number Diff line number Diff line
@@ -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

mysql-test/r/create.result

+3 −4
Original line number Diff line number Diff line
@@ -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

mysql-test/t/create.test

+7 −5
Original line number Diff line number Diff line
@@ -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;

sql/sql_repl.cc

+1 −1
Original line number Diff line number Diff line
@@ -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");