database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Changed SQL variable delay_key_write to an enum

Browse Source 
able delay_key_write as default (as it was in 4.0.2)


Docs/manual.texi:
  Updated information about variable DELAY_KEY_WRITE.
mysql-test/r/type_decimal.result:
  Updated results
mysql-test/r/variables.result:
  Updated results
mysql-test/t/type_decimal.test:
  Fixed test to not cause purify error in mathlib during purify.
mysql-test/t/variables.test:
  Test new usage of DELAY_KEY_WRITE
sql/ha_innodb.cc:
  Merge with 3.23 code
sql/mysql_priv.h:
  Changed SQL variable delay_key_write to an enum
sql/mysqld.cc:
  Changed SQL variable delay_key_write to an enum.
  Enable delay_key_write as default (as it was in 4.0.2)
sql/set_var.cc:
  Changed SQL variable delay_key_write to an enum
sql/set_var.h:
  Changed SQL variable delay_key_write to an enum
sql/sql_class.h:
  Changed SQL variable delay_key_write to an enum
sql/sql_yacc.yy:
  Changed SQL variable delay_key_write to an enum
This commit is contained in:
unknown
2002-08-13 02:18:39 +03:00
parent 689a438746
commit 51156c5af2
12 changed files with 210 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
sql/ha_innodb.cc
View File

@@ -265,51 +265,60 @@ the prototype for this function! */
void
innobase_mysql_print_thd(
/*=====================*/
char* buf, /* in/out: buffer where to print, must be at least
300 bytes */
void* input_thd)/* in: pointer to a MySQL THD object */
char* buf, /* in/out: buffer where to print, must be at least
400 bytes */
void* input_thd)/* in: pointer to a MySQL THD object */
{
THD* thd;
THD* thd;
char* old_buf = buf;
thd = (THD*) input_thd;
thd = (THD*) input_thd;
/* We can't use value of sprintf() as this is not portable */
buf+= my_sprintf(buf,
/* We cannot use the return value of normal sprintf() as this is
not portable to some old non-Posix Unixes, e.g., some old SCO
Unixes */
buf += my_sprintf(buf,
(buf, "MySQL thread id %lu, query id %lu",
thd->thread_id, thd->query_id));
if (thd->host)
{
*buf++=' ';
buf=strnmov(buf, thd->host, 30);
if (thd->host) {
*buf = ' ';
buf++;
buf = strnmov(buf, thd->host, 30);
}
if (thd->ip)
{
*buf++=' ';
buf=strnmov(buf, thd->ip, 20);
if (thd->ip) {
*buf = ' ';
buf++;
buf=strnmov(buf, thd->ip, 20);
}
if (thd->user)
{
*buf++=' ';
buf=strnmov(buf, thd->user, 20);
if (thd->user) {
*buf = ' ';
buf++;
buf=strnmov(buf, thd->user, 20);
}
if (thd->proc_info)
{
*buf++=' ';
buf=strnmov(buf, thd->proc_info, 50);
if (thd->proc_info) {
*buf = ' ';
buf++;
buf=strnmov(buf, thd->proc_info, 50);
}
if (thd->query)
{
*buf++=' ';
buf=strnmov(buf, thd->query, 150);
if (thd->query) {
*buf = '\n';
buf++;
buf=strnmov(buf, thd->query, 150);
}
buf[0]='\n';
buf[1]=0;
ut_a(strlen(buf) < 400);
buf[0] = '\n';
buf[1] = '\0'; /* Note that we must put a null character here to end
the printed string */
/* We test the printed length did not overrun the buffer length of
400 bytes */
ut_a(strlen(old_buf) < 400);
}
}