database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixed minor compiler errors encountered during pre-final builds.

Browse Source
This commit is contained in:
greg@mysql.com
2003-11-12 03:38:46 -05:00
parent 82c0c6c42f
commit 42e36fea12
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/item_func.cc
View File

@ -2743,7 +2743,7 @@ bool Item_func_match::fix_index()
{
Item_field *item;
uint ft_to_key[MAX_KEY], ft_cnt[MAX_KEY], fts=0, keynr;
uint max_cnt=0, mkeys=0;
uint max_cnt=0, mkeys=0, i;
if (key == NO_SUCH_KEY)
return 0;
@ -2762,7 +2762,7 @@ bool Item_func_match::fix_index()
if (!fts)
goto err;
for (uint i=1; i < arg_count; i++)
for (i=1; i < arg_count; i++)
{
item=(Item_field*)args[i];
for (keynr=0 ; keynr < fts ; keynr++)

2
sql/mysql_priv.h
View File

@ -24,7 +24,7 @@
#include <signal.h>
#include <thr_lock.h>
#include <my_base.h> /* Needed by field.h */
#include <sql_bitmap.h>
#include "sql_bitmap.h"
#ifdef __EMX__
#undef write /* remove pthread.h macro definition for EMX */

4
sql/mysqld.cc
View File

@ -2796,7 +2796,7 @@ int main(int argc, char **argv)
but we started a bad tradition by calling it MySQL from the start
and we are now stuck with it.
*/
if (my_strcasecmp(argv[1],"mysql"))
if (my_strcasecmp(system_charset_info, argv[1],"mysql"))
load_default_groups[3]= argv[1];
start_mode= 1;
Service.Init(argv[1], mysql_service);
@ -2817,7 +2817,7 @@ int main(int argc, char **argv)
opt_argc= 2; // Skip service-name
opt_argv=argv;
start_mode= 1;
if (my_strcasecmp(argv[2],"mysql"))
if (my_strcasecmp(system_charset_info, argv[2],"mysql"))
load_default_groups[3]= argv[2];
Service.Init(argv[2], mysql_service);
return 0;

2
strings/my_strtoll10.c
View File

@ -19,7 +19,7 @@
#include <m_string.h>
#define ULONGLONG_MAX (~(ulonglong) 0)
#define MAX_NEGATIVE_NUMBER ((ulonglong) 0x8000000000000000LL)
#define MAX_NEGATIVE_NUMBER ((ulonglong) LL(0x8000000000000000))
#define INIT_CNT 9
#define LFACTOR LL(1000000000)
#define LFACTOR1 LL(10000000000)