diff options
author | unknown <msvensson@shellback.(none)> | 2006-09-01 11:23:08 +0200 |
---|---|---|
committer | unknown <msvensson@shellback.(none)> | 2006-09-01 11:23:08 +0200 |
commit | 4991cc07e5ec7a982145fa74539977bcedb0af30 (patch) | |
tree | f8c7e6cc8b0bf666906a0c4e12e7ac8ba06ba7cb /mysql-test/r/bigint.result | |
parent | 22d76f5a5520f384985e7de1dc30b2c3cd4d0feb (diff) | |
parent | 5d58edf00ffb3ebdb857dfe3d07e6aff0343b0ed (diff) | |
download | mariadb-git-4991cc07e5ec7a982145fa74539977bcedb0af30.tar.gz |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
configure.in:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/partition_mgm.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/bigint.result')
0 files changed, 0 insertions, 0 deletions