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
532a6f22
Commit
532a6f22
authored
Nov 02, 2003
by
bell@sanja.is.com.ua
Browse files
Options
Browse Files
Download
Plain Diff
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-like-4.1
parents
e32a1c92
f66d0744
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
36 additions
and
17 deletions
+36
-17
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
mysql-test/Makefile.am
mysql-test/Makefile.am
+1
-0
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+4
-2
sql/derror.cc
sql/derror.cc
+1
-0
sql/mysql_priv.h
sql/mysql_priv.h
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+1
-1
sql/sql_bitmap.h
sql/sql_bitmap.h
+22
-10
sql/sql_class.cc
sql/sql_class.cc
+2
-0
sql/sql_test.cc
sql/sql_test.cc
+3
-3
No files found.
BitKeeper/etc/logging_ok
View file @
532a6f22
...
@@ -75,6 +75,7 @@ monty@hundin.mysql.fi
...
@@ -75,6 +75,7 @@ monty@hundin.mysql.fi
monty@mashka.(none)
monty@mashka.(none)
monty@mashka.mysql.fi
monty@mashka.mysql.fi
monty@mishka.mysql.fi
monty@mishka.mysql.fi
monty@mysql.com
monty@narttu.
monty@narttu.
monty@narttu.mysql.fi
monty@narttu.mysql.fi
monty@rescue.
monty@rescue.
...
...
mysql-test/Makefile.am
View file @
532a6f22
...
@@ -73,6 +73,7 @@ SUFFIXES = .sh
...
@@ -73,6 +73,7 @@ SUFFIXES = .sh
-e
's!@''PERL''@!@PERL@!'
\
-e
's!@''PERL''@!@PERL@!'
\
-e
's!@''VERSION''@!@VERSION@!'
\
-e
's!@''VERSION''@!@VERSION@!'
\
-e
's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!'
\
-e
's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!'
\
-e
's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!'
\
-e
's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!'
\
-e
's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!'
\
-e
's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!'
\
-e
's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!'
\
$<
>
$@
-t
$<
>
$@
-t
...
...
mysql-test/mysql-test-run.sh
View file @
532a6f22
...
@@ -15,6 +15,7 @@ VERBOSE=""
...
@@ -15,6 +15,7 @@ VERBOSE=""
USE_MANAGER
=
0
USE_MANAGER
=
0
MY_TZ
=
GMT-3
MY_TZ
=
GMT-3
TZ
=
$MY_TZ
;
export
TZ
# for UNIX_TIMESTAMP tests to work
TZ
=
$MY_TZ
;
export
TZ
# for UNIX_TIMESTAMP tests to work
LOCAL_SOCKET
=
@MYSQL_UNIX_ADDR@
# For query_cache test
# For query_cache test
ulimit
-n
1024
ulimit
-n
1024
...
@@ -256,6 +257,7 @@ while test $# -gt 0; do
...
@@ -256,6 +257,7 @@ while test $# -gt 0; do
--start-and-exit
)
--start-and-exit
)
START_AND_EXIT
=
1
START_AND_EXIT
=
1
;;
;;
--socket
=
*
)
LOCAL_SOCKET
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--socket=;;"
`
;;
--skip-rpl
)
NO_SLAVE
=
1
;;
--skip-rpl
)
NO_SLAVE
=
1
;;
--skip-test
=
*
)
SKIP_TEST
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--skip-test=;;"
`
;;
--skip-test
=
*
)
SKIP_TEST
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--skip-test=;;"
`
;;
--do-test
=
*
)
DO_TEST
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--do-test=;;"
`
;;
--do-test
=
*
)
DO_TEST
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--do-test=;;"
`
;;
...
@@ -501,7 +503,7 @@ then
...
@@ -501,7 +503,7 @@ then
fi
fi
if
[
-n
"
$USE_RUNNING_SERVER
"
]
if
[
-n
"
$USE_RUNNING_SERVER
"
]
then
then
MASTER_MYSOCK
=
"/tmp/mysql.sock"
MASTER_MYSOCK
=
$LOCAL_SOCKET
;
DBUSER
=
${
DBUSER
:-
test
}
DBUSER
=
${
DBUSER
:-
test
}
else
else
DBUSER
=
${
DBUSER
:-
root
}
# We want to do FLUSH xxx commands
DBUSER
=
${
DBUSER
:-
root
}
# We want to do FLUSH xxx commands
...
...
sql/derror.cc
View file @
532a6f22
...
@@ -136,6 +136,7 @@ err1:
...
@@ -136,6 +136,7 @@ err1:
if
(
file
!=
FERR
)
if
(
file
!=
FERR
)
VOID
(
my_close
(
file
,
MYF
(
MY_WME
)));
VOID
(
my_close
(
file
,
MYF
(
MY_WME
)));
unireg_abort
(
1
);
unireg_abort
(
1
);
return
1
;
}
/* read_texts */
}
/* read_texts */
...
...
sql/mysql_priv.h
View file @
532a6f22
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <my_global.h>
#include <my_global.h>
#include <assert.h>
#include <mysql_version.h>
#include <mysql_version.h>
#include <mysql_embed.h>
#include <mysql_embed.h>
#include <my_sys.h>
#include <my_sys.h>
...
@@ -24,7 +25,6 @@
...
@@ -24,7 +25,6 @@
#include <thr_lock.h>
#include <thr_lock.h>
#include <my_base.h>
/* Needed by field.h */
#include <my_base.h>
/* Needed by field.h */
#include <sql_bitmap.h>
#include <sql_bitmap.h>
#include <assert.h>
#ifdef __EMX__
#ifdef __EMX__
#undef write
/* remove pthread.h macro definition for EMX */
#undef write
/* remove pthread.h macro definition for EMX */
...
...
sql/mysqld.cc
View file @
532a6f22
...
@@ -1884,7 +1884,7 @@ extern "C" int my_message_sql(uint error, const char *str,
...
@@ -1884,7 +1884,7 @@ extern "C" int my_message_sql(uint error, const char *str,
if
((
thd
=
current_thd
))
if
((
thd
=
current_thd
))
{
{
/*
/*
thd->lex.current_select
equel to zero
if lex structure is not inited
thd->lex.current_select
== 0
if lex structure is not inited
(not query command (COM_QUERY))
(not query command (COM_QUERY))
*/
*/
if
(
thd
->
lex
.
current_select
&&
if
(
thd
->
lex
.
current_select
&&
...
...
sql/sql_bitmap.h
View file @
532a6f22
#include <my_global.h>
/* Copyright (C) 2003 MySQL AB
//#include <mysql_version.h>
//#include <mysql_embed.h>
This program is free software; you can redistribute it and/or modify
//#include <my_sys.h>
it under the terms of the GNU General Public License as published by
//#include <m_string.h>
the Free Software Foundation; either version 2 of the License, or
//#include <hash.h>
(at your option) any later version.
//#include <signal.h>
//#include <thr_lock.h>
This program is distributed in the hope that it will be useful,
//#include <my_base.h>
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
Implementation of a bitmap type.
The idea with this is to be able to handle any constant number of bits but
also be able to use 32 or 64 bits bitmaps very efficiently
*/
#include <my_bitmap.h>
#include <my_bitmap.h>
#include <assert.h>
template
<
uint
default_width
>
class
Bitmap
template
<
uint
default_width
>
class
Bitmap
{
{
...
...
sql/sql_class.cc
View file @
532a6f22
...
@@ -102,6 +102,8 @@ THD::THD():user_time(0), is_fatal_error(0),
...
@@ -102,6 +102,8 @@ THD::THD():user_time(0), is_fatal_error(0),
lock
=
locked_tables
=
0
;
lock
=
locked_tables
=
0
;
used_tables
=
0
;
used_tables
=
0
;
cuted_fields
=
sent_row_count
=
current_stmt_id
=
0L
;
cuted_fields
=
sent_row_count
=
current_stmt_id
=
0L
;
// Must be reset to handle error with THD's created for init of mysqld
lex
.
current_select
=
0
;
start_time
=
(
time_t
)
0
;
start_time
=
(
time_t
)
0
;
current_linfo
=
0
;
current_linfo
=
0
;
slave_thread
=
0
;
slave_thread
=
0
;
...
...
sql/sql_test.cc
View file @
532a6f22
...
@@ -164,11 +164,11 @@ TEST_join(JOIN *join)
...
@@ -164,11 +164,11 @@ TEST_join(JOIN *join)
{
{
JOIN_TAB
*
tab
=
join
->
join_tab
+
i
;
JOIN_TAB
*
tab
=
join
->
join_tab
+
i
;
TABLE
*
form
=
tab
->
table
;
TABLE
*
form
=
tab
->
table
;
fprintf
(
DBUG_FILE
,
char
key_map_buff
[
128
];
"%-16.16s type: %-7s q_keys: %4lld
refs: %d key: %d len: %d
\n
"
,
fprintf
(
DBUG_FILE
,
"%-16.16s type: %-7s q_keys: %s
refs: %d key: %d len: %d
\n
"
,
form
->
table_name
,
form
->
table_name
,
join_type_str
[
tab
->
type
],
join_type_str
[
tab
->
type
],
tab
->
keys
.
to_ulonglong
(
),
tab
->
keys
.
print
(
key_map_buff
),
tab
->
ref
.
key_parts
,
tab
->
ref
.
key_parts
,
tab
->
ref
.
key
,
tab
->
ref
.
key
,
tab
->
ref
.
key_length
);
tab
->
ref
.
key_length
);
...
...
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