diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-04 19:21:51 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-04 19:21:51 +0300 |
| commit | 0bc40737801e8dc755393f0b0e1d9a5aad347be5 (patch) | |
| tree | 6b8e47374bf313429416a26678bc409946f34772 /sql/sql_string.h | |
| parent | f2131b4417d7d648d61070c61e1f37453fec1faf (diff) | |
| parent | 8b752028da938d1259d44545e6d60d5cb52da653 (diff) | |
| download | mariadb-git-0bc40737801e8dc755393f0b0e1d9a5aad347be5.tar.gz | |
Merge with 4.0.13
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
Auto merged
client/mysqltest.c:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/errors.result:
Auto merged
mysql-test/r/loaddata.result:
Auto merged
mysql-test/r/rpl_insert_id.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/std_data/rpl_loaddata2.dat:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/raid.test:
Auto merged
mysql-test/t/rpl_insert_id.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/time.cc:
Auto merged
configure.in:
No changes
libmysqld/lib_sql.cc:
No changes
Diffstat (limited to 'sql/sql_string.h')
0 files changed, 0 insertions, 0 deletions