Below is the list of changes that have just been committed into a local
4.0 repository of prem. When prem does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2139 05/08/22 19:25:50 pkarthick@stripped[prem] +11 -0
mysql40_autoclose.patch
myisam/myisampack.c
1.36 05/08/22 15:23:41 pkarthick@stripped[prem] +10 -1
Import patch mysql40_autoclose.patch
myisam/myisamchk.c
1.116 05/08/22 15:23:41 pkarthick@stripped[prem] +11 -1
Import patch mysql40_autoclose.patch
isam/isamchk.c
1.25 05/08/22 15:23:41 pkarthick@stripped[prem] +10 -1
Import patch mysql40_autoclose.patch
client/mysqlshow.c
1.30 05/08/22 15:23:41 pkarthick@stripped[prem] +9 -0
Import patch mysql40_autoclose.patch
client/mysqlimport.c
1.36 05/08/22 15:23:41 pkarthick@stripped[prem] +9 -0
Import patch mysql40_autoclose.patch
client/mysqldump.c
1.119 05/08/22 15:23:41 pkarthick@stripped[prem] +9 -0
Import patch mysql40_autoclose.patch
client/mysqlcheck.c
1.32 05/08/22 15:23:41 pkarthick@stripped[prem] +9 -0
Import patch mysql40_autoclose.patch
client/mysqlbinlog.cc
1.104 05/08/22 15:23:41 pkarthick@stripped[prem] +9 -0
Import patch mysql40_autoclose.patch
client/mysqladmin.c
1.78 05/08/22 15:23:41 pkarthick@stripped[prem] +9 -0
Import patch mysql40_autoclose.patch
client/mysql.cc
1.160 05/08/22 15:23:41 pkarthick@stripped[prem] +9 -0
Import patch mysql40_autoclose.patch
client/client_priv.h
1.19 05/08/22 15:23:41 pkarthick@stripped[prem] +1 -0
Import patch mysql40_autoclose.patch
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: pkarthick
# Host: blr-naas-nwl04.blr.novell.com
# Root: /home/prem/bk/mysql-4.0
--- 1.159/client/mysql.cc 2004-09-13 12:43:08 +05:30
+++ 1.160/client/mysql.cc 2005-08-22 15:23:41 +05:30
@@ -455,6 +455,10 @@
{"default-character-set", OPT_DEFAULT_CHARSET,
"Set the default character set.", (gptr*) &default_charset,
(gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef __NETWARE__
+ {"autoclose", OPT_AUTOCLOSE, "Auto close the screen on exit for NetWare.", 0, 0, 0, GET_NO_ARG,
+ NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
{"compress", 'C', "Use compression in server/client protocol.",
(gptr*) &opt_compress, (gptr*) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
0, 0, 0},
@@ -620,6 +624,11 @@
char *argument)
{
switch(optid) {
+ case OPT_AUTOCLOSE:
+#ifdef __NETWARE__
+ setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+#endif
+ break;
case OPT_CHARSETS_DIR:
strmov(mysql_charsets_dir, argument);
charsets_dir = mysql_charsets_dir;
--- 1.77/client/mysqladmin.c 2004-11-24 19:54:21 +05:30
+++ 1.78/client/mysqladmin.c 2005-08-22 15:23:41 +05:30
@@ -106,6 +106,10 @@
static struct my_option my_long_options[] =
{
+ #ifdef __NETWARE__
+ {"autoclose", 'a', " Auto close the screen on exit for NetWare.", 0, 0, 0, GET_NO_ARG,
+ NO_ARG, 0, 0, 0, 0, 0, 0},
+ #endif
{"count", 'c',
"Number of iterations to make. This works with -i (--sleep) only",
(gptr*) &nr_iterations, (gptr*) &nr_iterations, 0, GET_UINT,
@@ -184,6 +188,11 @@
int error = 0;
switch(optid) {
+ case 'a':
+#ifdef __NETWARE__
+ setscreenmode(SCR_AUTOCLOSE_ON_EXIT); // auto close the screen /
+#endif
+ break;
case 'c':
opt_count_iterations= 1;
break;
--- 1.118/client/mysqldump.c 2004-11-09 22:33:00 +05:30
+++ 1.119/client/mysqldump.c 2005-08-22 15:23:41 +05:30
@@ -114,6 +114,10 @@
{"character-sets-dir", OPT_CHARSETS_DIR,
"Directory where character sets are", (gptr*) &charsets_dir,
(gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef __NETWARE__
+ {"autoclose", OPT_AUTOCLOSE, "Auto close the screen on exit for NetWare.", 0, 0, 0, GET_NO_ARG,
+ NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
{"comments", 'i', "Write additional information.",
(gptr*) &opt_comments, (gptr*) &opt_comments, 0, GET_BOOL, NO_ARG,
1, 0, 0, 0, 0, 0},
@@ -346,6 +350,11 @@
char *argument)
{
switch (optid) {
+ case OPT_AUTOCLOSE:
+#ifdef __NETWARE__
+ setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+#endif
+ break;
case OPT_MASTER_DATA:
opt_master_data=1;
opt_first_slave=1;
--- 1.35/client/mysqlimport.c 2004-10-04 23:31:32 +05:30
+++ 1.36/client/mysqlimport.c 2005-08-22 15:23:41 +05:30
@@ -57,6 +57,10 @@
{"default-character-set", OPT_DEFAULT_CHARSET,
"Set the default character set.", (gptr*) &default_charset,
(gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef __NETWARE__
+ {"autoclose", OPT_AUTOCLOSE, "Auto close the screen on exit for NetWare.", 0, 0, 0, GET_NO_ARG,
+ NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
{"columns", 'c',
"Use only these columns to import the data to. Give the column names in a comma separated list. This is same as giving columns to LOAD DATA INFILE.",
(gptr*) &opt_columns, (gptr*) &opt_columns, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,
@@ -169,6 +173,11 @@
char *argument)
{
switch(optid) {
+ case OPT_AUTOCLOSE:
+#ifdef __NETWARE__
+ setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+#endif
+ break;
case 'p':
if (argument)
{
--- 1.29/client/mysqlshow.c 2004-08-31 21:57:55 +05:30
+++ 1.30/client/mysqlshow.c 2005-08-22 15:23:41 +05:30
@@ -178,6 +178,10 @@
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef __NETWARE__
+ {"autoclose", OPT_AUTOCLOSE, "Auto close the screen on exit for NetWare.", 0, 0, 0, GET_NO_ARG,
+ NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
};
@@ -218,6 +222,11 @@
char *argument)
{
switch(optid) {
+ case OPT_AUTOCLOSE:
+#ifdef __NETWARE__
+ setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+#endif
+ break;
case 'v':
opt_verbose++;
break;
--- 1.24/isam/isamchk.c 2004-08-31 21:57:56 +05:30
+++ 1.25/isam/isamchk.c 2005-08-22 15:23:41 +05:30
@@ -97,7 +97,7 @@
enum ic_options {OPT_CHARSETS_DIR_IC=256, OPT_KEY_BUFFER_SIZE,
OPT_READ_BUFFER_SIZE, OPT_WRITE_BUFFER_SIZE,
OPT_SORT_BUFFER_SIZE, OPT_SORT_KEY_BLOCKS,
- OPT_DECODE_BITS};
+ OPT_DECODE_BITS, OPT_AUTOCLOSE};
static ulong use_buffers=0,read_buffer_length=0,write_buffer_length=0,
sort_buffer_length=0,sort_key_blocks=0,crc=0,unique_count=0;
@@ -330,6 +330,10 @@
{"decode_bits", OPT_DECODE_BITS, "",
(gptr*) &decode_bits, (gptr*) &decode_bits, 0, GET_ULONG, REQUIRED_ARG,
9L, 4L, 17L, 0L, 1L, 0},
+#ifdef __NETWARE__
+ {"autoclose", OPT_AUTOCLOSE, "Auto close the screen on exit for NetWare.", 0, 0, 0, GET_NO_ARG,
+ NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
};
@@ -591,6 +595,11 @@
{
switch(optid) {
+ case OPT_AUTOCLOSE:
+#ifdef __NETWARE__
+ setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+#endif
+ break;
case 'a':
testflag|= T_STATISTICS;
break;
--- 1.115/myisam/myisamchk.c 2004-08-31 21:57:56 +05:30
+++ 1.116/myisam/myisamchk.c 2005-08-22 15:23:41 +05:30
@@ -149,7 +149,8 @@
OPT_CORRECT_CHECKSUM, OPT_KEY_BUFFER_SIZE, OPT_MYISAM_BLOCK_SIZE,
OPT_READ_BUFFER_SIZE, OPT_WRITE_BUFFER_SIZE, OPT_SORT_BUFFER_SIZE,
OPT_SORT_KEY_BLOCKS, OPT_DECODE_BITS, OPT_FT_MIN_WORD_LEN,
- OPT_FT_MAX_WORD_LEN, OPT_FT_MAX_WORD_LEN_FOR_SORT, OPT_FT_STOPWORD_FILE
+ OPT_FT_MAX_WORD_LEN, OPT_FT_MAX_WORD_LEN_FOR_SORT, OPT_FT_STOPWORD_FILE,
+ OPT_AUTOCLOSE
};
static struct my_option my_long_options[] =
@@ -319,6 +320,10 @@
"Use stopwords from this file instead of built-in list.",
(gptr*) &ft_stopword_file, (gptr*) &ft_stopword_file, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef __NETWARE__
+ {"autoclose", OPT_AUTOCLOSE, "Auto close the screen on exit for NetWare.", 0, 0, 0, GET_NO_ARG,
+ NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
};
@@ -446,6 +451,11 @@
char *argument)
{
switch (optid) {
+ case OPT_AUTOCLOSE:
+#ifdef __NETWARE__
+ setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+#endif
+ break;
case 'a':
if (argument == disabled_my_option)
check_param.testflag&= ~T_STATISTICS;
--- 1.35/myisam/myisampack.c 2005-04-28 18:57:40 +05:30
+++ 1.36/myisam/myisampack.c 2005-08-22 15:23:41 +05:30
@@ -234,7 +234,7 @@
#endif
}
-enum options_mp {OPT_CHARSETS_DIR_MP=256};
+enum options_mp {OPT_CHARSETS_DIR_MP=256, OPT_AUTOCLOSE};
static struct my_option my_long_options[] =
{
@@ -243,6 +243,10 @@
{"character-sets-dir", OPT_CHARSETS_DIR_MP,
"Directory where character sets are.", (gptr*) &charsets_dir,
(gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef __NETWARE__
+ {"autoclose", OPT_AUTOCLOSE, "Auto close the screen on exit for NetWare.", 0, 0, 0, GET_NO_ARG,
+ NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
{"debug", '#', "Output debug log. Often this is 'd:t:o,filename'",
0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"force", 'f',
@@ -305,6 +309,11 @@
uint length;
switch(optid) {
+ case OPT_AUTOCLOSE:
+#ifdef __NETWARE__
+ setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+#endif
+ break;
case 'f':
force_pack= 1;
tmpfile_createflag= O_RDWR | O_TRUNC;
--- 1.103/client/mysqlbinlog.cc 2004-08-31 21:57:55 +05:30
+++ 1.104/client/mysqlbinlog.cc 2005-08-22 15:23:41 +05:30
@@ -443,6 +443,10 @@
GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"version", 'V', "Print version and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
0, 0, 0, 0, 0},
+#ifdef __NETWARE__
+ {"autoclose", OPT_AUTOCLOSE, "Auto close the screen on exit for NetWare.", 0, 0, 0, GET_NO_ARG,
+ NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
};
@@ -511,6 +515,11 @@
{
bool tty_password=0;
switch (optid) {
+ case OPT_AUTOCLOSE:
+#ifdef __NETWARE__
+ setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+#endif
+ break;
#ifndef DBUG_OFF
case '#':
DBUG_PUSH(argument ? argument : default_dbug_option);
--- 1.31/client/mysqlcheck.c 2005-04-01 01:10:59 +05:30
+++ 1.32/client/mysqlcheck.c 2005-08-22 15:23:41 +05:30
@@ -63,6 +63,10 @@
{"character-sets-dir", OPT_CHARSETS_DIR,
"Directory where character sets are", (gptr*) &charsets_dir,
(gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef __NETWARE__
+ {"autoclose", OPT_AUTOCLOSE, "Auto close the screen on exit for NetWare.", 0, 0, 0, GET_NO_ARG,
+ NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
{"check", 'c', "Check table for errors", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0,
0, 0, 0, 0},
{"check-only-changed", 'C',
@@ -203,6 +207,11 @@
char *argument)
{
switch(optid) {
+ case OPT_AUTOCLOSE:
+#ifdef __NETWARE__
+ setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+#endif
+ break;
case 'a':
what_to_do = DO_ANALYZE;
break;
--- 1.18/client/client_priv.h 2004-11-05 10:53:25 +05:30
+++ 1.19/client/client_priv.h 2005-08-22 15:23:41 +05:30
@@ -39,4 +39,5 @@
OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE,
OPT_DELETE_MASTER_LOGS,
OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION, OPT_FRM,
+ OPT_AUTOCLOSE, /* Auto close the screen on exit for NetWare */
OPT_HEXBLOB };
| Thread |
|---|
| • bk commit into 4.0 tree (pkarthick:1.2139) | pkarthick | 22 Aug |
