mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
d288993577
typo/bad merge fixed chmod a-x for man/*.1 files man/isamchk.1: Change mode to -rw-rw-r-- man/mysqlaccess.1: Change mode to -rw-rw-r-- man/mysqladmin.1: Change mode to -rw-rw-r-- man/mysqld.1: Change mode to -rw-rw-r-- man/mysqldump.1: Change mode to -rw-rw-r-- man/mysqlshow.1: Change mode to -rw-rw-r-- man/perror.1: Change mode to -rw-rw-r-- man/safe_mysqld.1: Change mode to -rw-rw-r-- mysql-test/r/handler.result: new tests added client/mysqltest.c: bug fixed: errors from handler.test (that is send_error() after send_fields) weren't catched by expected_errno mysql-test/t/handler.test: typo fixed sql/Makefile.am: bad merge fixed sql/sql_yacc.yy: bad merge (?) fixed
87 lines
501 B
Text
87 lines
501 B
Text
a b
|
|
14 aaa
|
|
a b
|
|
15 bbb
|
|
a b
|
|
16 ccc
|
|
a b
|
|
15 bbb
|
|
a b
|
|
22 iii
|
|
a b
|
|
21 hhh
|
|
a b
|
|
20 ggg
|
|
a b
|
|
14 aaa
|
|
a b
|
|
a b
|
|
22 iii
|
|
a b
|
|
21 hhh
|
|
a b
|
|
22 iii
|
|
a b
|
|
a b
|
|
15 bbb
|
|
a b
|
|
16 ccc
|
|
a b
|
|
19 fff
|
|
a b
|
|
19 yyy
|
|
a b
|
|
19 fff
|
|
a b
|
|
a b
|
|
14 aaa
|
|
a b
|
|
18 eee
|
|
a b
|
|
18 eee
|
|
a b
|
|
19 fff
|
|
a b
|
|
18 eee
|
|
a b
|
|
17 ddd
|
|
a b
|
|
14 aaa
|
|
15 bbb
|
|
16 ccc
|
|
16 xxx
|
|
17 ddd
|
|
a b
|
|
18 eee
|
|
19 fff
|
|
19 yyy
|
|
a b
|
|
19 fff
|
|
18 eee
|
|
17 ddd
|
|
16 xxx
|
|
16 ccc
|
|
15 bbb
|
|
14 aaa
|
|
a b
|
|
16 ccc
|
|
16 xxx
|
|
17 ddd
|
|
18 eee
|
|
a b
|
|
17 ddd
|
|
18 eee
|
|
a b
|
|
22 iii
|
|
21 hhh
|
|
20 ggg
|
|
a b
|
|
19 fff
|
|
a b
|
|
19 yyy
|
|
a b
|
|
17 ddd
|
|
a b
|
|
18 eee
|
|
a b
|
|
19 fff
|