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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
b703338d
Commit
b703338d
authored
Dec 30, 2003
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge
sql/set_var.cc: Auto merged sql/mysqld.cc: SCCS merged
parents
376fb080
d9ada7c2
Changes
33
Hide whitespace changes
Inline
Side-by-side
Showing
33 changed files
with
65 additions
and
16 deletions
+65
-16
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
Build-tools/Do-rpm
Build-tools/Do-rpm
+1
-1
include/mysqld_error.h
include/mysqld_error.h
+2
-1
innobase/log/log0log.c
innobase/log/log0log.c
+12
-1
mysql-test/r/variables.result
mysql-test/r/variables.result
+4
-2
mysql-test/t/variables.test
mysql-test/t/variables.test
+5
-2
scripts/mysqld_safe.sh
scripts/mysqld_safe.sh
+9
-3
sql/mysqld.cc
sql/mysqld.cc
+1
-1
sql/set_var.cc
sql/set_var.cc
+2
-3
sql/share/czech/errmsg.txt
sql/share/czech/errmsg.txt
+1
-0
sql/share/danish/errmsg.txt
sql/share/danish/errmsg.txt
+1
-0
sql/share/dutch/errmsg.txt
sql/share/dutch/errmsg.txt
+1
-0
sql/share/english/errmsg.txt
sql/share/english/errmsg.txt
+1
-0
sql/share/estonian/errmsg.txt
sql/share/estonian/errmsg.txt
+1
-0
sql/share/french/errmsg.txt
sql/share/french/errmsg.txt
+1
-0
sql/share/german/errmsg.txt
sql/share/german/errmsg.txt
+1
-0
sql/share/greek/errmsg.txt
sql/share/greek/errmsg.txt
+1
-0
sql/share/hungarian/errmsg.txt
sql/share/hungarian/errmsg.txt
+1
-0
sql/share/italian/errmsg.txt
sql/share/italian/errmsg.txt
+1
-0
sql/share/japanese/errmsg.txt
sql/share/japanese/errmsg.txt
+1
-0
sql/share/korean/errmsg.txt
sql/share/korean/errmsg.txt
+1
-0
sql/share/norwegian-ny/errmsg.txt
sql/share/norwegian-ny/errmsg.txt
+1
-0
sql/share/norwegian/errmsg.txt
sql/share/norwegian/errmsg.txt
+1
-0
sql/share/polish/errmsg.txt
sql/share/polish/errmsg.txt
+1
-0
sql/share/portuguese/errmsg.txt
sql/share/portuguese/errmsg.txt
+1
-0
sql/share/romanian/errmsg.txt
sql/share/romanian/errmsg.txt
+1
-0
sql/share/russian/errmsg.txt
sql/share/russian/errmsg.txt
+1
-0
sql/share/slovak/errmsg.txt
sql/share/slovak/errmsg.txt
+1
-0
sql/share/spanish/errmsg.txt
sql/share/spanish/errmsg.txt
+1
-0
sql/share/swedish/errmsg.txt
sql/share/swedish/errmsg.txt
+1
-0
sql/share/ukrainian/errmsg.txt
sql/share/ukrainian/errmsg.txt
+1
-0
strings/ctype-big5.c
strings/ctype-big5.c
+1
-1
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+5
-1
No files found.
BitKeeper/etc/logging_ok
View file @
b703338d
...
...
@@ -9,6 +9,7 @@ akishkin@work.mysql.com
arjen@co3064164-a.bitbike.com
arjen@fred.bitbike.com
arjen@george.bitbike.com
bar@bar.intranet.mysql.r18.ru
bar@bar.mysql.r18.ru
bar@bar.udmsearch.izhnet.ru
bell@laptop.sanja.is.com.ua
...
...
Build-tools/Do-rpm
View file @
b703338d
...
...
@@ -188,7 +188,7 @@ $command.= basename($SPECFILE);
#
$command
=
"
mv
";
$command
.=
"
-v
"
if
(
$opt_verbose
);
$command
.=
"
$SRCRPMDIR
/MySQL*
$VERSION
*.src.rpm
$PWD
";
$command
.=
"
$SRCRPMDIR
/MySQL*
$VERSION
*.src.rpm
$PWD
";
&
logger
("
Moving source RPM to current dir.
");
&
run_command
(
$command
,
"
Error moving source RPM!
");
...
...
include/mysqld_error.h
View file @
b703338d
...
...
@@ -254,4 +254,5 @@
#define ER_NOT_SUPPORTED_YET 1235
#define ER_MASTER_FATAL_ERROR_READING_BINLOG 1236
#define ER_SLAVE_IGNORED_TABLE 1237
/* only the slave SQL thread can be sent this */
#define ER_ERROR_MESSAGES 238
#define ER_INCORRECT_GLOBAL_LOCAL_VAR 1238
#define ER_ERROR_MESSAGES 239
innobase/log/log0log.c
View file @
b703338d
...
...
@@ -661,7 +661,18 @@ failure:
if
(
!
success
)
{
fprintf
(
stderr
,
"InnoDB: Error: log file group too small for innodb_thread_concurrency
\n
"
);
"InnoDB: Error: ib_logfiles are too small for innodb_thread_concurrency %lu.
\n
"
"InnoDB: The combined size of ib_logfiles should be bigger than
\n
"
"InnoDB: 200 kB * innodb_thread_concurrency.
\n
"
"InnoDB: To get mysqld to start up, set innodb_thread_concurrency in my.cnf
\n
"
"InnoDB: to a lower value, for example, to 8. After an ERROR-FREE shutdown
\n
"
"InnoDB: of mysqld you can adjust the size of ib_logfiles, as explained in
\n
"
"InnoDB: section 5 of http://www.innodb.com/ibman.php"
,
(
ulong
)
srv_thread_concurrency
);
fprintf
(
stderr
,
"InnoDB: Cannot continue operation. Calling exit(1).
\n
"
);
exit
(
1
);
}
return
(
success
);
...
...
mysql-test/r/variables.result
View file @
b703338d
...
...
@@ -231,7 +231,7 @@ Wrong argument type to variable 'convert_character_set'
set global autocommit=1;
Variable 'autocommit' is a LOCAL variable and can't be used with SET GLOBAL
select @@global.timestamp;
Variable 'timestamp' is a LOCAL variable
and can't be used with SET GLOBAL
Variable 'timestamp' is a LOCAL variable
set @@version='';
Unknown system variable 'version'
set @@concurrent_insert=1;
...
...
@@ -239,7 +239,7 @@ Variable 'concurrent_insert' is a GLOBAL variable and should be set with SET GLO
set @@global.sql_auto_is_null=1;
Variable 'sql_auto_is_null' is a LOCAL variable and can't be used with SET GLOBAL
select @@global.sql_auto_is_null;
Variable 'sql_auto_is_null' is a LOCAL variable
and can't be used with SET GLOBAL
Variable 'sql_auto_is_null' is a LOCAL variable
set myisam_max_sort_file_size=100;
Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
set myisam_max_extra_sort_file_size=100;
...
...
@@ -375,3 +375,5 @@ Unknown system variable 'xxxxxxxxxx'
select 1;
1
1
select @@session.key_buffer_size;
Variable 'key_buffer_size' is a GLOBAL variable
mysql-test/t/variables.test
View file @
b703338d
...
...
@@ -139,7 +139,7 @@ set character set unknown;
set
character
set
0
;
--
error
1228
set
global
autocommit
=
1
;
--
error
12
2
8
--
error
12
3
8
select
@@
global
.
timestamp
;
--
error
1193
set
@@
version
=
''
;
...
...
@@ -147,7 +147,7 @@ set @@version='';
set
@@
concurrent_insert
=
1
;
--
error
1228
set
@@
global
.
sql_auto_is_null
=
1
;
--
error
12
2
8
--
error
12
3
8
select
@@
global
.
sql_auto_is_null
;
--
error
1229
set
myisam_max_sort_file_size
=
100
;
...
...
@@ -266,3 +266,6 @@ drop table t1,t2;
--
error
1193
select
@@
xxxxxxxxxx
;
select
1
;
--
error
1238
select
@@
session
.
key_buffer_size
;
\ No newline at end of file
scripts/mysqld_safe.sh
View file @
b703338d
...
...
@@ -46,8 +46,9 @@ parse_arguments() {
--user
=
*
)
if
test
$SET_USER
-eq
0
then
user
=
`
echo
"
$arg
"
|
sed
-e
"s;--[^=]*=;;"
`
;
SET_USER
=
1
user
=
`
echo
"
$arg
"
|
sed
-e
"s;--[^=]*=;;"
`
fi
SET_USER
=
1
;;
# these two might have been set in a [mysqld_safe] section of my.cnf
...
...
@@ -129,7 +130,6 @@ fi
# these rely on $DATADIR by default, so we'll set them later on
pid_file
=
err_log
=
SET_USER
=
0
# Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe]
# and then merge with the command line arguments
...
...
@@ -147,7 +147,13 @@ else
fi
args
=
parse_arguments
`
$print_defaults
--loose-verbose
$defaults
mysqld server mysqld_safe safe_mysqld
`
SET_USER
=
2
parse_arguments
`
$print_defaults
--loose-verbose
$defaults
mysqld server
`
if
test
$SET_USER
-eq
2
then
SET_USER
=
0
fi
parse_arguments
`
$print_defaults
--loose-verbose
$defaults
mysqld_safe safe_mysqld
`
parse_arguments PICK-ARGS-FROM-ARGV
"
$@
"
if
test
!
-x
$ledir
/
$MYSQLD
...
...
sql/mysqld.cc
View file @
b703338d
...
...
@@ -4969,7 +4969,7 @@ static void fix_paths(void)
set how many open files we want to be able to handle
SYNOPSIS
set_maximum_open_files()
set_maximum_open_files()
max_file_limit Files to open
NOTES
...
...
sql/set_var.cc
View file @
b703338d
...
...
@@ -1032,9 +1032,8 @@ Item *sys_var::item(THD *thd, enum_var_type var_type)
{
if
(
var_type
!=
OPT_DEFAULT
)
{
net_printf
(
&
thd
->
net
,
var_type
==
OPT_GLOBAL
?
ER_LOCAL_VARIABLE
:
ER_GLOBAL_VARIABLE
,
name
);
net_printf
(
&
thd
->
net
,
ER_INCORRECT_GLOBAL_LOCAL_VAR
,
name
,
var_type
==
OPT_GLOBAL
?
"LOCAL"
:
"GLOBAL"
);
return
0
;
}
/* As there was no local variable, return the global value */
...
...
sql/share/czech/errmsg.txt
View file @
b703338d
...
...
@@ -248,3 +248,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/danish/errmsg.txt
View file @
b703338d
...
...
@@ -242,3 +242,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/dutch/errmsg.txt
View file @
b703338d
...
...
@@ -250,3 +250,4 @@
"Deze versie van MySQL ondersteunt nog geen '%s'",
"Kreeg fatale fout %d: '%-.128s' van master tijdens lezen van data uit binaire log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/english/errmsg.txt
View file @
b703338d
...
...
@@ -239,3 +239,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/estonian/errmsg.txt
View file @
b703338d
...
...
@@ -244,3 +244,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/french/errmsg.txt
View file @
b703338d
...
...
@@ -239,3 +239,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/german/errmsg.txt
View file @
b703338d
...
...
@@ -242,3 +242,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/greek/errmsg.txt
View file @
b703338d
...
...
@@ -239,3 +239,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/hungarian/errmsg.txt
View file @
b703338d
...
...
@@ -241,3 +241,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/italian/errmsg.txt
View file @
b703338d
...
...
@@ -239,3 +239,4 @@
"Questa versione di MySQL non supporta ancora '%s'",
"Errore fatale %d: '%-.128s' dal master leggendo i dati dal log binario",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/japanese/errmsg.txt
View file @
b703338d
...
...
@@ -241,3 +241,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/korean/errmsg.txt
View file @
b703338d
...
...
@@ -239,3 +239,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/norwegian-ny/errmsg.txt
View file @
b703338d
...
...
@@ -241,3 +241,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/norwegian/errmsg.txt
View file @
b703338d
...
...
@@ -241,3 +241,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/polish/errmsg.txt
View file @
b703338d
...
...
@@ -243,3 +243,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/portuguese/errmsg.txt
View file @
b703338d
...
...
@@ -239,3 +239,4 @@
"Esta versão de MySQL não suporta ainda '%s'",
"Obteve fatal erro %d: '%-.128s' do master quando lendo dados do binary log",
"Slave SQL thread ignorado a consulta devido às normas de replicação-*-tabela"
"Variable '%-.64s' is a %s variable"
sql/share/romanian/errmsg.txt
View file @
b703338d
...
...
@@ -243,3 +243,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/russian/errmsg.txt
View file @
b703338d
...
...
@@ -241,3 +241,4 @@
" MySQL '%s'",
" %d: '%-.128s' ",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/slovak/errmsg.txt
View file @
b703338d
...
...
@@ -247,3 +247,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/spanish/errmsg.txt
View file @
b703338d
...
...
@@ -240,3 +240,4 @@
"Esta versión de MySQL no soporta todavia '%s'",
"Recibió fatal error %d: '%-.128s' del master cuando leyendo datos del binary log",
"Slave SQL thread ignorado el query debido a las reglas de replicación-*-tabla"
"Variable '%-.64s' is a %s variable"
sql/share/swedish/errmsg.txt
View file @
b703338d
...
...
@@ -239,3 +239,4 @@
"Denna version av MySQL kan ännu inte utföra '%s'",
"Fick fatalt fel %d: '%-.128s' från master vid läsning av binärloggen"
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
sql/share/ukrainian/errmsg.txt
View file @
b703338d
...
...
@@ -244,3 +244,4 @@
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Slave SQL thread ignored the query because of replicate-*-table rules"
"Variable '%-.64s' is a %s variable"
strings/ctype-big5.c
View file @
b703338d
...
...
@@ -356,7 +356,7 @@ my_bool my_like_range_big5(const char *ptr,uint ptr_length,pchar escape,
*
min_length
=
(
uint
)
(
min_str
-
min_org
);
*
max_length
=
res_length
;
do
{
*
min_str
++
=
'
\0
'
;
/* Because if key compression */
*
min_str
++
=
'
'
;
/* Because if key compression */
*
max_str
++
=
max_sort_char
;
}
while
(
min_str
!=
min_end
);
return
0
;
...
...
support-files/mysql.spec.sh
View file @
b703338d
...
...
@@ -493,7 +493,7 @@ fi
%attr
(
755, root, root
)
%
{
_sbindir
}
/rcmysql
%attr
(
644, root, root
)
%
{
_libdir
}
/mysql/mysqld.sym
%attr
(
644, root, root
)
%
{
_sysconfdir
}
/logrotate.d/mysql
%attr
(
644, root, root
)
%
config
(
noreplace,missingok
)
%
{
_sysconfdir
}
/logrotate.d/mysql
%attr
(
755, root, root
)
%
{
_sysconfdir
}
/init.d/mysql
%attr
(
755, root, root
)
%
{
_datadir
}
/mysql/
...
...
@@ -572,6 +572,10 @@ fi
# The spec file changelog only includes changes made to the spec file
# itself
%changelog
*
Mon Dec 22 2003 Lenz Grimmer <lenz@mysql.com>
- marked /etc/logrotate.d/mysql as a config file
(
BUG 2156
)
*
Fri Dec 13 2003 Lenz Grimmer <lenz@mysql.com>
- fixed file permissions
(
BUG 1672
)
...
...
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