mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

after merge

Browse source 
sql/item_row.cc:
  ds20 compat fix
This commit is contained in:
unknown 2004-08-26 18:22:22 +02:00
parent 94a39ec610
commit 82257f94f4
4 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sql/item_row.cc
View file

@ -66,7 +66,8 @@ bool Item_row::fix_fields(THD *thd, TABLE_LIST *tabl, Item **ref)
// we can't assign 'item' before, because fix_fields() can change arg
Item *item= *arg;
used_tables_cache |= item->used_tables();
if (const_item_cache&= item->const_item() && !with_null)
const_item_cache&= item->const_item() && !with_null;
if (const_item_cache)
{
if (item->cols() > 1)
with_null|= item->null_inside();

38
sql/log.cc
View file

@ -1,15 +1,15 @@
/* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
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 */
@ -43,31 +43,31 @@ static bool test_if_number(const char *str,
#ifdef __NT__
static int eventSource = 0;
void setupWindowsEventSource()
void setupWindowsEventSource()
{
if (eventSource) return;
eventSource = 1;
HKEY hRegKey = NULL;
HKEY hRegKey = NULL;
DWORD dwError = 0;
TCHAR szPath[ MAX_PATH ];
// Create the event source registry key
dwError = RegCreateKey(HKEY_LOCAL_MACHINE,
"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\MySQL",
dwError = RegCreateKey(HKEY_LOCAL_MACHINE,
"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\MySQL",
&hRegKey);
// Name of the PE module that contains the message resource
GetModuleFileName(NULL, szPath, MAX_PATH);
// Register EventMessageFile
dwError = RegSetValueEx(hRegKey, "EventMessageFile", 0, REG_EXPAND_SZ,
(PBYTE) szPath, strlen(szPath)+1);
dwError = RegSetValueEx(hRegKey, "EventMessageFile", 0, REG_EXPAND_SZ,
(PBYTE) szPath, strlen(szPath)+1);
// Register supported event types
DWORD dwTypes = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE;
dwError = RegSetValueEx(hRegKey, "TypesSupported", 0, REG_DWORD,
DWORD dwTypes = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE;
dwError = RegSetValueEx(hRegKey, "TypesSupported", 0, REG_DWORD,
(LPBYTE) &dwTypes, sizeof dwTypes);
RegCloseKey(hRegKey);
@ -2200,6 +2200,8 @@ void MYSQL_LOG::report_pos_in_innodb()
my_b_tell(&log_file));
}
#endif
DBUG_VOID_RETURN;
}
#ifdef __NT__
void print_buffer_to_nt_eventlog(enum loglevel level, char *buff, int buffLen)
@ -2241,7 +2243,6 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff, int buffLen)
if (buffptr != buff)
delete[] buffptr;
DBUG_VOID_RETURN;
}
#endif
@ -2253,7 +2254,7 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff, int buffLen)
vprint_msg_to_log()
event_type Type of event to write (Error, Warning, or Info)
format Printf style format of message
args va_list list of arguments for the message
args va_list list of arguments for the message
NOTE
@ -2267,7 +2268,6 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff, int buffLen)
void vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
{
char buff[1024];
DBUG_ENTER("vprint_msg_to_log");
my_vsnprintf(buff, sizeof(buff)-5, format, args);
@ -2286,7 +2286,7 @@ void vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
}
void sql_print_error(const char *format, ...)
void sql_print_error(const char *format, ...)
{
DBUG_ENTER("sql_print_error");
@ -2298,7 +2298,7 @@ void sql_print_error(const char *format, ...)
DBUG_VOID_RETURN;
}
void sql_print_warning(const char *format, ...)
void sql_print_warning(const char *format, ...)
{
DBUG_ENTER("sql_print_warning");
@ -2310,7 +2310,7 @@ void sql_print_warning(const char *format, ...)
DBUG_VOID_RETURN;
}
void sql_print_information(const char *format, ...)
void sql_print_information(const char *format, ...)
{
DBUG_ENTER("sql_print_information");

4
sql/sql_base.cc
View file

@ -2449,8 +2449,8 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
if (db_name && lower_case_table_names)
{
/* convert database to lower case for comparison */
strmake( name_buff, db_name, sizeof(name_buff)-1 );
casedn_str( name_buff );
strmake(name_buff, db_name, sizeof(name_buff)-1);
my_casedn_str(system_charset_info,name_buff);
db_name = name_buff;
}

2
tests/client_test.c
View file

@ -10142,7 +10142,7 @@ static void get_options(int argc, char **argv)
int ho_error;
if ((ho_error= handle_options(&argc, &argv, client_test_long_options,
get_one_option)))
get_one_option, 0)))
exit(ho_error);
if (tty_password)