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
894f6bcf
Commit
894f6bcf
authored
Mar 16, 2002
by
paul@teton.kitebird.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0
parents
6c3cc6cd
9a6cd145
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
6 deletions
+13
-6
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
Docs/Support/colspec-fix.pl
Docs/Support/colspec-fix.pl
+4
-2
sql/sql_class.h
sql/sql_class.h
+4
-1
sql/table.h
sql/table.h
+4
-3
No files found.
BitKeeper/etc/logging_ok
View file @
894f6bcf
...
@@ -48,3 +48,4 @@ venu@work.mysql.com
...
@@ -48,3 +48,4 @@ venu@work.mysql.com
zak@linux.local
zak@linux.local
jcole@mugatu.spaceapes.com
jcole@mugatu.spaceapes.com
arjen@fred.bitbike.com
arjen@fred.bitbike.com
zak@balfor.local
Docs/Support/colspec-fix.pl
View file @
894f6bcf
...
@@ -29,6 +29,7 @@ sub msg {
...
@@ -29,6 +29,7 @@ sub msg {
sub
rel2abs
{
sub
rel2abs
{
my
$str
=
shift
;
my
$str
=
shift
;
my
$colnum
=
1
;
my
@widths
=
();
my
@widths
=
();
my
$total
=
0
;
my
$total
=
0
;
...
@@ -45,7 +46,8 @@ sub rel2abs {
...
@@ -45,7 +46,8 @@ sub rel2abs {
my
$unit
=
(
$table_width
-
(
$#widths
*
$gutter_width
))
/
(
$total
);
my
$unit
=
(
$table_width
-
(
$#widths
*
$gutter_width
))
/
(
$total
);
foreach
(
@widths
)
{
foreach
(
@widths
)
{
$output
.=
$ws
.
'
<colspec colwidth="
'
.
sprintf
("
%0.2f
",
$_
*
$unit
)
.
'
cm" />
'
.
"
\n
";
$output
.=
$ws
.
'
<colspec colnum="
'
.
$colnum
.
'
" colwidth="
'
.
sprintf
("
%0.2f
",
$_
*
$unit
)
.
'
cm" />
'
.
"
\n
";
++
$colnum
;
}
}
return
$output
.
"
\n
$ws
";
return
$output
.
"
\n
$ws
";
...
...
sql/sql_class.h
View file @
894f6bcf
...
@@ -492,7 +492,10 @@ public:
...
@@ -492,7 +492,10 @@ public:
CHANGED_TABLE_LIST
*
changed_table_dup
(
TABLE
*
table
);
CHANGED_TABLE_LIST
*
changed_table_dup
(
TABLE
*
table
);
};
};
/*
Used to hold information about file and file structure in exchainge
via non-DB file (...INTO OUTFILE..., ...LOAD DATA...)
*/
class
sql_exchange
:
public
Sql_alloc
class
sql_exchange
:
public
Sql_alloc
{
{
public:
public:
...
...
sql/table.h
View file @
894f6bcf
...
@@ -112,7 +112,7 @@ struct st_table {
...
@@ -112,7 +112,7 @@ struct st_table {
char
*
table_name
,
*
real_name
,
*
path
;
char
*
table_name
,
*
real_name
,
*
path
;
uint
key_length
;
/* Length of key */
uint
key_length
;
/* Length of key */
uint
tablenr
,
used_fields
,
null_bytes
;
uint
tablenr
,
used_fields
,
null_bytes
;
table_map
map
;
table_map
map
;
/* ID bit of table (1,2,4,8,16...) */
ulong
version
,
flush_version
;
ulong
version
,
flush_version
;
uchar
*
null_flags
;
uchar
*
null_flags
;
IO_CACHE
*
io_cache
;
/* If sorted trough file*/
IO_CACHE
*
io_cache
;
/* If sorted trough file*/
...
@@ -141,6 +141,7 @@ typedef struct st_table_list {
...
@@ -141,6 +141,7 @@ typedef struct st_table_list {
uint32
db_length
,
real_name_length
;
uint32
db_length
,
real_name_length
;
Item
*
on_expr
;
/* Used with outer join */
Item
*
on_expr
;
/* Used with outer join */
struct
st_table_list
*
natural_join
;
/* natural join on this table*/
struct
st_table_list
*
natural_join
;
/* natural join on this table*/
/* ... join ... USE INDEX ... IGNORE INDEX */
List
<
String
>
*
use_index
,
*
ignore_index
;
List
<
String
>
*
use_index
,
*
ignore_index
;
TABLE
*
table
;
TABLE
*
table
;
GRANT_INFO
grant
;
GRANT_INFO
grant
;
...
...
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