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
f3f5eb5c
Commit
f3f5eb5c
authored
Dec 19, 2006
by
istruewing@chilla.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into chilla.local:/home/mydev/mysql-4.1-axmrg
parents
f92ae8d6
9b8c7ffc
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
116 additions
and
64 deletions
+116
-64
mysql-test/lib/mtr_unique.pl
mysql-test/lib/mtr_unique.pl
+9
-3
mysql-test/r/gis.result
mysql-test/r/gis.result
+6
-0
mysql-test/std_data/bad_gis_data.dat
mysql-test/std_data/bad_gis_data.dat
+1
-0
mysql-test/t/gis.test
mysql-test/t/gis.test
+9
-2
scripts/Makefile.am
scripts/Makefile.am
+1
-0
scripts/mysqlaccess.sh
scripts/mysqlaccess.sh
+3
-3
scripts/mysqld_multi.sh
scripts/mysqld_multi.sh
+3
-3
sql/field.cc
sql/field.cc
+2
-1
sql/field.h
sql/field.h
+63
-50
sql/sql_load.cc
sql/sql_load.cc
+12
-2
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+7
-0
No files found.
mysql-test/lib/mtr_unique.pl
View file @
f3f5eb5c
...
...
@@ -10,10 +10,16 @@ use Fcntl ':flock';
# Requested IDs are stored in a hash and released upon END.
#
my
%
mtr_unique_assigned_ids
=
();
my
$mtr_unique_pid
;
BEGIN
{
$mtr_unique_pid
=
$$
unless
defined
$mtr_unique_pid
;
}
END
{
while
(
my
(
$id
,
$file
)
=
each
(
%
mtr_unique_assigned_ids
))
{
print
"
Autoreleasing
$file
:
$id
\n
";
mtr_release_unique_id
(
$file
,
$id
);
if
(
$mtr_unique_pid
==
$$
)
{
while
(
my
(
$id
,
$file
)
=
each
(
%
mtr_unique_assigned_ids
))
{
print
"
Autoreleasing
$file
:
$id
\n
";
mtr_release_unique_id
(
$file
,
$id
);
}
}
}
...
...
mysql-test/r/gis.result
View file @
f3f5eb5c
...
...
@@ -671,3 +671,9 @@ Catalog Database Table Table_alias Column Column_alias Type Length Max length Is
def asbinary(g) 252 8192 0 Y 128 0 63
asbinary(g)
drop table t1;
create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));
alter table t1 disable keys;
load data infile '../../std_data/bad_gis_data.dat' into table t1;
ERROR 01000: Data truncated; NULL supplied to NOT NULL column 'b' at row 1
alter table t1 enable keys;
drop table t1;
mysql-test/std_data/bad_gis_data.dat
0 → 100644
View file @
f3f5eb5c
foo
mysql-test/t/gis.test
View file @
f3f5eb5c
...
...
@@ -363,11 +363,18 @@ drop table t1;
select
(
asWKT
(
geomfromwkb
((
0x000000000140240000000000004024000000000000
))));
select
(
asWKT
(
geomfromwkb
((
0x010100000000000000000024400000000000002440
))));
# End of 4.1 tests
--
enable_metadata
create
table
t1
(
g
GEOMETRY
);
select
*
from
t1
;
select
asbinary
(
g
)
from
t1
;
--
disable_metadata
drop
table
t1
;
create
table
t1
(
a
TEXT
,
b
GEOMETRY
NOT
NULL
,
SPATIAL
KEY
(
b
));
alter
table
t1
disable
keys
;
--
error
1263
load
data
infile
'../../std_data/bad_gis_data.dat'
into
table
t1
;
alter
table
t1
enable
keys
;
drop
table
t1
;
# End of 4.1 tests
scripts/Makefile.am
View file @
f3f5eb5c
...
...
@@ -111,6 +111,7 @@ SUFFIXES = .sh
-e
's!@''pkglibdir''@!
$(pkglibdir)
!g'
\
-e
's!@''pkgincludedir''@!
$(pkgincludedir)
!g'
\
-e
's!@''pkgdatadir''@!
$(pkgdatadir)
!g'
\
-e
's!@''sysconfdir''@!
$(sysconfdir)
!g'
\
-e
's!@''CC''@!@CC@!'
\
-e
's!@''CXX''@!@CXX@!'
\
-e
's!@''GXX''@!@GXX@!'
\
...
...
scripts/mysqlaccess.sh
View file @
f3f5eb5c
...
...
@@ -462,8 +462,8 @@ MySQLaccess::Report::Print_Header();
if
(
-f
"./
$script_conf
"
)
{
require
"./
$script_conf
"
;
}
elsif
(
-f
"
/etc
/
$script_conf
"
)
{
require
"
/etc
/
$script_conf
"
;
elsif
(
-f
"
@sysconfdir@
/
$script_conf
"
)
{
require
"
@sysconfdir@
/
$script_conf
"
;
}
# ****************************
...
...
@@ -929,7 +929,7 @@ sub MergeConfigFile {
# =================================
sub MergeConfigFiles
{
my
(
$name
,
$pass
,
$uid
,
$gid
,
$quota
,
$comment
,
$gcos
,
$dir
,
$shell
)
=
getpwuid
$<
;
MergeConfigFile
(
"
/etc
/my.cnf"
)
;
MergeConfigFile
(
"
@sysconfdir@
/my.cnf"
)
;
MergeConfigFile
(
"
$dir
/.my.cnf"
)
;
}
...
...
scripts/mysqld_multi.sh
View file @
f3f5eb5c
...
...
@@ -429,9 +429,9 @@ sub find_groups
}
else
{
if (-f "
/etc/my.cnf
" && -r "
/etc
/my.cnf
")
if (-f "
@sysconfdir@/my.cnf
" && -r "
@sysconfdir@
/my.cnf
")
{
open(MY_CNF, "
<
/etc
/my.cnf
") && (@tmp=<MY_CNF>) && close(MY_CNF);
open(MY_CNF, "
<
@sysconfdir@
/my.cnf
") && (@tmp=<MY_CNF>) && close(MY_CNF);
}
for (
$i
= 0; (
$line
= shift @tmp);
$i
++)
{
...
...
@@ -658,7 +658,7 @@ sub example
# (as per Linux/Unix standard). You may even replace the
# /etc/init.d/mysql.server script with it.
#
# Before using, you must create a my.cnf file either in
/etc
/my.cnf
# Before using, you must create a my.cnf file either in
@sysconfdir@
/my.cnf
# or /root/.my.cnf and add the [mysqld_multi] and [mysqld#] groups.
#
# The script can be found from support-files/mysqld_multi.server.sh
...
...
sql/field.cc
View file @
f3f5eb5c
...
...
@@ -1137,10 +1137,11 @@ void Field_null::sql_type(String &res) const
This is an number stored as a pre-space (or pre-zero) string
****************************************************************************/
void
int
Field_decimal
::
reset
(
void
)
{
Field_decimal
::
store
(
"0"
,
1
,
&
my_charset_bin
);
return
0
;
}
void
Field_decimal
::
overflow
(
bool
negative
)
...
...
sql/field.h
View file @
f3f5eb5c
This diff is collapsed.
Click to expand it.
sql/sql_load.cc
View file @
f3f5eb5c
...
...
@@ -527,7 +527,12 @@ read_sep_field(THD *thd,COPY_INFO &info,TABLE *table,
(
enclosed_length
&&
length
==
4
&&
!
memcmp
(
pos
,
"NULL"
,
4
))
||
(
length
==
1
&&
read_info
.
found_null
))
{
field
->
reset
();
if
(
field
->
reset
())
{
my_error
(
ER_WARN_NULL_TO_NOTNULL
,
MYF
(
0
),
field
->
field_name
,
thd
->
row_count
);
DBUG_RETURN
(
1
);
}
field
->
set_null
();
if
(
!
field
->
maybe_null
())
{
...
...
@@ -560,7 +565,12 @@ read_sep_field(THD *thd,COPY_INFO &info,TABLE *table,
for
(;
sql_field
;
sql_field
=
(
Item_field
*
)
it
++
)
{
sql_field
->
field
->
set_null
();
sql_field
->
field
->
reset
();
if
(
sql_field
->
field
->
reset
())
{
my_error
(
ER_WARN_NULL_TO_NOTNULL
,
MYF
(
0
),
sql_field
->
field
->
field_name
,
thd
->
row_count
);
DBUG_RETURN
(
1
);
}
thd
->
cuted_fields
++
;
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_WARN_TOO_FEW_RECORDS
,
...
...
support-files/mysql.spec.sh
View file @
f3f5eb5c
...
...
@@ -549,6 +549,7 @@ fi
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/mysqlman.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/isamchk.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/isamlog.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/my_print_defaults.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/myisam_ftdump.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/myisamchk.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/myisamlog.1
*
...
...
@@ -560,6 +561,7 @@ fi
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/mysql_fix_privilege_tables.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/mysqlhotcopy.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/mysql.server.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/mysql_tzinfo_to_sql.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/mysql_zap.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/pack_isam.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/perror.1
*
...
...
@@ -724,6 +726,11 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
*
Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com>
- Include the new man pages
for
"my_print_defaults"
and
"mysql_tzinfo_to_sql"
in
the server RPM.
*
Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
- Explicitly note that the
"MySQL-shared"
RPMs
(
as built by MySQL AB
)
...
...
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