diff options
| author | unknown <kaa@kaamos.(none)> | 2008-02-13 12:12:00 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-02-13 12:12:00 +0300 |
| commit | 91123903145baffbfdc4a864ef02f1f0b6b66744 (patch) | |
| tree | 32093b4d9c9eff7578d39bb14fee8bbbdcf1dc4b /include/mysql_embed.h | |
| parent | 00b17696efc6e4ffc70abdbea4b76b88b397b910 (diff) | |
| parent | c6610b57912ba010acf9ead06095309bf71f7c96 (diff) | |
| download | mariadb-git-91123903145baffbfdc4a864ef02f1f0b6b66744.tar.gz | |
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
into kaamos.(none):/data/src/opt/mysql-5.1-opt
mysql-test/r/heap.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
BitKeeper/deleted/.del-bdb.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/type_binary.result:
Auto merged
mysql-test/r/type_set.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/range.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysql-test/t/warnings.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/mysqld.cc:
Null merge.
mysql-test/include/mix1.inc:
Manual merge.
mysql-test/r/innodb_mysql.result:
Manual merge.
mysql-test/r/range.result:
Manual merge.
mysql-test/r/sp.result:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
sql/handler.cc:
Manual merge.
Diffstat (limited to 'include/mysql_embed.h')
0 files changed, 0 insertions, 0 deletions