Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
c448ab53
Commit
c448ab53
authored
May 25, 2005
by
joreland@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
parents
cea14f25
119e500c
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
120 additions
and
51 deletions
+120
-51
BUILD/check-cpu
BUILD/check-cpu
+4
-0
client/client_priv.h
client/client_priv.h
+1
-1
client/mysqldump.c
client/mysqldump.c
+15
-4
include/my_global.h
include/my_global.h
+3
-1
mysql-test/r/mysqldump.result
mysql-test/r/mysqldump.result
+38
-0
mysql-test/r/reserved_win_names.require
mysql-test/r/reserved_win_names.require
+0
-2
mysql-test/r/reserved_win_names.result
mysql-test/r/reserved_win_names.result
+0
-7
mysql-test/r/select.result
mysql-test/r/select.result
+6
-0
mysql-test/r/union.result
mysql-test/r/union.result
+19
-0
mysql-test/t/mysqldump.test
mysql-test/t/mysqldump.test
+9
-0
mysql-test/t/reserved_win_names.test
mysql-test/t/reserved_win_names.test
+0
-12
mysql-test/t/select.test
mysql-test/t/select.test
+9
-0
mysql-test/t/union.test
mysql-test/t/union.test
+11
-0
ndb/src/common/util/File.cpp
ndb/src/common/util/File.cpp
+3
-23
sql/item.cc
sql/item.cc
+1
-0
sql/sql_yacc.yy
sql/sql_yacc.yy
+1
-1
No files found.
BUILD/check-cpu
View file @
c448ab53
...
...
@@ -72,6 +72,7 @@ case "$cpu_family--$model_name" in
;;
*
ppc
)
cpu_flag
=
"powerpc"
;
no_march
=
1
;
;;
*
)
cpu_flag
=
""
;
...
...
@@ -106,6 +107,9 @@ case "$cc_ver--$cc_verno" in
cpu_flag
=
"
$cpu_flag_old
"
fi
check_cpu_cflags
=
"-mcpu=
$cpu_flag
-march=
$cpu_flag
"
if
test
-n
"
$no_march
"
;
then
check_cpu_cflags
=
"-mcpu=
$cpu_flag
"
fi
;;
*
)
check_cpu_cflags
=
""
...
...
client/client_priv.h
View file @
c448ab53
...
...
@@ -49,5 +49,5 @@ enum options_client
#ifdef HAVE_NDBCLUSTER_DB
,
OPT_NDBCLUSTER
,
OPT_NDB_CONNECTSTRING
#endif
,
OPT_IGNORE_TABLE
,
OPT_INSERT_IGNORE
,
OPT_IGNORE_TABLE
,
OPT_INSERT_IGNORE
,
OPT_DROP_DATABASE
};
client/mysqldump.c
View file @
c448ab53
...
...
@@ -85,7 +85,7 @@ static my_bool verbose=0,tFlag=0,dFlag=0,quick= 1, extended_insert= 1,
opt_delete_master_logs
=
0
,
tty_password
=
0
,
opt_single_transaction
=
0
,
opt_comments
=
0
,
opt_compact
=
0
,
opt_hex_blob
=
0
,
opt_order_by_primary
=
0
,
opt_ignore
=
0
,
opt_complete_insert
=
0
;
opt_complete_insert
=
0
,
opt_drop_database
=
0
;
static
ulong
opt_max_allowed_packet
,
opt_net_buffer_length
;
static
MYSQL
mysql_connection
,
*
sock
=
0
;
static
my_bool
insert_pat_inited
=
0
;
...
...
@@ -159,6 +159,9 @@ static struct my_option my_long_options[] =
"Dump all the databases. This will be same as --databases with all databases selected."
,
(
gptr
*
)
&
opt_alldbs
,
(
gptr
*
)
&
opt_alldbs
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"add-drop-database"
,
OPT_DROP_DATABASE
,
"Add a 'DROP DATABASE' before each create."
,
(
gptr
*
)
&
opt_drop_database
,
(
gptr
*
)
&
opt_drop_database
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"add-drop-table"
,
OPT_DROP
,
"Add a 'drop table' before each create."
,
(
gptr
*
)
&
opt_drop
,
(
gptr
*
)
&
opt_drop
,
0
,
GET_BOOL
,
NO_ARG
,
1
,
0
,
0
,
0
,
0
,
0
},
...
...
@@ -1119,9 +1122,9 @@ static uint getTableStructure(char *table, char* db)
else
dynstr_set
(
&
insert_pat
,
""
);
insert_option
=
(
opt_delayed
&&
opt_ignore
)
?
" DELAYED IGNORE "
:
opt_delayed
?
" DELAYED "
:
opt_ignore
?
" IGNORE "
:
""
;
insert_option
=
(
(
opt_delayed
&&
opt_ignore
)
?
" DELAYED IGNORE "
:
opt_delayed
?
" DELAYED "
:
opt_ignore
?
" IGNORE "
:
""
)
;
if
(
verbose
)
fprintf
(
stderr
,
"-- Retrieving table structure for table %s...
\n
"
,
table
);
...
...
@@ -2043,12 +2046,20 @@ static int init_dumping(char *database)
if
(
mysql_query
(
sock
,
qbuf
)
||
!
(
dbinfo
=
mysql_store_result
(
sock
)))
{
/* Old server version, dump generic CREATE DATABASE */
if
(
opt_drop_database
)
fprintf
(
md_result_file
,
"
\n
/*!40000 DROP DATABASE IF EXISTS %s;*/
\n
"
,
qdatabase
);
fprintf
(
md_result_file
,
"
\n
CREATE DATABASE /*!32312 IF NOT EXISTS*/ %s;
\n
"
,
qdatabase
);
}
else
{
if
(
opt_drop_database
)
fprintf
(
md_result_file
,
"
\n
/*!40000 DROP DATABASE IF EXISTS %s*/;
\n
"
,
qdatabase
);
row
=
mysql_fetch_row
(
dbinfo
);
if
(
row
[
1
])
{
...
...
include/my_global.h
View file @
c448ab53
...
...
@@ -289,12 +289,14 @@ C_MODE_START int __cxa_pure_virtual() {\
#endif
#if defined(__ia64__)
#define new my_arg_new
#define need_to_restore_new 1
#endif
C_MODE_START
#include <asm/atomic.h>
C_MODE_END
#if
defined(__ia64__)
#if
def need_to_restore_new
/* probably safer than #ifdef new */
#undef new
#undef need_to_restore_new
#endif
#endif
#include <errno.h>
/* Recommended by debian */
...
...
mysql-test/r/mysqldump.result
View file @
c448ab53
...
...
@@ -1311,3 +1311,41 @@ UNLOCK TABLES;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
drop table t1;
CREATE TABLE t1 (a int);
INSERT INTO t1 VALUES (1),(2),(3);
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
/*!40000 DROP DATABASE IF EXISTS `test`*/;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;
USE `test`;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
`a` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
LOCK TABLES `t1` WRITE;
INSERT INTO `t1` VALUES (1),(2),(3);
UNLOCK TABLES;
/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
DROP TABLE t1;
mysql-test/r/reserved_win_names.require
deleted
100644 → 0
View file @
cea14f25
Variable_name Value
lower_case_table_names 1
mysql-test/r/reserved_win_names.result
deleted
100644 → 0
View file @
cea14f25
use COM1;
ERROR 42000: Unknown database 'com1'
use LPT1;
ERROR 42000: Unknown database 'lpt1'
use PRN;
ERROR 42000: Unknown database 'prn'
mysql-test/r/select.result
View file @
c448ab53
...
...
@@ -2509,3 +2509,9 @@ AND FK_firma_id = 2;
COUNT(*)
0
drop table t1;
CREATE TABLE t1 (b BIGINT(20) UNSIGNED NOT NULL, PRIMARY KEY (b));
INSERT INTO t1 VALUES (0x8000000000000000);
SELECT b FROM t1 WHERE b=0x8000000000000000;
b
9223372036854775808
DROP TABLE t1;
mysql-test/r/union.result
View file @
c448ab53
...
...
@@ -1235,3 +1235,22 @@ show columns from t2;
Field Type Null Key Default Extra
a varchar(3) YES NULL
drop table t2, t1;
create table t1 ( id int not null auto_increment, primary key (id), col1 int);
insert into t1 (col1) values (2),(3),(4),(5),(6);
select 99 union all select id from t1 order by 1;
99
1
2
3
4
5
99
select id from t1 union all select 99 order by 1;
id
1
2
3
4
5
99
drop table t1;
mysql-test/t/mysqldump.test
View file @
c448ab53
...
...
@@ -534,3 +534,12 @@ create table t1 (
insert
into
t1
(
F_8d3bba7425e7c98c50f52ca1b52d3735
)
values
(
1
);
--
exec
$MYSQL_DUMP
--
skip
-
comments
-
c
test
drop
table
t1
;
#
# Test for --add-drop-database
#
CREATE
TABLE
t1
(
a
int
);
INSERT
INTO
t1
VALUES
(
1
),(
2
),(
3
);
--
exec
$MYSQL_DUMP
--
add
-
drop
-
database
--
skip
-
comments
--
databases
test
DROP
TABLE
t1
;
mysql-test/t/reserved_win_names.test
deleted
100644 → 0
View file @
cea14f25
#
# Test of reserved Windows names
#
--
require
r
/
reserved_win_names
.
require
--
error
1049
use
COM1
;
--
error
1049
use
LPT1
;
--
error
1049
use
PRN
;
mysql-test/t/select.test
View file @
c448ab53
...
...
@@ -2051,3 +2051,12 @@ SELECT COUNT(*) FROM t1 WHERE
AND
FK_firma_id
=
2
;
drop
table
t1
;
#
# Test for Bug#8009, SELECT failed on bigint unsigned when using HEX
#
CREATE
TABLE
t1
(
b
BIGINT
(
20
)
UNSIGNED
NOT
NULL
,
PRIMARY
KEY
(
b
));
INSERT
INTO
t1
VALUES
(
0x8000000000000000
);
SELECT
b
FROM
t1
WHERE
b
=
0x8000000000000000
;
DROP
TABLE
t1
;
mysql-test/t/union.test
View file @
c448ab53
...
...
@@ -742,3 +742,14 @@ create table t2 select a from t1 union select c from t1;
create
table
t2
select
a
from
t1
union
select
b
from
t1
;
show
columns
from
t2
;
drop
table
t2
,
t1
;
#
# Bug #10032 Bug in parsing UNION with ORDER BY when one node does not use FROM
#
create
table
t1
(
id
int
not
null
auto_increment
,
primary
key
(
id
),
col1
int
);
insert
into
t1
(
col1
)
values
(
2
),(
3
),(
4
),(
5
),(
6
);
select
99
union
all
select
id
from
t1
order
by
1
;
select
id
from
t1
union
all
select
99
order
by
1
;
drop
table
t1
;
ndb/src/common/util/File.cpp
View file @
c448ab53
...
...
@@ -28,29 +28,9 @@
bool
File_class
::
exists
(
const
char
*
aFileName
)
{
bool
rc
=
true
;
#ifdef USE_MY_STAT_STRUCT
struct
my_stat
stmp
;
#else
struct
stat
stmp
;
#endif
if
(
my_stat
(
aFileName
,
&
stmp
,
MYF
(
0
))
!=
0
)
{
rc
=
false
;
}
/*
File f;
if (!f.open(aFileName, "r"))
{
rc = (errno == ENOENT ? false : true);
}
else
{
f.close();
}
*/
return
rc
;
MY_STAT
stmp
;
return
(
my_stat
(
aFileName
,
&
stmp
,
MYF
(
0
))
!=
NULL
);
}
long
...
...
sql/item.cc
View file @
c448ab53
...
...
@@ -2107,6 +2107,7 @@ Item_varbinary::Item_varbinary(const char *str, uint str_length)
*
ptr
=
0
;
// Keep purify happy
collation
.
set
(
&
my_charset_bin
,
DERIVATION_COERCIBLE
);
fixed
=
1
;
unsigned_flag
=
1
;
}
longlong
Item_varbinary
::
val_int
()
...
...
sql/sql_yacc.yy
View file @
c448ab53
...
...
@@ -2449,7 +2449,7 @@ select_part2:
select_into select_lock_type;
select_into:
opt_limit_clause {}
opt_
order_clause opt_
limit_clause {}
| into
| select_from
| into select_from
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment