mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
22b92457fc
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822: Auto merged configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged mysql-test/t/udf.test: Auto merged mysql-test/t/warnings.test: Auto merged BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb: Auto merged sql/field.cc: Auto merged sql/handler.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.cc: Auto merged sql/sql_class.cc: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/r/sp.result: Manual merge. Place 5.0 test before 5.1 test. mysql-test/t/sp.test: Manual merge. Place 5.0 test before 5.1 test. mysys/my_bitmap.c: Manual merge. scripts/make_binary_distribution.sh: Manual merge. sql/Makefile.am: Manual merge. sql/slave.cc: Manual merge. sql/sql_class.h: Manual merge. sql/sql_parse.cc: Manual merge. sql/sql_select.cc: Manual merge. tests/mysql_client_test.c: Manual merge. |
||
---|---|---|
.. | ||
.cvsignore | ||
fill_func_tables.sh | ||
fill_help_tables.sh | ||
fill_help_tables.sql | ||
make_binary_distribution.sh | ||
make_sharedlib_distribution.sh | ||
make_win_bin_dist | ||
Makefile.am | ||
msql2mysql.sh | ||
mysql_config.sh | ||
mysql_convert_table_format.sh | ||
mysql_create_system_tables.sh | ||
mysql_find_rows.sh | ||
mysql_fix_extensions.sh | ||
mysql_fix_privilege_tables.sh | ||
mysql_fix_privilege_tables.sql | ||
mysql_install_db.sh | ||
mysql_secure_installation.sh | ||
mysql_setpermission.sh | ||
mysql_zap.sh | ||
mysqlaccess.conf | ||
mysqlaccess.sh | ||
mysqlbug.sh | ||
mysqld_multi.sh | ||
mysqld_safe.sh | ||
mysqldumpslow.sh | ||
mysqlhotcopy.sh |