Commit 33022c52 authored by unknown's avatar unknown
Browse files

mergemerged 


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents fcb3be9f 7509b500

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 −12
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,15 +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

create table t2 union = (t1) select * from t1;

ERROR HY000: You can't specify target table 't1' for update in FROM clause

flush tables with read lock;

unlock tables;

drop table t1;

create table t1(column.name int);

ERROR 42000: Incorrect table name 'column'

create table t1(test.column.name int);

mysql-test/t/create.test

+6 −2
Original line number Diff line number Diff line
@@ -403,8 +403,11 @@ 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;



#

# Test for Bug 856 'Naming a key "Primary" causes trouble'
@@ -490,3 +493,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_parse.cc

+3 −12
Original line number Diff line number Diff line
@@ -2509,15 +2509,14 @@ mysql_execute_command(THD *thd) 
      if (!res)

	send_ok(thd);

    }

    // put tables back for PS rexecuting

    tables= lex->link_first_table_back(tables, create_table,

				       create_table_local);

    /*

      Release the protection against the global read lock and wake

      everyone, who might want to set a global read lock.

    */

    start_waiting_global_read_lock(thd);



    // put tables back for PS rexecuting

    tables= lex->link_first_table_back(tables, create_table,

				       create_table_local);

    break;



unsent_create_error:
@@ -3692,14 +3691,6 @@ purposes internal to the MySQL server", MYF(0)); 
      thd->lock= 0;

  }

  DBUG_VOID_RETURN;



 error1:

  /*

    Release the protection against the global read lock and wake

    everyone, who might want to set a global read lock.

  */

  start_waiting_global_read_lock(thd);

  DBUG_VOID_RETURN;

}

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");