database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merged with mysql-5.1 tree.

Browse Source 
client/mysqltest.cc:
  Manually merged
configure.in:
  Manually merged
mysql-test/r/variables.result:
  Manually merged
mysql-test/t/variables.test:
  Manually merged
mysys/my_pread.c:
  Manually merged
mysys/my_read.c:
  Manually merged
sql/mysqld.cc:
  Manually merged
storage/csv/ha_tina.h:
  Manually merged
storage/myisam/ha_myisam.cc:
  Manually merged
storage/myisam/mi_check.c:
  Manually merged
storage/myisam/mi_search.c:
  Manually merged
This commit is contained in:
Michael Widenius
2009-04-25 13:05:32 +03:00
parent 210a412522 086185089e
commit e726e587ec
264 changed files with 4589 additions and 1605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/event_data_objects.cc
View File

@ -380,7 +380,7 @@ bool
Event_job_data::load_from_row(THD *thd, TABLE *table)
{
char *ptr;
uint len;
size_t len;
LEX_STRING tz_name;
DBUG_ENTER("Event_job_data::load_from_row");
@ -580,7 +580,7 @@ bool
Event_timed::load_from_row(THD *thd, TABLE *table)
{
char *ptr;
uint len;
size_t len;
DBUG_ENTER("Event_timed::load_from_row");