diff options
| author | unknown <igor@rurik.mysql.com> | 2006-04-17 16:40:16 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-04-17 16:40:16 -0700 |
| commit | 7b6c5a6b76dbcf749d9d0efcc1f47aba69c4d61d (patch) | |
| tree | 5152e7f18e7fd82e7327f75e9bd88fb6ec68616f /mysql-test/t/user_limits.test | |
| parent | 366d7afc67cd437bed5cfcd8f77995051fbe94b9 (diff) | |
| parent | f3f6514f4fd73478cdbd369f26d45ce9d74ccea3 (diff) | |
| download | mariadb-git-7b6c5a6b76dbcf749d9d0efcc1f47aba69c4d61d.tar.gz | |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into rurik.mysql.com:/home/igor/mysql-5.1
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/user_limits.test')
0 files changed, 0 insertions, 0 deletions