← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/sql_class.h

Committer: Monty Taylor
Date: 2008-07-15 19:25:48 UTC
mfrom: (77.5.1 glibclient-monty)
mto: (77.3.21 glibclient)
mto: This revision was merged to the branch mainline in revision 176.
Revision ID: mordred@camelot-20080715192548-cdn359fynupsdrvi

Merged in Jay's tree.

files modified:
client/drizzle.c

client/drizzleadmin.cc

client/drizzledump.c

client/drizzletest.cc

client/mysqlslap.c

config/ac-macros/readline.m4

extra/comp_err.c

include/drizzle.h

include/drizzle_com.h

include/drizzle_h.ic

include/my_base.h

include/my_global.h

include/my_time.h

include/my_trie.h

include/sql_common.h

libdrizzle/client.c

libdrizzle/libdrizzle.c

libdrizzle/my_time.c

libdrizzle/net_serv.c

libdrizzle/password.c

mysys/array.c

mysys/charset-def.c

mysys/charset.c

mysys/default_modify.c

mysys/hash.c

mysys/mf_arr_appstr.c

mysys/mf_iocache2.c

mysys/mf_tempdir.c

mysys/my_bitmap.c

mysys/my_getopt.c

mysys/my_getwd.c

mysys/queues.c

mysys/string.c

mysys/thr_lock.c

mysys/trie.c

server/binlog/drizzlebinlog.cc

server/drizzled.cc

server/field.cc

server/field_conv.cc

server/handler.cc

server/item.cc

server/item.h

server/item_cmpfunc.cc

server/item_func.cc

server/item_strfunc.cc

server/item_sum.h

server/item_timefunc.cc

server/log_event.h

server/opt_sum.cc

server/sql_class.h

server/sql_crypt.cc

server/sql_crypt.h

server/sql_delete.cc

server/sql_insert.cc

server/sql_parse.cc

server/sql_plugin.cc

server/sql_show.cc

server/sql_string.h

server/structs.h

server/table.cc

server/unireg.cc

storage/archive/concurrency_test.c

storage/archive/ha_archive.cc

storage/csv/ha_tina.cc

storage/heap/ha_heap.cc

storage/innobase/handler/ha_innodb.cc

storage/myisam/ha_myisam.cc

storage/myisam/mf_keycache.c

storage/myisam/mi_check.c

storage/myisam/mi_create.c

storage/myisam/mi_open.c

storage/myisam/myisamchk.c

storage/myisam/myisampack.c

storage/myisam/sort.c

strings/ctype-bin.c

strings/ctype-simple.c

strings/ctype-utf8.c

strings/ctype.c

strings/decimal.c

strings/dtoa.c

strings/my_strtoll10.c

tests/drizzle-test-run.pl

tests/lib/mtr_cases.pl

tests/lib/mtr_process.pl

vio/viosocket.c

Show diffs side-by-side

added added

removed removed

server/sql_class.h

1366

1366

inline void force_one_auto_inc_interval(uint64_t next_id)

1367

1367

{

1368

1368

auto_inc_intervals_forced.empty(); // in case of multiple SET INSERT_ID

1369

auto_inc_intervals_forced.append(next_id, ULONGLONG_MAX, 0);

1369

auto_inc_intervals_forced.append(next_id, UINT64_MAX, 0);

1370

1370

}

1371

1371

1372

1372

uint64_t limit_found_rows;

Older »