summaryrefslogtreecommitdiff
path: root/libmysql_r
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2007-04-26 11:51:37 -0400
committerunknown <cmiller@zippy.cornsilk.net>2007-04-26 11:51:37 -0400
commit808beaa51df9178e13bde87429ef699c75d51445 (patch)
treeeb53ce8e1bbaa9420298b4d71fd9100db7d63374 /libmysql_r
parent0d3c4483530469670b05acc77b853aad6b78a6e7 (diff)
parenta318c75af76c8676cfe45dc154685a6e0e283cfa (diff)
downloadmariadb-git-808beaa51df9178e13bde87429ef699c75d51445.tar.gz
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community include/config-win.h: Auto merged myisam/mi_open.c: Auto merged mysql-test/r/func_in.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/t/func_in.test: Auto merged ndb/src/ndbapi/DictCache.cpp: Auto merged sql/ha_archive.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: 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/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.h: Auto merged configure.in: Version increment. support-files/mysql.spec.sh: Include enterprise advert.
Diffstat (limited to 'libmysql_r')
0 files changed, 0 insertions, 0 deletions