mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
Removed end space
BUILD/compile-pentium: Added build of multi-threaded library
This commit is contained in:
unknown
parent
e31760c015
commit
a803c36b70
3 changed files with 63 additions and 63 deletions
|
|
@ -3,6 +3,6 @@ make -k clean
|
|||
|
||||
aclocal; autoheader; aclocal; automake; autoconf
|
||||
|
||||
CFLAGS="-O6 -mpentiumpro -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -mpentiumpro -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
|
||||
CFLAGS="-O6 -mpentiumpro -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -mpentiumpro -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex --enable-thread-safe-client
|
||||
make
|
||||
strip sql/mysqld
|
||||
|
|
|
|||
|
|
@ -499,7 +499,7 @@ int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd)
|
|||
table_list->lock_type = TL_READ_NO_INSERT;
|
||||
table_list->next = 0;
|
||||
remove_escape(table_list->real_name);
|
||||
|
||||
|
||||
if(!(table=open_ltable(thd, table_list, TL_READ_NO_INSERT)))
|
||||
DBUG_RETURN(1);
|
||||
|
||||
|
|
@ -519,12 +519,12 @@ int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd)
|
|||
error = table->file->dump(thd,fd);
|
||||
if(error)
|
||||
my_error(ER_GET_ERRNO, MYF(0));
|
||||
|
||||
|
||||
err:
|
||||
|
||||
|
||||
close_thread_tables(thd);
|
||||
|
||||
DBUG_RETURN(error);
|
||||
|
||||
DBUG_RETURN(error);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -592,7 +592,7 @@ bool do_command(THD *thd)
|
|||
tbl_name[tbl_len] = 0;
|
||||
if(mysql_table_dump(thd, db, tbl_name, -1))
|
||||
send_error(&thd->net); // dump to NET
|
||||
|
||||
|
||||
break;
|
||||
}
|
||||
case COM_CHANGE_USER:
|
||||
|
|
@ -712,7 +712,7 @@ bool do_command(THD *thd)
|
|||
if(check_access(thd, FILE_ACL, any_db))
|
||||
break;
|
||||
mysql_log.write(command, 0);
|
||||
|
||||
|
||||
ulong pos;
|
||||
ushort flags;
|
||||
pos = uint4korr(packet + 1);
|
||||
|
|
@ -949,7 +949,7 @@ mysql_execute_command(void)
|
|||
break;
|
||||
}
|
||||
case SQLCOM_LOAD_MASTER_TABLE:
|
||||
|
||||
|
||||
if (!tables->db)
|
||||
tables->db=thd->db;
|
||||
if (check_access(thd,CREATE_ACL,tables->db,&tables->grant.privilege))
|
||||
|
|
@ -982,11 +982,11 @@ mysql_execute_command(void)
|
|||
// this way we make sure that when we are done, we are clean
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
res = 0;
|
||||
send_ok(&thd->net);
|
||||
break;
|
||||
|
||||
|
||||
case SQLCOM_CREATE_TABLE:
|
||||
#ifdef DEMO_VERSION
|
||||
send_error(&thd->net,ER_NOT_ALLOWED_COMMAND);
|
||||
|
|
@ -1081,7 +1081,7 @@ mysql_execute_command(void)
|
|||
case SQLCOM_SLAVE_STOP:
|
||||
stop_slave(thd);
|
||||
break;
|
||||
|
||||
|
||||
|
||||
case SQLCOM_ALTER_TABLE:
|
||||
#if defined(DONT_ALLOW_SHOW_COMMANDS)
|
||||
|
|
@ -1164,7 +1164,7 @@ mysql_execute_command(void)
|
|||
check_access(thd, SELECT_ACL | EXTRA_ACL, tables->db,
|
||||
&tables->grant.privilege))
|
||||
goto error;
|
||||
res = mysqld_show_create(thd, tables);
|
||||
res = mysqld_show_create(thd, tables);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1491,7 +1491,7 @@ mysql_execute_command(void)
|
|||
if (org_options & OPTION_AUTO_COMMIT)
|
||||
{
|
||||
/* We changed to auto_commit mode */
|
||||
thd->options&= ~OPTION_BEGIN;
|
||||
thd->options&= ~OPTION_BEGIN;
|
||||
thd->server_status|= SERVER_STATUS_AUTOCOMMIT;
|
||||
if (ha_commit(thd))
|
||||
{
|
||||
|
|
@ -1500,7 +1500,7 @@ mysql_execute_command(void)
|
|||
}
|
||||
}
|
||||
else
|
||||
thd->server_status&= ~SERVER_STATUS_AUTOCOMMIT;
|
||||
thd->server_status&= ~SERVER_STATUS_AUTOCOMMIT;
|
||||
}
|
||||
send_ok(&thd->net);
|
||||
break;
|
||||
|
|
@ -2385,7 +2385,7 @@ bool reload_acl_and_cache(THD *thd, uint options, TABLE_LIST *tables)
|
|||
reset_master();
|
||||
if (options & REFRESH_SLAVE)
|
||||
reset_slave();
|
||||
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -2458,7 +2458,7 @@ static int start_slave(THD* thd , bool net_report)
|
|||
if(!slave_running)
|
||||
if(master_host)
|
||||
{
|
||||
pthread_t hThread;
|
||||
pthread_t hThread;
|
||||
if(pthread_create(&hThread, &connection_attrib, handle_slave, 0))
|
||||
{
|
||||
err = "cannot create slave thread";
|
||||
|
|
@ -2473,7 +2473,7 @@ static int start_slave(THD* thd , bool net_report)
|
|||
if(err)
|
||||
{
|
||||
if(net_report) send_error(net, 0, err);
|
||||
return 1;
|
||||
return 1;
|
||||
}
|
||||
else if(net_report)
|
||||
send_ok(net);
|
||||
|
|
@ -2486,10 +2486,10 @@ static int stop_slave(THD* thd, bool net_report )
|
|||
if(!thd) thd = current_thd;
|
||||
NET* net = &thd->net;
|
||||
const char* err = 0;
|
||||
|
||||
|
||||
if(check_access(thd, PROCESS_ACL, any_db))
|
||||
return 1;
|
||||
|
||||
|
||||
pthread_mutex_lock(&LOCK_slave);
|
||||
if (slave_running)
|
||||
{
|
||||
|
|
@ -2502,10 +2502,10 @@ static int stop_slave(THD* thd, bool net_report )
|
|||
}
|
||||
else
|
||||
err = "Slave is not running";
|
||||
|
||||
|
||||
pthread_mutex_unlock(&LOCK_slave);
|
||||
thd->proc_info = 0;
|
||||
|
||||
|
||||
if(err)
|
||||
{
|
||||
if(net_report) send_error(net, 0, err);
|
||||
|
|
@ -2522,15 +2522,15 @@ static void reset_slave()
|
|||
MY_STAT stat_area;
|
||||
char fname[FN_REFLEN];
|
||||
bool slave_was_running = slave_running;
|
||||
|
||||
|
||||
if(slave_running)
|
||||
stop_slave(0,0);
|
||||
|
||||
|
||||
fn_format(fname, master_info_file, mysql_data_home, "", 4+16+32);
|
||||
if(my_stat(fname, &stat_area, MYF(0)))
|
||||
if(my_delete(fname, MYF(MY_WME)))
|
||||
return;
|
||||
|
||||
|
||||
if(slave_was_running)
|
||||
start_slave(0,0);
|
||||
}
|
||||
|
|
@ -2550,7 +2550,7 @@ static int change_master(THD* thd)
|
|||
pthread_mutex_unlock(&LOCK_slave);
|
||||
thd->proc_info = "changing master";
|
||||
LEX_MASTER_INFO* lex_mi = &thd->lex.mi;
|
||||
|
||||
|
||||
pthread_mutex_lock(&glob_mi.lock);
|
||||
if((lex_mi->host || lex_mi->port) && !lex_mi->log_file_name && !lex_mi->pos)
|
||||
{
|
||||
|
|
@ -2564,7 +2564,7 @@ static int change_master(THD* thd)
|
|||
sizeof(glob_mi.log_file_name));
|
||||
if(lex_mi->pos)
|
||||
glob_mi.pos = lex_mi->pos;
|
||||
|
||||
|
||||
if(lex_mi->host)
|
||||
strmake(glob_mi.host, lex_mi->host, sizeof(glob_mi.host));
|
||||
if(lex_mi->user)
|
||||
|
|
@ -2575,14 +2575,14 @@ static int change_master(THD* thd)
|
|||
glob_mi.port = lex_mi->port;
|
||||
if(lex_mi->connect_retry)
|
||||
glob_mi.connect_retry = lex_mi->connect_retry;
|
||||
|
||||
|
||||
flush_master_info(&glob_mi);
|
||||
pthread_mutex_unlock(&glob_mi.lock);
|
||||
thd->proc_info = "starting slave";
|
||||
if(slave_was_running)
|
||||
start_slave(0,0);
|
||||
thd->proc_info = 0;
|
||||
|
||||
|
||||
send_ok(&thd->net);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -2620,9 +2620,9 @@ static void reset_master()
|
|||
strmov(strcend(tmp,'.'),"-bin");
|
||||
opt_bin_logname=tmp;
|
||||
}
|
||||
|
||||
|
||||
mysql_bin_log.open(opt_bin_logname,LOG_BIN);
|
||||
|
||||
|
||||
}
|
||||
|
||||
int show_binlog_info(THD* thd)
|
||||
|
|
@ -2633,12 +2633,12 @@ int show_binlog_info(THD* thd)
|
|||
field_list.push_back(new Item_empty_string("Position",20));
|
||||
field_list.push_back(new Item_empty_string("Binlog_do_db",20));
|
||||
field_list.push_back(new Item_empty_string("Binlog_ignore_db",20));
|
||||
|
||||
|
||||
if(send_fields(thd, field_list, 1))
|
||||
DBUG_RETURN(-1);
|
||||
String* packet = &thd->packet;
|
||||
packet->length(0);
|
||||
|
||||
|
||||
if(mysql_bin_log.is_open())
|
||||
{
|
||||
LOG_INFO li;
|
||||
|
|
|
|||
|
|
@ -548,7 +548,7 @@ verb_clause:
|
|||
| rollback
|
||||
| select
|
||||
| set
|
||||
| slave
|
||||
| slave
|
||||
| show
|
||||
| unlock
|
||||
| update
|
||||
|
|
@ -557,7 +557,7 @@ verb_clause:
|
|||
/* change master */
|
||||
|
||||
change:
|
||||
CHANGE MASTER_SYM TO_SYM
|
||||
CHANGE MASTER_SYM TO_SYM
|
||||
{
|
||||
LEX *lex = Lex;
|
||||
lex->sql_command = SQLCOM_CHANGE_MASTER;
|
||||
|
|
@ -568,7 +568,7 @@ master_defs:
|
|||
master_def
|
||||
|
|
||||
master_defs ',' master_def
|
||||
|
||||
|
||||
master_def:
|
||||
MASTER_HOST_SYM EQ TEXT_STRING
|
||||
{
|
||||
|
|
@ -604,9 +604,9 @@ master_def:
|
|||
{
|
||||
Lex->mi.connect_retry = $3;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/* create a table */
|
||||
|
||||
create:
|
||||
|
|
@ -614,7 +614,7 @@ create:
|
|||
{
|
||||
LEX *lex=Lex;
|
||||
lex->sql_command= SQLCOM_CREATE_TABLE;
|
||||
if (!add_table_to_list($5,
|
||||
if (!add_table_to_list($5,
|
||||
($2 & HA_LEX_CREATE_TMP_TABLE ?
|
||||
&tmp_table_alias : (LEX_STRING*) 0)))
|
||||
YYABORT;
|
||||
|
|
@ -678,7 +678,7 @@ create:
|
|||
}
|
||||
|
||||
create2:
|
||||
'(' field_list ')' opt_create_table_options create3 {}
|
||||
'(' field_list ')' opt_create_table_options create3 {}
|
||||
| opt_create_table_options create3 {}
|
||||
|
||||
create3:
|
||||
|
|
@ -690,18 +690,18 @@ create3:
|
|||
select_options select_item_list opt_select_from {}
|
||||
|
||||
opt_table_options:
|
||||
/* empty */ { $$= 0; }
|
||||
/* empty */ { $$= 0; }
|
||||
| table_options { $$= $1;}
|
||||
|
||||
table_options:
|
||||
table_option { $$=$1; }
|
||||
| table_option table_options { $$= $1 | $2 }
|
||||
|
||||
|
||||
table_option:
|
||||
TEMPORARY { $$=HA_LEX_CREATE_TMP_TABLE; }
|
||||
|
||||
opt_if_not_exists:
|
||||
/* empty */ { $$= 0; }
|
||||
/* empty */ { $$= 0; }
|
||||
| IF NOT EXISTS { $$=HA_LEX_CREATE_IF_NOT_EXISTS; }
|
||||
|
||||
opt_create_table_options:
|
||||
|
|
@ -723,7 +723,7 @@ create_table_option:
|
|||
| PACK_KEYS_SYM EQ ULONG_NUM { Lex->create_info.table_options|= $3 ? HA_OPTION_PACK_KEYS : HA_OPTION_NO_PACK_KEYS; }
|
||||
| CHECKSUM_SYM EQ ULONG_NUM { Lex->create_info.table_options|= $3 ? HA_OPTION_CHECKSUM : HA_OPTION_NO_CHECKSUM; }
|
||||
| DELAY_KEY_WRITE_SYM EQ ULONG_NUM { Lex->create_info.table_options|= $3 ? HA_OPTION_DELAY_KEY_WRITE : HA_OPTION_NO_DELAY_KEY_WRITE; }
|
||||
| ROW_FORMAT_SYM EQ row_types { Lex->create_info.row_type= $3; }
|
||||
| ROW_FORMAT_SYM EQ row_types { Lex->create_info.row_type= $3; }
|
||||
| RAID_TYPE EQ raid_types { Lex->create_info.raid_type= $3; Lex->create_info.used_fields|= HA_CREATE_USED_RAID;}
|
||||
| RAID_CHUNKS EQ ULONG_NUM { Lex->create_info.raid_chunks= $3; Lex->create_info.used_fields|= HA_CREATE_USED_RAID;}
|
||||
| RAID_CHUNKSIZE EQ ULONG_NUM { Lex->create_info.raid_chunksize= $3*RAID_BLOCK_SIZE; Lex->create_info.used_fields|= HA_CREATE_USED_RAID;}
|
||||
|
|
@ -865,7 +865,7 @@ char:
|
|||
CHAR_SYM {}
|
||||
| NCHAR_SYM {}
|
||||
| NATIONAL_SYM CHAR_SYM {}
|
||||
|
||||
|
||||
varchar:
|
||||
char VARYING {}
|
||||
| VARCHAR {}
|
||||
|
|
@ -1096,7 +1096,7 @@ slave:
|
|||
Lex->sql_command = SQLCOM_SLAVE_STOP;
|
||||
Lex->type = 0;
|
||||
};
|
||||
|
||||
|
||||
repair:
|
||||
REPAIR table_or_tables
|
||||
{
|
||||
|
|
@ -1124,7 +1124,7 @@ analyze:
|
|||
}
|
||||
|
||||
check:
|
||||
CHECK_SYM table_or_tables
|
||||
CHECK_SYM table_or_tables
|
||||
{
|
||||
Lex->sql_command = SQLCOM_CHECK;
|
||||
Lex->check_opt.init();
|
||||
|
|
@ -1239,7 +1239,7 @@ select_alias:
|
|||
optional_braces:
|
||||
/* empty */ {}
|
||||
| '(' ')' {}
|
||||
|
||||
|
||||
/* all possible expressions */
|
||||
expr: expr_expr {$$ = $1; }
|
||||
| simple_expr {$$ = $1; }
|
||||
|
|
@ -1381,7 +1381,7 @@ simple_expr:
|
|||
(Item_func_match *)($$=new Item_func_match(*$2,$5))); }
|
||||
| BINARY expr %prec NEG { $$= new Item_func_binary($2); }
|
||||
| CASE_SYM opt_expr WHEN_SYM when_list opt_else END
|
||||
{ $$= new Item_func_case(* $4, $2, $5 ) }
|
||||
{ $$= new Item_func_case(* $4, $2, $5 ) }
|
||||
| FUNC_ARG0 '(' ')'
|
||||
{ $$= ((Item*(*)(void))($1.symbol->create_func))();}
|
||||
| FUNC_ARG1 '(' expr ')'
|
||||
|
|
@ -1575,7 +1575,7 @@ simple_expr:
|
|||
{ $$= new Item_func_yearweek($3, $5); }
|
||||
| BENCHMARK_SYM '(' ULONG_NUM ',' expr ')'
|
||||
{ $$=new Item_func_benchmark($3,$5); }
|
||||
| EXTRACT_SYM '(' interval FROM expr ')'
|
||||
| EXTRACT_SYM '(' interval FROM expr ')'
|
||||
{ $$=new Item_extract( $3, $5); }
|
||||
|
||||
udf_expr_list:
|
||||
|
|
@ -1646,12 +1646,12 @@ when_list:
|
|||
{ $$= Lex->when_list.pop(); }
|
||||
|
||||
when_list2:
|
||||
expr THEN_SYM expr
|
||||
expr THEN_SYM expr
|
||||
{
|
||||
Lex->when_list.head()->push_back($1);
|
||||
Lex->when_list.head()->push_back($3);
|
||||
}
|
||||
| when_list2 WHEN_SYM expr THEN_SYM expr
|
||||
| when_list2 WHEN_SYM expr THEN_SYM expr
|
||||
{
|
||||
Lex->when_list.head()->push_back($3);
|
||||
Lex->when_list.head()->push_back($5);
|
||||
|
|
@ -2114,11 +2114,11 @@ show_param:
|
|||
| MASTER_SYM STATUS_SYM
|
||||
{
|
||||
Lex->sql_command = SQLCOM_SHOW_MASTER_STAT;
|
||||
}
|
||||
}
|
||||
| SLAVE STATUS_SYM
|
||||
{
|
||||
Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
|
||||
}
|
||||
}
|
||||
|
||||
opt_db:
|
||||
/* empty */ { $$= 0; }
|
||||
|
|
@ -2167,8 +2167,8 @@ flush_option:
|
|||
| PRIVILEGES { Lex->type|= REFRESH_GRANT; }
|
||||
| LOGS_SYM { Lex->type|= REFRESH_LOG; }
|
||||
| STATUS_SYM { Lex->type|= REFRESH_STATUS; }
|
||||
| SLAVE { Lex->type|= REFRESH_SLAVE; }
|
||||
| MASTER_SYM { Lex->type|= REFRESH_MASTER; }
|
||||
| SLAVE { Lex->type|= REFRESH_SLAVE; }
|
||||
| MASTER_SYM { Lex->type|= REFRESH_MASTER; }
|
||||
|
||||
opt_table_list:
|
||||
/* empty */ {}
|
||||
|
|
@ -2205,13 +2205,13 @@ load: LOAD DATA_SYM opt_low_priority opt_local INFILE TEXT_STRING
|
|||
YYABORT;
|
||||
}
|
||||
|
|
||||
LOAD TABLE_SYM table_ident FROM MASTER_SYM
|
||||
LOAD TABLE_SYM table_ident FROM MASTER_SYM
|
||||
{
|
||||
Lex->sql_command = SQLCOM_LOAD_MASTER_TABLE;
|
||||
if (!add_table_to_list($3,NULL))
|
||||
YYABORT;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
opt_local:
|
||||
/* empty */ { $$=0;}
|
||||
|
|
@ -2334,7 +2334,7 @@ ident:
|
|||
|
||||
ident_or_text:
|
||||
ident { $$=$1;}
|
||||
| TEXT_STRING { $$=$1;}
|
||||
| TEXT_STRING { $$=$1;}
|
||||
| LEX_HOSTNAME { $$=$1;}
|
||||
|
||||
user:
|
||||
|
|
@ -2417,10 +2417,10 @@ keyword:
|
|||
| PROCESSLIST_SYM {}
|
||||
| QUICK {}
|
||||
| RAID_0_SYM {}
|
||||
| RAID_CHUNKS {}
|
||||
| RAID_CHUNKSIZE {}
|
||||
| RAID_CHUNKS {}
|
||||
| RAID_CHUNKSIZE {}
|
||||
| RAID_STRIPED_SYM {}
|
||||
| RAID_TYPE {}
|
||||
| RAID_TYPE {}
|
||||
| RELOAD {}
|
||||
| REPAIR {}
|
||||
| ROLLBACK_SYM {}
|
||||
|
|
|
|||
Loading…
Reference in a new issue