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
30016518
Commit
30016518
authored
Mar 22, 2002
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
parents
07e15416
51076279
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
102 additions
and
26 deletions
+102
-26
Docs/manual.texi
Docs/manual.texi
+9
-0
client/mysql.cc
client/mysql.cc
+0
-11
client/mysqldump.c
client/mysqldump.c
+8
-2
configure.in
configure.in
+5
-3
mysql-test/t/range.test
mysql-test/t/range.test
+62
-0
sql/lock.cc
sql/lock.cc
+7
-0
sql/log_event.h
sql/log_event.h
+3
-2
sql/sql_base.cc
sql/sql_base.cc
+1
-0
sql/sql_load.cc
sql/sql_load.cc
+2
-3
sql/sql_rename.cc
sql/sql_rename.cc
+5
-5
No files found.
Docs/manual.texi
View file @
30016518
...
...
@@ -46897,6 +46897,15 @@ not yet 100% confident in this code.
@appendixsubsec Changes in release 3.23.50
@itemize @bullet
@item
Fixed core-dump bug when using @code{--log-bin} with @code{LOAD DATA
INFILE} without an active database.
@item
Fixed bug in @code{RENAME TABLE} when used with
@code{lower_case_table_names=1} (default on Windows).
@item
Fixed unlikely core-dump bug when using @code{DROP TABLE} on a table
that was in use by a thread that also used queries on only temporary tables.
@item
Fixed problem with @code{SHOW CREATE TABLE} and @code{PRIMARY KEY} when using
32 indexes.
@item
client/mysql.cc
View file @
30016518
...
...
@@ -764,17 +764,6 @@ static int get_options(int argc, char **argv)
return
(
0
);
}
#if defined(OS2)
static
char
*
readline
(
char
*
prompt
)
{
#if defined(OS2)
static
char
linebuffer
[
254
];
#endif
puts
(
prompt
);
return
gets
(
linebuffer
);
}
#endif
static
int
read_lines
(
bool
execute_commands
)
{
#if defined( __WIN__) || defined(OS2)
...
...
client/mysqldump.c
View file @
30016518
...
...
@@ -35,7 +35,7 @@
** and adapted to mysqldump 05/11/01 by Jani Tolonen
*/
#define DUMP_VERSION "8.2
1
"
#define DUMP_VERSION "8.2
2
"
#include <my_global.h>
#include <my_sys.h>
...
...
@@ -651,7 +651,7 @@ static uint getTableStructure(char *table, char* db)
/* Make an sql-file, if path was given iow. option -T was given */
char
buff
[
20
+
FN_REFLEN
];
sprintf
(
buff
,
"show create table
%s
"
,
table_name
);
sprintf
(
buff
,
"show create table
`%s`
"
,
table_name
);
if
(
mysql_query
(
sock
,
buff
))
{
fprintf
(
stderr
,
"%s: Can't get CREATE TABLE for table '%s' (%s)
\n
"
,
...
...
@@ -1074,6 +1074,9 @@ static void dumpTable(uint numFields, char *table)
fputs
(
insert_pat
,
md_result_file
);
mysql_field_seek
(
res
,
0
);
if
(
opt_xml
)
fprintf
(
md_result_file
,
"
\t
<row>
\n
"
);
for
(
i
=
0
;
i
<
mysql_num_fields
(
res
);
i
++
)
{
if
(
!
(
field
=
mysql_fetch_field
(
res
)))
...
...
@@ -1163,6 +1166,9 @@ static void dumpTable(uint numFields, char *table)
}
}
if
(
opt_xml
)
fprintf
(
md_result_file
,
"
\t
</row>
\n
"
);
if
(
extended_insert
)
{
ulong
row_length
;
...
...
configure.in
View file @
30016518
...
...
@@ -647,9 +647,11 @@ AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
#--------------------------------------------------------------------
AC_CHECK_LIB
(
m, floor,
[]
, AC_CHECK_LIB
(
m, __infinity
))
AC_CHECK_FUNC
(
gethostbyname_r,
[]
,
[
AC_CHECK_LIB
(
nsl_r, gethostbyname_r,
[]
,
AC_CHECK_LIB
(
nsl, gethostbyname_r
))])
AC_CHECK_LIB
(
nsl_r, gethostbyname_r,
[]
,
AC_CHECK_LIB
(
nsl, gethostbyname_r
))
AC_CHECK_FUNC
(
gethostbyname_r
)
AC_CHECK_FUNC
(
setsockopt, , AC_CHECK_LIB
(
socket, setsockopt
))
AC_CHECK_FUNC
(
yp_get_default_domain, ,
AC_CHECK_LIB
(
nsl, yp_get_default_domain
))
...
...
mysql-test/t/range.test
View file @
30016518
...
...
@@ -100,3 +100,65 @@ alter table t1 drop key aString;
select
*
from
t1
where
aString
<
"believe in myself"
order
by
aString
;
select
*
from
t1
where
aString
>
"believe in love"
order
by
aString
;
drop
table
t1
;
#
# Problem with binary strings
#
DROP
TABLE
IF
EXISTS
t1
;
CREATE
TABLE
t1
(
t1ID
int
(
10
)
unsigned
NOT
NULL
auto_increment
,
art
char
(
1
)
binary
NOT
NULL
default
''
,
KNR
char
(
5
)
NOT
NULL
default
''
,
RECHNR
char
(
6
)
NOT
NULL
default
''
,
POSNR
char
(
2
)
NOT
NULL
default
''
,
ARTNR
char
(
10
)
NOT
NULL
default
''
,
TEX
char
(
70
)
NOT
NULL
default
''
,
PRIMARY
KEY
(
t1ID
),
KEY
IdxArt
(
art
),
KEY
IdxKnr
(
KNR
),
KEY
IdxArtnr
(
ARTNR
)
)
TYPE
=
MyISAM
;
INSERT
INTO
t1
(
art
)
VALUES
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),(
'j'
),(
'J'
),
(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),
(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),
(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),
(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),
(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),
(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),
(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),
(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),
(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),
(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),
(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
),(
'j'
);
select
count
(
*
)
from
t1
where
upper
(
art
)
=
'J'
;
select
count
(
*
)
from
t1
where
art
=
'J'
or
art
=
'j'
;
select
count
(
*
)
from
t1
where
art
=
'j'
or
art
=
'J'
;
drop
table
t1
;
sql/lock.cc
View file @
30016518
...
...
@@ -108,6 +108,13 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd,TABLE **tables,uint count)
thd
->
locked
=
0
;
break
;
}
else
if
(
!
thd
->
open_tables
)
{
// Only using temporary tables, no need to unlock
thd
->
some_tables_deleted
=
0
;
thd
->
locked
=
0
;
break
;
}
/* some table was altered or deleted. reopen tables marked deleted */
mysql_unlock_tables
(
thd
,
sql_lock
);
...
...
sql/log_event.h
View file @
30016518
...
...
@@ -229,12 +229,13 @@ public:
THD
*
thd
;
String
field_lens_buf
;
String
fields_buf
;
Load_log_event
(
THD
*
thd
,
sql_exchange
*
ex
,
const
char
*
table_name_arg
,
Load_log_event
(
THD
*
thd
,
sql_exchange
*
ex
,
const
char
*
db_arg
,
const
char
*
table_name_arg
,
List
<
Item
>&
fields_arg
,
enum
enum_duplicates
handle_dup
)
:
Log_event
(
thd
->
start_time
),
data_buf
(
0
),
thread_id
(
thd
->
thread_id
),
num_fields
(
0
),
fields
(
0
),
field_lens
(
0
),
field_block_len
(
0
),
table_name
(
table_name_arg
),
db
(
thd
->
db
),
db
(
db_arg
),
fname
(
ex
->
file_name
),
thd
(
thd
)
{
...
...
sql/sql_base.cc
View file @
30016518
...
...
@@ -464,6 +464,7 @@ void close_thread_tables(THD *thd, bool locked)
unused_tables
=
table
->
next
=
table
->
prev
=
table
;
}
}
thd
->
some_tables_deleted
=
0
;
thd
->
open_tables
=
0
;
/* Free tables to hold down open files */
while
(
open_cache
.
records
>
table_cache_size
&&
unused_tables
)
...
...
sql/sql_load.cc
View file @
30016518
...
...
@@ -72,7 +72,6 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
*
enclosed
=
ex
->
enclosed
;
bool
is_fifo
=
0
;
bool
using_transactions
;
DBUG_ENTER
(
"mysql_load"
);
if
(
escaped
->
length
()
>
1
||
enclosed
->
length
()
>
1
)
...
...
@@ -260,8 +259,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
if
(
!
read_file_from_client
&&
mysql_bin_log
.
is_open
())
{
ex
->
skip_lines
=
save_skip_lines
;
Load_log_event
qinfo
(
thd
,
ex
,
table
->
table_
name
,
fields
,
handle_duplicates
);
Load_log_event
qinfo
(
thd
,
ex
,
table
->
table_
cache_key
,
table
->
table_name
,
fields
,
handle_duplicates
);
mysql_bin_log
.
write
(
&
qinfo
);
}
if
(
using_transactions
)
...
...
sql/sql_rename.cc
View file @
30016518
...
...
@@ -129,7 +129,7 @@ rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error)
new_table
=
ren_table
->
next
;
sprintf
(
name
,
"%s/%s/%s%s"
,
mysql_data_home
,
new_table
->
db
,
new_table
->
name
,
new_table
->
db
,
new_table
->
real_
name
,
reg_ext
);
if
(
!
access
(
name
,
F_OK
))
{
...
...
@@ -137,7 +137,7 @@ rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error)
return
ren_table
;
// This can't be skipped
}
sprintf
(
name
,
"%s/%s/%s%s"
,
mysql_data_home
,
ren_table
->
db
,
ren_table
->
name
,
ren_table
->
db
,
ren_table
->
real_
name
,
reg_ext
);
if
((
table_type
=
get_table_type
(
name
))
==
DB_TYPE_UNKNOWN
)
{
...
...
@@ -146,11 +146,11 @@ rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error)
return
ren_table
;
}
else
if
(
mysql_rename_table
(
table_type
,
ren_table
->
db
,
ren_table
->
name
,
new_table
->
db
,
new_table
->
name
))
ren_table
->
db
,
ren_table
->
real_
name
,
new_table
->
db
,
new_table
->
real_
name
))
{
if
(
!
skip_error
)
return
ren_table
;
DBUG_RETURN
(
ren_table
)
;
}
}
DBUG_RETURN
(
0
);
...
...
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