Commits · 9e1c34d8838dc8566d373d7e797c41b69c110cc0 · nexedi / MariaDB

07 Mar, 2002 3 commits
- tests for bug fix · 9e1c34d8
  unknown authored Mar 07, 2002
  
  9e1c34d8
- Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · 1bed3713
  unknown authored Mar 07, 2002
```
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


sql/sql_yacc.yy:
  Auto merged
```
  1bed3713
- better fix for a bug fix from yesterday · cc2b0e8d
  unknown authored Mar 07, 2002
  
  cc2b0e8d
06 Mar, 2002 12 commits

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · cffe13d5
unknown authored Mar 07, 2002
```
Docs/manual.texi:
  Auto merged
```
cffe13d5
Update test results · 49717805
unknown authored Mar 07, 2002

49717805
manual.texi Document when --xml was added to mysql/mysqldump. · 3959334b
unknown authored Mar 06, 2002
```
Docs/manual.texi:
  Document when --xml was added to mysql/mysqldump.
```
3959334b
Merge paul@work.mysql.com:/home/bk/mysql-4.0 · 93803ebb
unknown authored Mar 06, 2002
```
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
```
93803ebb

merge · ed12abb2

unknown authored Mar 06, 2002


BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

ed12abb2

merge · eca1e0e3

unknown authored Mar 06, 2002


configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
libmysql/libmysql.c:
  Auto merged

eca1e0e3

Portability fixes · 39d05031

unknown authored Mar 06, 2002

Fix bug when using option groups


libmysql/libmysql.c:
  Fix bug when using option groups
myisam/myisamchk.c:
  Portability fix
mysys/my_getopt.c:
  Portability fix

39d05031

Fix for --enable-local-infile · 57b2bd79

unknown authored Mar 06, 2002


Docs/manual.texi:
  Changelog
acinclude.m4:
  Cleanup --help output
libmysql/libmysql.c:
  Fix for reading option groups in client

57b2bd79

merge · 8b1b90dd

unknown authored Mar 06, 2002


BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
strings/Makefile.am:
  Auto merged

8b1b90dd

Fixed bug in DATE_FORMAT when used with GROUP BY · 1f5341d3

unknown authored Mar 06, 2002


Build-tools/Do-compile:
  Fixed typo
Docs/manual.texi:
  Changelog
mysql-test/r/type_date.result:
  Added test of bug in DATE_FORMAT
mysql-test/t/type_date.test:
  Added test of bug in DATE_FORMAT
scripts/mysqlhotcopy.sh:
  Fix for RAID files
sql/table.cc:
  Fixed typo in last patch

1f5341d3

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · 31f95f4c
unknown authored Mar 06, 2002
```
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
```
31f95f4c
iA fix for small bug that returns wrong index instead of enf of file · a59ae03d
unknown authored Mar 06, 2002

a59ae03d

05 Mar, 2002 10 commits

Use portable comments in assembler files · 0b7136f4
unknown authored Mar 05, 2002
```
Docs/manual.texi:
  Updated autoconf information
```
0b7136f4

Merge work:/home/bk/mysql-4.0 · 7c5c7103

unknown authored Mar 05, 2002

into mysql.sashanet.com:/reiser-data/mysql-4.0


Docs/manual.texi:
  Auto merged

7c5c7103

replication documentation update · 251fd861
unknown authored Mar 05, 2002

251fd861

Corrected fix for not freed memory when using corrupted tables · 748aac23

unknown authored Mar 05, 2002


Docs/manual.texi:
  Changelog
configure.in:
  Version change
sql/sql_base.cc:
  Correct fix for not freed memory when using corrupted tables
sql/table.cc:
  Correct fix for not freed memory when using corrupted tables

748aac23

Merge hundin:/my/mysql-3.23 into tik.mysql.fi:/home/my/mysql-3.23 · 6f38dfcc
unknown authored Mar 05, 2002
```
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
```
6f38dfcc

Update scripts for new POSIX spec · fc5ef361

unknown authored Mar 05, 2002

Fix for --enable-local-infile
Portability fix for bison


bdb/dist/s_recover:
  Update for new POSIX spec
configure.in:
  Fix for --enable-local-infile
libmysql/libmysql.c:
  Cleanup
mysql-test/mysql-test-run.sh:
  Update for new POSIX spec
scripts/safe_mysqld.sh:
  Update for new POSIX spec
sql-bench/server-cfg.sh:
  Update for new POSIX spec
sql/sql_yacc.yy:
  Portability fix for bison

fc5ef361

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · 1b16ce5b
unknown authored Mar 05, 2002
```
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
```
1b16ce5b

several bug fixes and tests · 417103de

unknown authored Mar 05, 2002


mysql-test/mysql-test-run.sh:
  Fix for LOAD DATA LOCAL ...
mysql-test/r/select_found.result:
  Added result for a new test of combo of options for FOUND_ROWS and
  BUFFER_RESULT
mysql-test/t/select_found.test:
  Added test for combo of options for BUFFER_RESULT and FOUND_ROWS
sql/sql_select.cc:
  Added fix for combo of options for BUFFER_RESULT and FOUND_ROWS

417103de

Merge arjen@work.mysql.com:/home/bk/mysql-4.0 · b265aadf
unknown authored Mar 05, 2002
```
into co3064164-a.bitbike.com:/home/arjen/mysql-4.0


Docs/manual.texi:
  Auto merged
```
b265aadf
Fixup of some titles (length and caps). · 19890949
unknown authored Mar 05, 2002

19890949

04 Mar, 2002 3 commits
- Support for running different versions of mysqld with mysqld_multi · 6d0ecd86
  unknown authored Mar 04, 2002
  
  6d0ecd86
- Merge paul@work.mysql.com:/home/bk/mysql-4.0 · e7d074a4
  unknown authored Mar 04, 2002
```
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
```
  e7d074a4
- Additional minor patch for indexterms inside para handling · f4dc6b47
  unknown authored Mar 04, 2002
```
Docs/Support/docbook-fixup.pl:
  Altered regex to catch all indexterms - not just role='cp|fn'
```
  f4dc6b47
03 Mar, 2002 1 commit

fixed the use of unitialized variable - code now works on the test system · e4b0cfc5

unknown authored Mar 02, 2002

of one of our users which replicates from a live server. So I now have a
lot of confidence in it and will push. It passes all tests, so I if I broke
somebody's code in 3.23 merge this is your fault - you should have had a good test
case :-)


sql/slave.cc:
  added DBUG_ASSERT()
sql/slave.h:
  fixed cache initialization problem

e4b0cfc5

02 Mar, 2002 7 commits

load local fix · 5a75ce28

unknown authored Mar 02, 2002

overrun sentry in my_vsnprintf() test
will not be pushed yet


BUILD/FINISH.sh:
  load local fix
BUILD/SETUP.sh:
  load local fix
BUILD/compile-pentium-debug-max:
  load local fix
configure.in:
  load local fix
mysys/my_vsnprintf.c:
  added overrun sentry to the test

5a75ce28

merge · 61408d9a

unknown authored Mar 02, 2002


sql/sql_acl.cc:
  Auto merged
Docs/manual.texi:
  Merge
sql/sql_select.cc:
  Merge

61408d9a

Fix sorting of NULL values (Should always be first) · 6cfc5e0e

unknown authored Mar 02, 2002

Fix problem with HAVING and MAX() IS NOT NULL


Docs/manual.texi:
  Changelog & NULL usage with ORDER BY
client/mysqldump.c:
  Cleanup disable keys
mysql-test/r/distinct.result:
  Fix results after ORDER BY with NULL fix
mysql-test/r/group_by.result:
  Fix results after ORDER BY with NULL fix
mysql-test/r/having.result:
  Testcase for bug with HAVING
mysql-test/t/distinct.test:
  Test for DISTINCT + ORDER BY DESC bug
mysql-test/t/having.test:
  Test of HAVING and MAX IS NOT NULL
sql/filesort.cc:
  Fix sorting of NULL values (Should always be first)
sql/item.h:
  Fix problem with HAVING and MAX() IS NOT NULL
sql/item_sum.h:
  Fix problem with HAVING and MAX() IS NOT NULL
sql/opt_range.cc:
  Fix problem with HAVING and MAX() IS NOT NULL
sql/opt_range.h:
  Fix sorting of NULL values
sql/sql_select.cc:
  Fix sorting of ORDER BY ... DESC on NULL values.

6cfc5e0e

post-merge fixup · 38dbcf48

unknown authored Mar 01, 2002


BitKeeper/etc/ignore:
  Added mysys/test_vsnprintf to the ignore list
mysql-test/mysql-test-run.sh:
  post-merge fix
mysys/my_vsnprintf.c:
  fixed newly introduced bug

38dbcf48

merged from 3.23 to pull the LOAD DATA INFILE fix as rpl000001 was failing. · 8f49c783

unknown authored Mar 01, 2002

Let's hope this did not break anything. Will not push this one until Monty
gets back


BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
client/mysql.cc:
  merged from 3.23
configure.in:
  merged from 3.23
mysql-test/mysql-test-run.sh:
  merged from 3.23
sql/mysqld.cc:
  merged from 3.23
support-files/mysql.spec.sh:
  merged from 3.23

8f49c783

Merge work:/home/bk/mysql-4.0 · 00a749ce
unknown authored Mar 01, 2002
```
into mysql.sashanet.com:/reiser-data/mysql-4.0
```
00a749ce

make my_vsnprintf() work with oversized strings · 21d75c81

unknown authored Mar 01, 2002

fixed replication bug - flush_master_info() needs to be called every time we read an 
    event from master

this is will not be pushed yet


mysys/my_vsnprintf.c:
  make my_vsnprintf() work with oversized strings
  corrected Swedish "skipp" in the comments
sql/log.cc:
  wrong change - to be undone
sql/slave.cc:
  fixed bug - flush_master_info() needs to be called every time we read an 
  event from master

21d75c81

01 Mar, 2002 3 commits

Merge work:/home/bk/mysql-4.0 · a3fd5b2d

unknown authored Mar 01, 2002

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


Docs/manual.texi:
  Auto merged
sql/sql_select.cc:
  Auto merged

a3fd5b2d

fulltext+const_table bug fixed · 2ccb35c3

unknown authored Mar 01, 2002


mysql-test/r/fulltext.result:
  test added
mysql-test/t/fulltext.test:
  test added
sql/item_func.cc:
  fulltext+const_table problem fixed once and forever
sql/item_func.h:
  fulltext+const_table problem fixed once and forever
sql/sql_select.cc:
  fulltext+const_table problem fixed once and forever
sql/table.h:
  fulltext+const_table problem fixed once and forever

2ccb35c3

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · 9c117943
unknown authored Mar 01, 2002
```
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
```
9c117943

28 Feb, 2002 1 commit
- Merge paul@work.mysql.com:/home/bk/mysql-4.0 · e93eaf4e
  unknown authored Feb 28, 2002
```
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
```
  e93eaf4e