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/5.0/bug19914-mk2-merge

Browse Source 
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
parent 73831dad50 fff4559edd
commit 71636edc16
26 changed files with 79 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/ha_ndbcluster.h
View File

@@ -673,7 +673,7 @@ class ha_ndbcluster: public handler
bool get_error_message(int error, String *buf);
ha_rows records();
void info(uint);
int info(uint);
void get_dynamic_partition_info(PARTITION_INFO *stat_info, uint part_id);
int extra(enum ha_extra_function operation);
int extra_opt(enum ha_extra_function operation, ulong cache_size);
@@ -878,7 +878,7 @@ private:
int check_ndb_connection(THD* thd= current_thd);
void set_rec_per_key();
void records_update();
int records_update();
void no_uncommitted_rows_execute_failure();
void no_uncommitted_rows_update(int);
void no_uncommitted_rows_reset(THD *);