mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
4ad51359c1
(Includes merge of arena code in 4.1 and 5.0) BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union VC++Files/sql/mysqld.dsp: Auto merged client/mysql.cc: Auto merged client/mysqltest.c: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged innobase/row/row0sel.c: Auto merged libmysql/client_settings.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/examples/Makefile.am: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/mi_check.c: Auto merged myisam/myisamchk.c: Auto merged myisam/sort.c: Auto merged mysql-test/r/connect.result: Auto merged mysql-test/r/ctype_recoding.result: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/func_in.result: Auto merged mysql-test/r/func_like.result: Auto merged mysql-test/r/gis.result: Auto merged mysql-test/r/having.result: Auto merged mysql-test/r/heap.result: Auto merged mysql-test/r/join.result: Auto merged mysql-test/r/key.result: Auto merged mysql-test/r/lowercase_table.result: Auto merged mysql-test/r/ndb_autodiscover.result: Auto merged mysql-test/r/null.result: Auto merged mysql-test/r/olap.result: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/range.result: Auto merged mysql-test/r/rename.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/null.test: Auto merged mysql-test/t/ps_1general.test: Auto merged mysql-test/t/rpl_charset.test: Auto merged mysql-test/t/rpl_heap.test: Auto merged mysql-test/t/rpl_relayrotate.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/variables.test: Auto merged netware/mysql_test_run.c: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysql_create_system_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sql: Auto merged scripts/mysql_install_db.sh: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_create.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/lex.h: Auto merged sql/lock.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_sum.cc: Auto merged sql/protocol.cc: Auto merged sql/records.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_string.h: Auto merged sql/table.cc: Auto merged sql-common/client.c: Auto merged client/mysqlbinlog.cc: Merge with 4.1 configure.in: Merge with 4.1 include/mysqld_error.h: Add new error message (1) from 4.1 mysql-test/mysql-test-run.sh: Merge with 4.1 mysql-test/r/func_gconcat.result: Merge with 4.1 mysql-test/r/func_if.result: Merge with 4.1 mysql-test/r/grant.result: Merge with 4.1 mysql-test/r/join_outer.result: Merge with 4.1 mysql-test/r/rpl_charset.result: Merge with 4.1 (This has to be fixed before pushing) mysql-test/r/system_mysql_db.result: Merge with 4.1. Added collation to new privileges mysql-test/t/grant.test: Merge with 4.1 mysql-test/t/grant_cache.test: Merge with 4.1 mysql-test/t/show_check.test: Merge with 4.1 sql/Makefile.am: Merge with 4.1 sql/item.cc: Merge with 4.1 sql/item_cmpfunc.cc: Merge with 4.1 (arena code) sql/item_subselect.cc: Merge with 4.1 sql/item_subselect.h: Merge with 4.1 sql/item_sum.cc: Merge with 4.1 sql/item_sum.h: Merge with 4.1 sql/log.cc: Merge with 4.1 (Remove code that is not relevant for 5.0) sql/mysqld.cc: Merge with 4.1 sql/opt_range.cc: Merge with 4.1 sql/share/czech/errmsg.txt: Merge with 4.1 sql/share/danish/errmsg.txt: Merge with 4.1 sql/share/dutch/errmsg.txt: Merge with 4.1 sql/share/english/errmsg.txt: Merge with 4.1 sql/share/estonian/errmsg.txt: Merge with 4.1 sql/share/french/errmsg.txt: Merge with 4.1 sql/share/german/errmsg.txt: Merge with 4.1 sql/share/greek/errmsg.txt: Merge with 4.1 sql/share/hungarian/errmsg.txt: Merge with 4.1 sql/share/italian/errmsg.txt: Merge with 4.1 sql/share/japanese/errmsg.txt: Merge with 4.1 sql/share/korean/errmsg.txt: Merge with 4.1 sql/share/norwegian-ny/errmsg.txt: Merge with 4.1 sql/share/norwegian/errmsg.txt: Merge with 4.1 sql/share/polish/errmsg.txt: Merge with 4.1 sql/share/portuguese/errmsg.txt: Merge with 4.1 sql/share/romanian/errmsg.txt: Merge with 4.1 sql/share/russian/errmsg.txt: Merge with 4.1 sql/share/serbian/errmsg.txt: Merge with 4.1 sql/share/slovak/errmsg.txt: Merge with 4.1 sql/share/spanish/errmsg.txt: Merge with 4.1 sql/share/swedish/errmsg.txt: Merge with 4.1 sql/share/ukrainian/errmsg.txt: Merge with 4.1 sql/sql_base.cc: Merge with 4.1 sql/sql_class.cc: Merge with 4.1 Use arena code from 4.1 sql/sql_class.h: Merge with 4.1 Use arena code from 4.1 sql/sql_derived.cc: Merge with 4.1 sql/sql_lex.cc: Merge with 4.1 sql/sql_lex.h: Merge with 4.1 sql/sql_parse.cc: Merge with 4.1 sql/sql_prepare.cc: Merge with 4.1 sql/sql_select.cc: Merge with 4.1 sql/sql_table.cc: Merge with 4.1 sql/sql_union.cc: Merge with 4.1 sql/sql_yacc.yy: Merge with 4.1 sql/tztime.cc: Merge with 4.1 tests/client_test.c: Merge with 4.1 |
||
---|---|---|
.. | ||
btr0btr.h | ||
btr0btr.ic | ||
btr0cur.h | ||
btr0cur.ic | ||
btr0pcur.h | ||
btr0pcur.ic | ||
btr0sea.h | ||
btr0sea.ic | ||
btr0types.h | ||
buf0buf.h | ||
buf0buf.ic | ||
buf0flu.h | ||
buf0flu.ic | ||
buf0lru.h | ||
buf0lru.ic | ||
buf0rea.h | ||
buf0types.h | ||
data0data.h | ||
data0data.ic | ||
data0type.h | ||
data0type.ic | ||
data0types.h | ||
db0err.h | ||
dict0boot.h | ||
dict0boot.ic | ||
dict0crea.h | ||
dict0crea.ic | ||
dict0dict.h | ||
dict0dict.ic | ||
dict0load.h | ||
dict0load.ic | ||
dict0mem.h | ||
dict0mem.ic | ||
dict0types.h | ||
dyn0dyn.h | ||
dyn0dyn.ic | ||
eval0eval.h | ||
eval0eval.ic | ||
eval0proc.h | ||
eval0proc.ic | ||
fil0fil.h | ||
fsp0fsp.h | ||
fsp0fsp.ic | ||
fut0fut.h | ||
fut0fut.ic | ||
fut0lst.h | ||
fut0lst.ic | ||
ha0ha.h | ||
ha0ha.ic | ||
hash0hash.h | ||
hash0hash.ic | ||
ibuf0ibuf.h | ||
ibuf0ibuf.ic | ||
ibuf0types.h | ||
lock0lock.h | ||
lock0lock.ic | ||
lock0types.h | ||
log0log.h | ||
log0log.ic | ||
log0recv.h | ||
log0recv.ic | ||
mach0data.h | ||
mach0data.ic | ||
Makefile.am | ||
Makefile.i | ||
makefilewin.i | ||
mem0dbg.h | ||
mem0dbg.ic | ||
mem0mem.h | ||
mem0mem.ic | ||
mem0pool.h | ||
mem0pool.ic | ||
mtr0log.h | ||
mtr0log.ic | ||
mtr0mtr.h | ||
mtr0mtr.ic | ||
mtr0types.h | ||
os0file.h | ||
os0proc.h | ||
os0proc.ic | ||
os0sync.h | ||
os0sync.ic | ||
os0thread.h | ||
os0thread.ic | ||
page0cur.h | ||
page0cur.ic | ||
page0page.h | ||
page0page.ic | ||
page0types.h | ||
pars0grm.h | ||
pars0opt.h | ||
pars0opt.ic | ||
pars0pars.h | ||
pars0pars.ic | ||
pars0sym.h | ||
pars0sym.ic | ||
pars0types.h | ||
que0que.h | ||
que0que.ic | ||
que0types.h | ||
read0read.h | ||
read0read.ic | ||
read0types.h | ||
rem0cmp.h | ||
rem0cmp.ic | ||
rem0rec.h | ||
rem0rec.ic | ||
rem0types.h | ||
row0ins.h | ||
row0ins.ic | ||
row0mysql.h | ||
row0mysql.ic | ||
row0purge.h | ||
row0purge.ic | ||
row0row.h | ||
row0row.ic | ||
row0sel.h | ||
row0sel.ic | ||
row0types.h | ||
row0uins.h | ||
row0uins.ic | ||
row0umod.h | ||
row0umod.ic | ||
row0undo.h | ||
row0undo.ic | ||
row0upd.h | ||
row0upd.ic | ||
row0vers.h | ||
row0vers.ic | ||
srv0que.h | ||
srv0srv.h | ||
srv0srv.ic | ||
srv0start.h | ||
sync0arr.h | ||
sync0arr.ic | ||
sync0rw.h | ||
sync0rw.ic | ||
sync0sync.h | ||
sync0sync.ic | ||
sync0types.h | ||
thr0loc.h | ||
thr0loc.ic | ||
trx0purge.h | ||
trx0purge.ic | ||
trx0rec.h | ||
trx0rec.ic | ||
trx0roll.h | ||
trx0roll.ic | ||
trx0rseg.h | ||
trx0rseg.ic | ||
trx0sys.h | ||
trx0sys.ic | ||
trx0trx.h | ||
trx0trx.ic | ||
trx0types.h | ||
trx0undo.h | ||
trx0undo.ic | ||
univ.i | ||
usr0sess.h | ||
usr0sess.ic | ||
usr0types.h | ||
ut0byte.h | ||
ut0byte.ic | ||
ut0dbg.h | ||
ut0lst.h | ||
ut0mem.h | ||
ut0mem.ic | ||
ut0rnd.h | ||
ut0rnd.ic | ||
ut0sort.h | ||
ut0ut.h | ||
ut0ut.ic |