database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

mergemerged

Browse Source 
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown
2005-06-04 07:28:26 +02:00
parent 15eb5a1f34 61c12aa299
commit a681af904d
4 changed files with 11 additions and 17 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

7
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,7 +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 (a int);
create table t1 select * from t1; create table t1 select * from t1;
ERROR HY000: You can't specify target table 't1' for update in FROM clause ERROR HY000: You can't specify target table 't1' for update in FROM clause

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

@ -403,14 +403,17 @@ 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;
use test;
# #
# Test for Bug 856 'Naming a key "Primary" causes trouble' # Test for Bug 856 'Naming a key "Primary" causes trouble'
# #
use test;
--error 1280 --error 1280
create table t1 (a int, index `primary` (a)); create table t1 (a int, index `primary` (a));
--error 1280 --error 1280
@ -467,8 +470,6 @@ drop table t1,t2;
# This tests two additional possible errors and a hang if # This tests two additional possible errors and a hang if
# an improper fix is present. # an improper fix is present.
# #
connection default;
use test;
create table t1 (a int); create table t1 (a int);
--error 1093 --error 1093
create table t1 select * from t1; 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 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;

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