mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 15:24:16 +01:00
33a2716a85
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new Makefile.am: Auto merged client/mysqltest.c: Auto merged configure.in: Auto merged extra/Makefile.am: Auto merged include/Makefile.am: Auto merged include/my_global.h: Auto merged libmysqld/examples/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/r/ndb_alter_table.result: Auto merged mysql-test/t/ndb_alter_table.test: Auto merged scripts/Makefile.am: Auto merged sql/Makefile.am: Auto merged sql/field.cc: Auto merged sql/ha_federated.cc: Auto merged sql/ha_federated.h: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_subselect.cc: Auto merged sql/key.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged sql/tztime.cc: Auto merged storage/myisam/myisamchk.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/ndb/docs/Makefile.am: Auto merged support-files/mysql.spec.sh: Auto merged libmysqld/Makefile.am: Merged from 5.0 to 5.1. sql/ha_berkeley.cc: Merged from 5.0 to 5.1. sql/lex.h: Merged from 5.0 to 5.1. sql/set_var.cc: Merged from 5.0 to 5.1. sql/share/errmsg.txt: Merged from 5.0 to 5.1. sql/sql_lex.h: Merged from 5.0 to 5.1. sql/sql_show.cc: Merged from 5.0 to 5.1. sql/sql_yacc.yy: Merged from 5.0 to 5.1. |
||
---|---|---|
.. | ||
big_test.inc | ||
check_var_limit.inc | ||
common-tests.inc | ||
ctype_common.inc | ||
ctype_filesort.inc | ||
ctype_innodb_like.inc | ||
ctype_like_escape.inc | ||
endspace.inc | ||
federated.inc | ||
federated_cleanup.inc | ||
gis_generic.inc | ||
have_archive.inc | ||
have_bdb.inc | ||
have_big5.inc | ||
have_blackhole.inc | ||
have_compress.inc | ||
have_cp932.inc | ||
have_cp1250_ch.inc | ||
have_crypt.inc | ||
have_csv.inc | ||
have_debug.inc | ||
have_eucjpms.inc | ||
have_exampledb.inc | ||
have_federated_db.inc | ||
have_gbk.inc | ||
have_geometry.inc | ||
have_innodb.inc | ||
have_lowercase0.inc | ||
have_multi_ndb.inc | ||
have_ndb.inc | ||
have_openssl.inc | ||
have_outfile.inc | ||
have_partition.inc | ||
have_query_cache.inc | ||
have_sjis.inc | ||
have_tis620.inc | ||
have_ucs2.inc | ||
have_ujis.inc | ||
im_check_os.inc | ||
is_debug_build.inc | ||
master-slave.inc | ||
mysqltest-x.inc | ||
mysqltest_while.inc | ||
ndb_default_cluster.inc | ||
not_embedded.inc | ||
not_openssl.inc | ||
not_windows.inc | ||
ps_conv.inc | ||
ps_create.inc | ||
ps_modify.inc | ||
ps_modify1.inc | ||
ps_query.inc | ||
ps_renew.inc | ||
rpl_stmt_seq.inc | ||
show_msg.inc | ||
show_msg80.inc | ||
system_db_struct.inc | ||
test_outfile.inc | ||
testdb_only.inc | ||
varchar.inc | ||
windows.inc |