1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge

into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
This commit is contained in:
stewart@willster.(none)
2006-10-18 18:51:39 +10:00
26 changed files with 79 additions and 42 deletions

View File

@ -530,10 +530,10 @@ int ha_example::rnd_pos(byte * buf, byte *pos)
sql_update.cc
*/
void ha_example::info(uint flag)
int ha_example::info(uint flag)
{
DBUG_ENTER("ha_example::info");
DBUG_VOID_RETURN;
DBUG_RETURN(0);
}

View File

@ -136,7 +136,7 @@ public:
int rnd_next(byte *buf); //required
int rnd_pos(byte * buf, byte *pos); //required
void position(const byte *record); //required
void info(uint); //required
int info(uint); //required
int extra(enum ha_extra_function operation);
int reset(void);