diff options
| author | unknown <pekka@mysql.com> | 2005-04-01 10:13:37 +0200 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2005-04-01 10:13:37 +0200 |
| commit | cb1bdf4d84221312258dd8451f58c06337ff108d (patch) | |
| tree | 748a9a8f5a64181143501a3ccc782f1dfa1af35f /scripts | |
| parent | 5b0c75259c0b62a0a8efc4964fb70816e1d1954e (diff) | |
| parent | 8ef1afbaa4ba0c639f2ecf47853086e783cc1efa (diff) | |
| download | mariadb-git-cb1bdf4d84221312258dd8451f58c06337ff108d.tar.gz | |
Merge
mysql-test/r/group_by.result:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_select.cc:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
merge
sql/item_cmpfunc.cc:
merge
support-files/mysql.server.sh:
merge
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_win_src_distribution.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index efcbeffeb11..25f5726c35a 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -251,7 +251,7 @@ copy_dir_dirs() { for i in client dbug extra heap include \ libmysql libmysqld myisam \ - myisammrg mysys regex sql strings sql-common \ + myisammrg mysys regex sql strings sql-common sql/examples \ tools vio zlib do copy_dir_files $i |