summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <dlenev@mysql.com>2004-10-07 13:51:32 +0400
committerunknown <dlenev@mysql.com>2004-10-07 13:51:32 +0400
commit0129f32bfcec1e0e283699d4dee7429d33906a79 (patch)
treeb8016f96ab99747f4023e506afd46eb4657a1b29 /libmysql
parent5b3444d2faf45786e5f6078e442e0514c8b2814e (diff)
parent34789efd3191d5a140c65dd17b459024c741c085 (diff)
downloadmariadb-git-0129f32bfcec1e0e283699d4dee7429d33906a79.tar.gz
Manual merge of tree containing fix for bug #5915 "ALTER TABLE behaves
differently when converting column to auto_increment in 4.1" with current tree. mysql-test/t/type_timestamp.test: Auto merged mysql-test/r/type_timestamp.result: Manual merge. sql/sql_table.cc: Manual merge.
Diffstat (limited to 'libmysql')
0 files changed, 0 insertions, 0 deletions