diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-07-16 13:35:49 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-07-16 13:35:49 +0300 |
| commit | 9f96097a05f6fb4abd25d09c85e92cdb94b486c9 (patch) | |
| tree | f3c57c5fd6cc4a9f9b08bf54958d924533e09f99 /sql/net_serv.cc | |
| parent | ee45ab069478f532488befac0464c780c2f46f45 (diff) | |
| download | mariadb-git-9f96097a05f6fb4abd25d09c85e92cdb94b486c9.tar.gz | |
mysql client: Ignore --comments at start of command line. This allows one to more easily run mysqltest tests trough the command line.
Fixed bug: LP#603026 RQG: pagecache_read: Assertion `pageno < ((1ULL) << 40)' on OPTIMIZE TABLE of a Maria table
client/mysql.cc:
Removed Oracle copyright from stdout, as Oracle doesn't have copyright to all code in this file.
Ignore --comments at start of command line. This allows one to more easily run mysqltest tests trough the command line.
mysql-test/suite/maria/r/optimize.result:
Added test for LP#603026
mysql-test/suite/maria/t/optimize.test:
Added test for LP#603026
sql/net_serv.cc:
Removed DBUG_ASSERT(), as this code can happen during testing.
storage/maria/ma_check.c:
Fixed bug: LP#603026 RQG: pagecache_read: Assertion `pageno < ((1ULL) << 40)' on OPTIMIZE TABLE of a Maria table
The problem was duplicated memory usage with long packed keys.
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 5df98662fe7..49199ccb6e4 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -920,7 +920,6 @@ my_real_read(NET *net, size_t *complen) (int) net->buff[net->where_b + 3], (uint) (uchar) net->pkt_nr); fflush(stderr); - DBUG_ASSERT(0); #endif } len= packet_error; |