database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

mergemerged

Browse Source
This commit is contained in:
serg@serg.mylan
2005-06-03 21:24:13 +02:00
parent 03056a2892 5b810bc607
commit aaa4c11d11
5 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/my_global.h
View File

@ -285,13 +285,6 @@ C_MODE_START int __cxa_pure_virtual() {\
#include <alloca.h> #include <alloca.h>
#endif #endif
#ifdef HAVE_ATOMIC_ADD #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__) #if defined(__ia64__)
#define new my_arg_new #define new my_arg_new
#define need_to_restore_new 1 #define need_to_restore_new 1

15
mysql-test/r/create.result
View File

@ -497,9 +497,9 @@ drop database mysqltest;
select database(); select database();
database() database()
NULL NULL
select database(); select database(), user();
database() database() user()
NULL NULL mysqltest_1@localhost
use test; use test;
create table t1 (a int, index `primary` (a)); create table t1 (a int, index `primary` (a));
ERROR 42000: Incorrect index name 'primary' ERROR 42000: Incorrect index name 'primary'
@ -563,15 +563,6 @@ select * from t2;
b b
1 1
drop table t1,t2; 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); create table t1(column.name int);
ERROR 42000: Incorrect table name 'column' ERROR 42000: Incorrect table name 'column'
create table t1(test.column.name int); create table t1(test.column.name int);

8
mysql-test/t/create.test
View File

@ -403,8 +403,11 @@ drop database mysqltest;
select database(); select database();
# Connect without a database # Connect without a database
connect (user4,localhost,mysqltest_1,,*NO-ONE*); connect (user1,localhost,mysqltest_1,,*NO-ONE*);
select database(); connection user1;
select database(), user();
connection default;
disconnect user1;
# #
# Test for Bug 856 'Naming a key "Primary" causes trouble' # 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 t1(t1.name int);
create table t2(test.t2.name int); create table t2(test.t2.name int);
drop table t1,t2; drop table t1,t2;

15
sql/sql_parse.cc
View File

@ -2509,15 +2509,14 @@ mysql_execute_command(THD *thd)
if (!res) if (!res)
send_ok(thd); 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 Release the protection against the global read lock and wake
everyone, who might want to set a global read lock. everyone, who might want to set a global read lock.
*/ */
start_waiting_global_read_lock(thd); 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; break;
unsent_create_error: unsent_create_error:
@ -3692,14 +3691,6 @@ error:
thd->lock= 0; thd->lock= 0;
} }
DBUG_VOID_RETURN; 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;
} }

2
sql/sql_repl.cc
View File

@ -81,7 +81,7 @@ static int send_file(THD *thd)
char fname[FN_REFLEN+1]; char fname[FN_REFLEN+1];
const char *errmsg = 0; const char *errmsg = 0;
int old_timeout; int old_timeout;
uint packet_len; unsigned long packet_len;
char buf[IO_SIZE]; // It's safe to alloc this char buf[IO_SIZE]; // It's safe to alloc this
DBUG_ENTER("send_file"); DBUG_ENTER("send_file");