database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql-trunk-bugfixing -> mysql-trunk-innodb

Browse Source
This commit is contained in:
Vasil Dimov
2010-05-19 23:48:50 +03:00
parent 68f13abf54 759d5bc535
commit dc4a8b35a0
149 changed files with 1363 additions and 1186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/ctype_numconv.inc
View File

@ -457,6 +457,8 @@ select * from t1;
show create table t1;
drop table t1;
# Ensure that row_count() value is reset after drop table.
select 1;
select hex(concat(row_count()));
create table t1 as select concat(row_count()) as c1;
show create table t1;

2
mysql-test/include/mysqld--help.inc
View File

@ -23,7 +23,7 @@ perl;
while (<F>) {
next if 1../The following groups are read/;
# formatting, skip line consisting entirely of dashes and blanks
next if /^[\- ]+$/;
next if /^[\- ]+\s?$/;
next if /Value \(after reading options\)/; # skip table header
next if /^($re1) /;
next if /^($re2)-/;