diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-06-12 16:34:54 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-06-12 16:34:54 +0300 |
| commit | e53dfc6df42d83c45ec5121c98dcbcff7960beab (patch) | |
| tree | 49f65594ef7867ace676423b3635cec9297e4936 /sql/sql_plugin.h | |
| parent | 023f3dd0df68b04f5bca6e0a15f1f4d426731383 (diff) | |
| parent | 119412f8d0cc364678e8e3b3c36c42e6fea69e3d (diff) | |
| download | mariadb-git-e53dfc6df42d83c45ec5121c98dcbcff7960beab.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
mysql-test/r/insert_update.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/insert_update.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/item_func.cc:
merge of 5.0-opt -> 5.1-opt
sql/sql_insert.cc:
merge of 5.0-opt -> 5.1-opt
sql/structs.h:
merge of 5.0-opt -> 5.1-opt
tests/mysql_client_test.c:
merge of 5.0-opt -> 5.1-opt
Diffstat (limited to 'sql/sql_plugin.h')
0 files changed, 0 insertions, 0 deletions