mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
262a9e41e1
slave will skip the first SQL_SLAVE_SKIP_COUNTER events on start - this is needed to recover from broken replication when the next log event(s) should just be skipped. Rotate binlogs when max_binlog_size is reached include/my_sys.h: added my_snprintf() include/mysqld_error.h: more error messages mysql-test/r/rpl000014.result: updated results for new SHOW SLAVE STATUS format mysql-test/r/rpl000015.result: update for SHOW SLAVE STATUS mysql-test/r/rpl000016.result: update for additions to the test mysql-test/t/rpl000016.test: test max_binlog_size and slave_skip_counter mysys/my_vsnprintf.c: added my_snprintf() sql/gen_lex_hash.cc: old values could not do it sql/lex.h: updates for SQL_SLAVE_SKIP_COUNTER sql/log.cc: rotate binlogs when max_binlog_size is reached sql/mysqld.cc: added max_binlog_size sql/share/czech/errmsg.txt: new errors sql/share/danish/errmsg.txt: new errors sql/share/dutch/errmsg.txt: new errors sql/share/english/errmsg.txt: new errors sql/share/estonian/errmsg.txt: new errors sql/share/french/errmsg.txt: new errors sql/share/german/errmsg.txt: new errors sql/share/greek/errmsg.txt: new errors sql/share/hungarian/errmsg.txt: new errors sql/share/italian/errmsg.txt: new errors sql/share/japanese/errmsg.txt: new errors sql/share/korean/errmsg.txt: new errors sql/share/norwegian-ny/errmsg.txt: new errors sql/share/norwegian/errmsg.txt: new errors sql/share/polish/errmsg.txt: new errors sql/share/portuguese/errmsg.txt: new errors sql/share/romanian/errmsg.txt: new errors sql/share/russian/errmsg.txt: new errors, translated untranslated messages sql/share/slovak/errmsg.txt: new errors sql/share/spanish/errmsg.txt: new errors sql/share/swedish/errmsg.txt: new errors sql/slave.cc: updates for slave_skip_counter and extension to show slave status sql/slave.h: slave_skip_counter sql/sql_repl.cc: use error messages from errmsg.txt sql/sql_yacc.yy: skip_slave_counter
112 lines
3.1 KiB
C
112 lines
3.1 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
#include "mysys_priv.h"
|
|
#include "mysys_err.h"
|
|
#include <m_string.h>
|
|
#include <stdarg.h>
|
|
#include <m_ctype.h>
|
|
|
|
int my_snprintf(char* to, size_t n, const char* fmt, ...)
|
|
{
|
|
va_list args;
|
|
va_start(args,fmt);
|
|
return my_vsnprintf(to, n, fmt, args);
|
|
}
|
|
|
|
int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
|
|
{
|
|
char *start=to, *end=to+n-1;
|
|
for (; *fmt ; fmt++)
|
|
{
|
|
if (fmt[0] != '%')
|
|
{
|
|
if (to == end) /* End of buffer */
|
|
break;
|
|
*to++= *fmt; /* Copy ordinary char */
|
|
continue;
|
|
}
|
|
/* Skipp if max size is used (to be compatible with printf) */
|
|
fmt++;
|
|
while (isdigit(*fmt) || *fmt == '.' || *fmt == '-')
|
|
fmt++;
|
|
if(*fmt == 'l')
|
|
fmt++;
|
|
if (*fmt == 's') /* String parameter */
|
|
{
|
|
reg2 char *par = va_arg(ap, char *);
|
|
uint plen;
|
|
if(!par) par = (char*)"(null)";
|
|
plen = (uint) strlen(par);
|
|
if ((uint) (end-to) > plen) /* Replace if possible */
|
|
{
|
|
to=strmov(to,par);
|
|
continue;
|
|
}
|
|
}
|
|
else if (*fmt == 'd' || *fmt == 'u') /* Integer parameter */
|
|
{
|
|
register int iarg;
|
|
if ((uint) (end-to) < 16)
|
|
break;
|
|
iarg = va_arg(ap, int);
|
|
if (*fmt == 'd')
|
|
to=int10_to_str((long) iarg,to, -10);
|
|
else
|
|
to=int10_to_str((long) (uint) iarg,to,10);
|
|
continue;
|
|
}
|
|
/* We come here on '%%', unknown code or too long parameter */
|
|
if (to == end)
|
|
break;
|
|
*to++='%'; /* % used as % or unknown code */
|
|
}
|
|
*to='\0'; /* End of errmessage */
|
|
return (uint) (to - start);
|
|
}
|
|
|
|
#ifdef MAIN
|
|
static void my_printf(const char * fmt, ...)
|
|
{
|
|
char buf[32];
|
|
int n;
|
|
va_list ar;
|
|
va_start(ar, fmt);
|
|
n = my_vsnprintf(buf, sizeof(buf),fmt, ar);
|
|
printf(buf);
|
|
printf("n=%d, strlen=%d\n", n, strlen(buf));
|
|
va_end(ar);
|
|
}
|
|
|
|
int main()
|
|
{
|
|
|
|
my_printf("Hello\n");
|
|
my_printf("Hello int, %d\n", 1);
|
|
my_printf("Hello string '%s'\n", "I am a string");
|
|
my_printf("Hello hack hack hack hack hack hack hack %d\n", 1);
|
|
my_printf("Hello %d hack %d\n", 1, 4);
|
|
my_printf("Hello %d hack hack hack hack hack %d\n", 1, 4);
|
|
my_printf("Hello '%s' hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh\n", "hack");
|
|
my_printf("Hello hhhhhhhhhhhhhh %d sssssssssssssss\n", 1);
|
|
my_printf("Hello %u\n", 1);
|
|
my_printf("conn %ld to: '%-.64s' user: '%-.32s' host:\
|
|
`%-.64s' (%-.64s)", 1, 0,0,0,0);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|