diff options
| author | unknown <serg@janus.mylan> | 2007-03-16 14:09:30 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-03-16 14:09:30 +0100 |
| commit | 8b110160340bf8f870cb516f9b91e33f3c4b3885 (patch) | |
| tree | f06b9c071ca6d1f50f2856a14063f336cedd384d /sql/mysql_priv.h | |
| parent | 917cec7195276c0b8043d40e97b2ff8d250d8ca0 (diff) | |
| parent | b64a40601310a5e7614aaab6ef4e735b3a7bb3c1 (diff) | |
| download | mariadb-git-8b110160340bf8f870cb516f9b91e33f3c4b3885.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
include/my_global.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_servers.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/tztime.cc:
Auto merged
storage/heap/ha_heap.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisammrg/ha_myisammrg.h:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index efcbdf968bf..d2e37e059a7 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1492,7 +1492,7 @@ void print_plan(JOIN* join,uint idx, double record_count, double read_time, void mysql_print_status(); /* key.cc */ int find_ref_key(KEY *key, uint key_count, byte *record, Field *field, - uint *key_length); + uint *key_length, uint *keypart); void key_copy(byte *to_key, byte *from_record, KEY *key_info, uint key_length); void key_restore(byte *to_record, byte *from_key, KEY *key_info, uint key_length); |