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

Merging with mysql-5.1-rep+2

Browse source
This commit is contained in:
Mats Kindahl 2009-12-16 09:34:10 +01:00
commit 6a3cc819ae
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sql/field.cc
View file

@ -999,18 +999,19 @@ test_if_important_data(CHARSET_INFO *cs, const char *str, const char *strend)
/**
Template function to compare two objects.
Function to compare two unsigned integers for their relative order.
Used below. In an anonymous namespace to not clash with definitions
in other files.
*/
namespace {
template <class A_type, class B_type>
int compare(A_type a, B_type b)
int compare(unsigned int a, unsigned int b)
{
if (a < b)
return -1;
if (b < a)
return 1;
return 0;
}
}
}
/**

20
sql/rpl_utility.cc
View file

@ -19,18 +19,16 @@
#include "rpl_rli.h"
/**
Template function to compare two objects.
Function to compare two size_t integers for their relative
order. Used below.
*/
namespace {
template <class Type>
int compare(Type a, Type b)
{
if (a < b)
return -1;
if (b < a)
return 1;
return 0;
}
int compare(size_t a, size_t b)
{
if (a < b)
return -1;
if (b < a)
return 1;
return 0;
}