mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
9a10c20ba9
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt BitKeeper/etc/ignore: auto-union client/mysql.cc: Auto merged client/mysqltest.c: Auto merged include/mysql_com.h: Auto merged libmysql/CMakeLists.txt: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/r/archive.result: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/delayed.result: Auto merged mysql-test/r/func_misc.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/suite/rpl/r/rpl_innodb_bug28430.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/func_misc.test: Auto merged mysql-test/t/information_schema.test: Auto merged mysql-test/t/merge.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_datetime.test: Auto merged mysql-test/t/variables.test: Auto merged mysys/queues.c: Auto merged sql/events.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_partition.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/protocol.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_partition.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_open.c: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/lib/mtr_report.pl: manual merge mysql-test/r/myisam.result: manual merge mysql-test/r/partition.result: manual merge mysql-test/r/user_var.result: manual merge mysql-test/t/myisam.test: manual merge mysql-test/t/partition.test: manual merge mysql-test/t/user_var.test: manual merge sql/item.h: manual merge sql/item_func.cc: manual merge storage/myisammrg/ha_myisammrg.cc: manual merge |
||
---|---|---|
.. | ||
loaddata_autocom_ndb.result | ||
ndb_alter_table.result | ||
ndb_alter_table2.result | ||
ndb_alter_table3.result | ||
ndb_backup_print.result | ||
ndb_basic.result | ||
ndb_binlog_basic.result | ||
ndb_binlog_ddl_multi.result | ||
ndb_binlog_discover.result | ||
ndb_binlog_format.result | ||
ndb_binlog_ignore_db.result | ||
ndb_binlog_log_bin.result | ||
ndb_binlog_multi.result | ||
ndb_bitfield.result | ||
ndb_blob.result | ||
ndb_blob_partition.result | ||
ndb_bug26793.result | ||
ndb_cache.result | ||
ndb_cache2.result | ||
ndb_cache_multi.result | ||
ndb_cache_multi2.result | ||
ndb_charset.result | ||
ndb_condition_pushdown.result | ||
ndb_config.result | ||
ndb_config2.result | ||
ndb_cursor.result | ||
ndb_database.result | ||
ndb_dd_alter.result | ||
ndb_dd_backuprestore.result | ||
ndb_dd_basic.result | ||
ndb_dd_ddl.result | ||
ndb_dd_disk2memory.result | ||
ndb_dd_dump.result | ||
ndb_dd_sql_features.result | ||
ndb_gis.result | ||
ndb_grant.result | ||
ndb_index.result | ||
ndb_index_ordered.result | ||
ndb_index_unique.result | ||
ndb_insert.result | ||
ndb_limit.result | ||
ndb_load.result | ||
ndb_loaddatalocal.result | ||
ndb_lock.result | ||
ndb_lock_table.result | ||
ndb_minmax.result | ||
ndb_multi.result | ||
ndb_multi_row.result | ||
ndb_partition_error.result | ||
ndb_partition_error2.result | ||
ndb_partition_key.result | ||
ndb_partition_list.result | ||
ndb_partition_range.result | ||
ndb_read_multi_range.result | ||
ndb_rename.result | ||
ndb_replace.result | ||
ndb_restore.result | ||
ndb_restore_compat.result | ||
ndb_restore_different_endian_data.result | ||
ndb_restore_partition.result | ||
ndb_restore_print.result | ||
ndb_row_format.result | ||
ndb_single_user.result | ||
ndb_sp.result | ||
ndb_subquery.result | ||
ndb_temporary.result | ||
ndb_transaction.result | ||
ndb_trigger.result | ||
ndb_truncate.result | ||
ndb_types.result | ||
ndb_update.result | ||
ndb_update_no_read.result | ||
ndb_view.result | ||
ndbapi.result | ||
ps_7ndb.result | ||
strict_autoinc_5ndb.result |