mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

keep bk happy

Browse source 
Docs/manual.texi:
  Changelog
mysql-test/mysql-test-run.sh:
  Added missing --user
sql/ha_berkeley.cc:
  Fixed bug in SHOW LOGS
sql/item_func.cc:
  Cleanup; Fixed possible problem with NULL
sql/mini_client.cc:
  cleanup
sql/slave.cc:
  Cleanup
sql/sql_repl.cc:
  Fixed timing problem where we could miss a broadcast
sql/sql_show.cc:
  Fixed bug in SHOW LOGS when there wasn't any log files
This commit is contained in:
unknown 2001-01-22 04:46:32 +02:00
commit e99292d469
8 changed files with 414 additions and 400 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sql/item_func.cc
View file

@ -1399,14 +1399,18 @@ longlong Item_master_pos_wait::val_int()
String *log_name = args[0]->val_str(&value);
int event_count;
if(thd->slave_thread || !log_name || !log_name->length())
{
null_value = 1;
return 0;
}
null_value=0;
if (thd->slave_thread || !log_name || !log_name->length())
{
null_value = 1;
return 0;
}
ulong pos = (ulong)args[1]->val_int();
if((event_count = glob_mi.wait_for_pos(thd, log_name, pos)) == -1)
null_value = 1;;
if ((event_count = glob_mi.wait_for_pos(thd, log_name, pos)) == -1)
{
null_value = 1;
event_count=0;
}
return event_count;
}