Skip to content

Commit 6b79cd5

Browse files
author
[email protected]
committed
Merge
2 parents dde384d + 085b1c5 commit 6b79cd5

85 files changed

Lines changed: 2852 additions & 1845 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.bzrignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ libmysqld/sql_unions.cc
420420
libmysqld/sql_update.cc
421421
libmysqld/sql_yacc.cc
422422
libmysqld/stacktrace.c
423+
libmysqld/strfunc.cc
423424
libmysqld/table.cc
424425
libmysqld/thr_malloc.cc
425426
libmysqld/time.cc

‎BUILD/compile-pentium-valgrind-max‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam --
1414

1515
if test -z "$just_print"
1616
then
17+
set +v
1718
echo "\
1819
******************************************************************************
1920
Note that by default BUILD/compile-pentium-valgrind-max calls 'configure' with

‎VC++Files/libmysqld/libmysqld.dsp‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VC++Files/sql/mysqld.dsp‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VC++Files/sql/mysqldmax.dsp‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VC++Files/strings/strings.dsp‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎include/m_ctype.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ enum my_lex_states
8686
{
8787
MY_LEX_START, MY_LEX_CHAR, MY_LEX_IDENT,
8888
MY_LEX_IDENT_SEP, MY_LEX_IDENT_START,
89-
MY_LEX_FOUND_IDENT, MY_LEX_REAL, MY_LEX_HEX_NUMBER,
89+
MY_LEX_REAL, MY_LEX_HEX_NUMBER,
9090
MY_LEX_CMP_OP, MY_LEX_LONG_CMP_OP, MY_LEX_STRING, MY_LEX_COMMENT, MY_LEX_END,
9191
MY_LEX_OPERATOR_OR_IDENT, MY_LEX_NUMBER_IDENT, MY_LEX_INT_OR_REAL,
9292
MY_LEX_REAL_OR_POINT, MY_LEX_BOOL, MY_LEX_EOL, MY_LEX_ESCAPE,

‎include/m_string.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ extern char *int2str(long val,char *dst,int radix);
232232
extern char *int10_to_str(long val,char *dst,int radix);
233233
extern char *str2int(const char *src,int radix,long lower,long upper,
234234
long *val);
235+
longlong my_strtoll10(const char *nptr, char **endptr, int *error);
235236
#if SIZEOF_LONG == SIZEOF_LONG_LONG
236237
#define longlong2str(A,B,C) int2str((A),(B),(C))
237238
#define longlong10_to_str(A,B,C) int10_to_str((A),(B),(C))

‎include/my_pthread.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -669,23 +669,21 @@ extern pthread_t shutdown_th, main_th, signal_th;
669669
#define thread_safe_increment(V,L) atomic_add(1,(atomic_t*) &V);
670670
#define thread_safe_add(V,C,L) atomic_add((C),(atomic_t*) &V);
671671
#define thread_safe_sub(V,C,L) atomic_sub((C),(atomic_t*) &V);
672-
#define statistic_increment(V,L) thread_safe_increment((V),(L))
673-
#define statistic_add(V,C,L) thread_safe_add((V),(C),(L))
674672
#else
675673
#define thread_safe_increment(V,L) \
676674
pthread_mutex_lock((L)); (V)++; pthread_mutex_unlock((L));
677675
#define thread_safe_add(V,C,L) \
678676
pthread_mutex_lock((L)); (V)+=(C); pthread_mutex_unlock((L));
679677
#define thread_safe_sub(V,C,L) \
680678
pthread_mutex_lock((L)); (V)-=(C); pthread_mutex_unlock((L));
679+
#endif /* HAVE_ATOMIC_ADD */
681680
#ifdef SAFE_STATISTICS
682681
#define statistic_increment(V,L) thread_safe_increment((V),(L))
683682
#define statistic_add(V,C,L) thread_safe_add((V),(C),(L))
684683
#else
685684
#define statistic_increment(V,L) (V)++
686685
#define statistic_add(V,C,L) (V)+=(C)
687686
#endif /* SAFE_STATISTICS */
688-
#endif /* HAVE_ATOMIC_ADD */
689687
#endif /* thread_safe_increment */
690688

691689
#ifdef __cplusplus

‎include/mysqld_error.h‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,12 @@
295295
#define ER_BAD_SLAVE_UNTIL_COND 1276
296296
#define ER_MISSING_SKIP_SLAVE 1277
297297
#define ER_UNTIL_COND_IGNORED 1278
298-
#define ER_WRONG_INDEX_NAME 1279
299-
#define ER_WARN_QC_RESIZE 1280
300-
#define ER_BAD_FT_COLUMN 1281
301-
#define ER_ERROR_MESSAGES 282
298+
#define ER_WRONG_NAME 1279
299+
#define ER_TABLE 1280
300+
#define ER_DATABASE 1281
301+
#define ER_COLUMN 1282
302+
#define ER_INDEX 1283
303+
#define ER_CATALOG 1284
304+
#define ER_WARN_QC_RESIZE 1285
305+
#define ER_BAD_FT_COLUMN 1286
306+
#define ER_ERROR_MESSAGES 287

0 commit comments

Comments
 (0)