database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

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

Browse Source 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
This commit is contained in:
stewart@willster.(none)
2006-10-16 17:39:38 +10:00
parent 848f91799c 57a97f53bc
commit c1903d967a
26 changed files with 83 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/examples/ha_example.cc
View File

@@ -523,10 +523,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);
}

2
sql/examples/ha_example.h
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);

4
sql/examples/ha_tina.cc
View File

@@ -792,13 +792,13 @@ int ha_tina::rnd_pos(byte * buf, byte *pos)
Currently this table handler doesn't implement most of the fields
really needed. SHOW also makes use of this data
*/
void ha_tina::info(uint flag)
int ha_tina::info(uint flag)
{
DBUG_ENTER("ha_tina::info");
/* This is a lie, but you don't want the optimizer to see zero or 1 */
if (!records_is_known && records < 2)
records= 2;
DBUG_VOID_RETURN;
DBUG_RETURN(0);
}
/*

2
sql/examples/ha_tina.h
View File

@@ -105,7 +105,7 @@ public:
int rnd_pos(byte * buf, byte *pos);
int rnd_end();
void position(const byte *record);
void info(uint);
int info(uint);
int extra(enum ha_extra_function operation);
int reset(void);
int external_lock(THD *thd, int lock_type);