1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated configure script to handle 1 digit numbers in MySQL version

Browse Source 
Fixed a few typos from last patch


configure.in:
  Updated script to handle 1 digit numbers in MySQL version
libmysqld/libmysqld.c:
  Added mysql_get_server_version
sql/sql_parse.cc:
  Fixed typo in last patch
sql/sql_yacc.yy:
  Fixed typo in last patch
This commit is contained in:
unknown 2003-02-12 23:17:22 +02:00
parent fcb61f5917
commit 0a10f78f12
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.in
View File

@ -14,12 +14,9 @@ SHARED_LIB_VERSION=14:0:0
# Set all version vars based on $VERSION. How do we do this more elegant ? # Set all version vars based on $VERSION. How do we do this more elegant ?
# Remember that regexps needs to quote [ and ] since this is run through m4 # Remember that regexps needs to quote [ and ] since this is run through m4
MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|-.*$||"`
MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"` MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
MYSQL_BASE_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|\.[[^.]]*$||"` MYSQL_BASE_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|\.[[^.]]*$||"`
F_PART=`echo $MYSQL_BASE_VERSION | sed -e "s|\.||g"| sed -e "s|[a-zA-Z]\+||"|sed -e "s|^\(..\)$|\\10|"` MYSQL_VERSION_ID=`echo $MYSQL_NO_DASH_VERSION. | sed -e 's/\./ /g; s/ \([[0-9]]\) / 0\\1 /g; s/ //g'`
L_PART=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|^[[0-9]]\.[[0-9]]*\.||" | sed -e "s|^\(.\)$|0\\1|" | sed -e "s|[[a-z]]||"`
MYSQL_VERSION_ID=${F_PART}${L_PART}
# The port should be constant for a LONG time # The port should be constant for a LONG time
MYSQL_TCP_PORT_DEFAULT=3306 MYSQL_TCP_PORT_DEFAULT=3306

6
libmysqld/libmysqld.c
View File

@ -1155,6 +1155,12 @@ mysql_get_server_info(MYSQL *mysql __attribute__((unused)))
} }
ulong STDCALL
mysql_get_server_version(MYSQL *mysql __attribute__((unused)))
{
return MYSQL_VERSION_ID;
}
const char * STDCALL const char * STDCALL
mysql_get_host_info(MYSQL *mysql __attribute__((unused))) mysql_get_host_info(MYSQL *mysql __attribute__((unused)))
{ {

2
sql/sql_parse.cc
View File

@ -1601,7 +1601,7 @@ mysql_execute_command(THD *thd)
} }
if ((&lex->select_lex != lex->all_selects_list && if ((&lex->select_lex != lex->all_selects_list &&
lex->unit.create_total_list(thd, lex, &tables, 0)) lex->unit.create_total_list(thd, lex, &tables, 0))
#ifndef HAVE_REPLICATION #ifdef HAVE_REPLICATION
|| ||
(table_rules_on && tables && thd->slave_thread && (table_rules_on && tables && thd->slave_thread &&
!tables_ok(thd,tables)) !tables_ok(thd,tables))

2
sql/sql_yacc.yy
View File

@ -2816,7 +2816,7 @@ order_clause:
ORDER_SYM BY ORDER_SYM BY
{ {
LEX *lex=Lex; LEX *lex=Lex;
if (lex->current_select->linkage != GLOBAL_OPTIONS_TYPE) && if (lex->current_select->linkage != GLOBAL_OPTIONS_TYPE &&
lex->current_select->select_lex()->olap != lex->current_select->select_lex()->olap !=
UNSPECIFIED_OLAP_TYPE) UNSPECIFIED_OLAP_TYPE)
{ {