Commits · 7bff1b0c345c6d8f334bd31f693fb9cbe69ea120 · Kirill Smelkov / mariadb

14 Feb, 2002 1 commit

Fix for gethostbyname_r detection (for solaris). · 7bff1b0c

unknown authored Feb 14, 2002


configure.in:
  Fix for gethostbyname_r (for solaris)
mysql-test/r/innodb.result:
  Fix innodb results
sql/mysql_priv.h:
  Added OPTION_FOUND_COMMENTS

7bff1b0c

13 Feb, 2002 1 commit

Added --user=userid to mysqld · 429abf35

unknown authored Feb 13, 2002

Fix for ctypes on windows
Cleanup max_queries_per_hour


mysql-test/t/dirty_close.test:
  Rename: mysql-test/t/dirty-close.test -> mysql-test/t/dirty_close.test
mysql-test/r/dirty_close.result:
  Rename: mysql-test/r/dirty-close.result -> mysql-test/r/dirty_close.result
Docs/manual.texi:
  Added --user=userid
include/m_ctype.h:
  Fix for ctypes on windows
mysql-test/r/join.result:
  Update join results
sql/mysqld.cc:
  Added --user=userid
sql/sql_parse.cc:
  Cleanup max_queries_per_hour

429abf35

11 Feb, 2002 6 commits

merge with 3.23.48 · e0ccdc17

unknown authored Feb 11, 2002


BUILD/FINISH.sh:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-alpha:
  Auto merged
BUILD/compile-pentium-gcov:
  Auto merged
BUILD/compile-pentium-gprof:
  Auto merged
BUILD/compile-pentium:
  Auto merged
BitKeeper/deleted/.del-my_new.cc:
  Delete: mysys/my_new.cc
Build-tools/Do-compile:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
bdb/dist/configure.in:
  Auto merged
client/Makefile.am:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/my_lock.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
support-files/my-medium.cnf.sh:
  Auto merged
support-files/my-small.cnf.sh:
  Auto merged
configure.in:
  merge
innobase/row/row0mysql.c:
  merge
innobase/trx/trx0trx.c:
  merge
mysql-test/r/innodb.result:
  merge
mysql-test/r/join.result:
  merge
sql/ha_innodb.cc:
  merge
sql/slave.cc:
  merge

e0ccdc17

Fixed typo · af932b5d
unknown authored Feb 11, 2002

af932b5d
Updated changelog of 3.23.48 with InnoDB changes. · 501650c5
unknown authored Feb 11, 2002
```
sql/sql_table.cc:
  Fixed comment
```
501650c5
Changelog fixups. · 8a99eebe
unknown authored Feb 11, 2002

8a99eebe
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · ed30774e
unknown authored Feb 11, 2002

ed30774e

Cleanup · 4122b392

unknown authored Feb 11, 2002


Docs/manual.texi:
  Update information about IS NULL.
myisam/myisamchk.c:
  Portability fix
sql/mysqld.cc:
  Changed log_long_queries -> log_slow_queries

4122b392

10 Feb, 2002 6 commits

Remove uage of static variable from file locks. · 50819868
unknown authored Feb 10, 2002
```
mysql-test/mysql-test-run.sh:
  Cleanup
```
50819868
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · 87adcd7c
unknown authored Feb 10, 2002

87adcd7c

Fixed bug in full join with many NULL fields. · c1caaf75

unknown authored Feb 10, 2002


Build-tools/Do-compile:
  Fixed 'touch' and 'chmod' of files.
Docs/manual.texi:
  Changelog

c1caaf75

Merge heikki@work.mysql.com:/home/my/mysql · f9df6847
unknown authored Feb 10, 2002
```
into donna.mysql.fi:/home/heikki/mysqln
```
f9df6847

srv0srv.c: · e370bdee

unknown authored Feb 10, 2002

If the default character set was set to non-latin1 then the collation order of DATA_CHAR and DATA_VARCHAR was not defined, and foreign key system tables did not work, because they contain DATA_VARCHAR columns

innobase/srv/srv0srv.c:
If the default character set was set to non-latin1 then the collation order of DATA_CHAR and DATA_VARCHAR was not defined, and foreign key system tables did not work, because they contain DATA_VARCHAR columns

e370bdee

Fix for customer build · 61b769d9
unknown authored Feb 10, 2002

61b769d9

09 Feb, 2002 6 commits

Add forgotten argument to --version-suffix · c9a4dde5
unknown authored Feb 10, 2002

c9a4dde5
Merge work:/home/bk/mysql-4.0 · 6f113319
unknown authored Feb 09, 2002
```
into mysql.sashanet.com:/reiser-data/mysql-4.0
```
6f113319

updated test suite to be able to run 3.23 master and 4.0 slave · ff3b98e6

unknown authored Feb 09, 2002

got LOAD DATA INFILE replication from 3.23 master to 4.0 slave to work
for some reason query_cache now fails - will push anyway and document the
failure if I can repeat it.


client/mysqltest.c:
  added require_version
mysql-test/mysql-test-run.sh:
  added --master-binary=,--slave-binary=,--old-master options
  sleep_until_file_exists -> sleep_until_file_created
sql/slave.cc:
  fixed bug in LOAD DATA INFILE replication from 3.23 master

ff3b98e6

added options 'version-suffix' to Do-compile · 84c71cf7
unknown authored Feb 09, 2002
```
Build-tools/Do-compile:
  added options 'version-suffix'
```
84c71cf7
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · 581edc54
unknown authored Feb 09, 2002

581edc54

Removed compiler warnings · f7c085ef

unknown authored Feb 09, 2002


Docs/manual.texi:
  Cleanup
myisam/myisampack.c:
  Removed warning
sql/handler.cc:
  cleanup
sql/slave.cc:
  Removed not used var

f7c085ef

08 Feb, 2002 7 commits

dict0crea.c: · 4bb78022

unknown authored Feb 08, 2002

  Still a little better error message for Harald Fuchs


innobase/dict/dict0crea.c:
  Still a little better error message for Harald Fuchs

4bb78022

dict0crea.c: · 17b2cd98

unknown authored Feb 08, 2002

Add some error messages to help in tracking Harald Fuchs' foreign key failure

innobase/dict/dict0crea.c:
Add some error messages to help in tracking Harald Fuchs' foreign key failure

17b2cd98

small bug fix in max queries per hour · 7380df3f
unknown authored Feb 08, 2002

7380df3f
bugfix for max_user_connections · f5e6f0e7
unknown authored Feb 08, 2002

f5e6f0e7
Merge work:/home/bk/mysql-4.0 · 62599173
unknown authored Feb 08, 2002
```
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
```
62599173
merge · 49266c90
unknown authored Feb 08, 2002
```
sql/mysql_priv.h:
  Auto merged
```
49266c90

Fix some bugs introduced with the new my_getopt · 0f9932a1

unknown authored Feb 08, 2002

Added counting of rollback's and commits
Fixed bug in 'SELECT 0 LIMIT 0'
Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'


Docs/manual.texi:
  Changelog
configure.in:
  Cleanup
myisam/myisamchk.c:
  Fix some bugs introduced with the new my_getopt
mysql-test/r/limit.result:
  Test for bugfix
mysql-test/r/rpl000001.result:
  fix wrong result
mysql-test/r/select.result:
  Fix things after fixing ignore index()
mysql-test/r/select_found.result:
  Test of bug in SQL_CALC_FOUND_ROWS
mysql-test/t/limit.test:
  Test bug in LIMIT 0
mysql-test/t/rpl000001.test:
  fix wrong result
mysql-test/t/select_found.test:
  Test of bug in SQL_CALC_FOUND_ROWS
sql/handler.cc:
  Added counting of rollback's and commits
sql/mysql_priv.h:
  Added counting of rollback's and commits
sql/mysqld.cc:
  Added counting of rollback's and commits
sql/sql_select.cc:
  Fixed bug in 'SELECT 0 LIMIT 0'
  Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'

0f9932a1

07 Feb, 2002 9 commits

Merge work:/home/bk/mysql-4.0 · 83d50c17
unknown authored Feb 07, 2002
```
into mysql.sashanet.com:/reiser-data/mysql-4.0
```
83d50c17

fixes for slave backward compat · 0d876509

unknown authored Feb 07, 2002

fixed bug in LOAD DATA FROM MASTER
fixed rpl000001.result
Slave now replicates 3.23 master, with the exception of LOAD DATA INFILE, 
which is still buggy. Will push this one after the pull/merge


mysql-test/r/rpl000001.result:
  fixed bug in result
sql/log_event.cc:
  fixes for slave backward compat
sql/log_event.h:
  fixes for slave backward compat
sql/mysql_priv.h:
  fixes for slave backward compat
sql/net_serv.cc:
  fixes for slave backward compat
sql/repl_failsafe.cc:
  fixed bug in LOAD DATA FROM MASTER
sql/slave.cc:
  fixes for slave backward compat
sql/slave.h:
  fixes for slave backward compat
sql/sql_load.cc:
  fixes for slave backward compat

0d876509

Fixed results after Heikki's last change · 73edf19b
unknown authored Feb 07, 2002

73edf19b
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · 007470d8
unknown authored Feb 07, 2002
```
sql/ha_innobase.cc:
  Auto merged
```
007470d8

Update to autoconf 2.52 · 3942e445

unknown authored Feb 07, 2002

Fix of InnoDB variables in SHOW VARIABLES
Fix for ALTER TABLE and InnoDB


BUILD/FINISH.sh:
  Update to autoconf 2.52
BUILD/SETUP.sh:
  Update to autoconf 2.52
BUILD/compile-alpha:
  Update to autoconf 2.52
BUILD/compile-pentium-gcov:
  Update to autoconf 2.52
BUILD/compile-pentium-gprof:
  Update to autoconf 2.52
BUILD/compile-pentium:
  Update to autoconf 2.52
Docs/manual.texi:
  Changelog
acconfig.h:
  Update to autoconf 2.52
acinclude.m4:
  Update to autoconf 2.52
bdb/dist/configure.in:
  Update to autoconf 2.52
client/Makefile.am:
  Update to autoconf 2.52
configure.in:
  Update to autoconf 2.52
mysql-test/r/innodb.result:
  Update of InnoDB Cardinality values
mysys/Makefile.am:
  Update to autoconf 2.52
scripts/Makefile.am:
  Update to autoconf 2.52
sql/ha_innobase.cc:
  Fix of InnoDB variables in SHOW VARIABLES
sql/ha_innobase.h:
  Fix of InnoDB variables in SHOW VARIABLES
sql/sql_table.cc:
  Fix for ALTER TABLE and InnoDB
support-files/my-huge.cnf.sh:
  Fixed typo
support-files/my-large.cnf.sh:
  Fixed typo
support-files/my-medium.cnf.sh:
  Fixed typo
support-files/my-small.cnf.sh:
  Fixed typo

3942e445

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · 63402836
unknown authored Feb 07, 2002

63402836
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · 90a76d68
unknown authored Feb 07, 2002
```
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
```
90a76d68
small typo fix · 7c0b23e6
unknown authored Feb 07, 2002

7c0b23e6

rem0cmp.c: · 9a052e27

unknown authored Feb 07, 2002

Prevent a foreign key constraint references between INT columns where the signedness is different

innobase/rem/rem0cmp.c:
Prevent a foreign key constraint references between INT columns where the signedness is different

9a052e27

06 Feb, 2002 2 commits

Bug fixes and new functionality added in my_getopt and myisamchk · dc7af9f0

unknown authored Feb 06, 2002


include/my_getopt.h:
  Removed a member from my_getopt struct.
myisam/myisamchk.c:
  pdated myisamchk. More features in use from my_getopt
mysys/my_getopt.c:
  Fixed a bug in handle_options(). Short options were not tested
  whether existed when given from the command line. Fixed a bug
  in getopt_ll, got division by zero in some cases. Added new functions
  my_print_help() and my_print_variables() to be used by mysql server
  and most clients.

dc7af9f0

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · bb41d530
unknown authored Feb 06, 2002
```
sql/opt_sum.cc:
  Auto merged
```
bb41d530

05 Feb, 2002 2 commits

Remove old test suite in xml format · 26dfae65

unknown authored Feb 06, 2002


BitKeeper/deleted/.del-README~877d76bcd19f7193:
  Delete: mysql-test/xml/README
BitKeeper/deleted/.del-sel000001.xml~f0eb64c0346366db:
  Delete: mysql-test/xml/tests/sel000001.xml
BitKeeper/deleted/.del-sel000002.xml~8cd06da5293a7147:
  Delete: mysql-test/xml/tests/sel000002.xml
BitKeeper/deleted/.del-sel000003.xml~1a622b8d30d7ade8:
  Delete: mysql-test/xml/tests/sel000003.xml
BitKeeper/deleted/.del-sel000004.xml~515488ef221523d9:
  Delete: mysql-test/xml/tests/sel000004.xml
BitKeeper/deleted/.del-sel000005.xml~a6344e46ba572dc3:
  Delete: mysql-test/xml/tests/sel000005.xml
BitKeeper/deleted/.del-sel000006.xml~8ad8f44f49b21246:
  Delete: mysql-test/xml/tests/sel000006.xml
BitKeeper/deleted/.del-sel000007.xml~bfcb6d85276be7e8:
  Delete: mysql-test/xml/tests/sel000007.xml
BitKeeper/deleted/.del-sel000008.xml~1d6082f0905c51b6:
  Delete: mysql-test/xml/tests/sel000008.xml
BitKeeper/deleted/.del-sel000009.xml~8677613dc624cb0c:
  Delete: mysql-test/xml/tests/sel000009.xml
BitKeeper/deleted/.del-sel000010.xml~9b98c9cce8fac145:
  Delete: mysql-test/xml/tests/sel000010.xml
BitKeeper/deleted/.del-sel000011.xml~432156d127cbd22f:
  Delete: mysql-test/xml/tests/sel000011.xml
BitKeeper/deleted/.del-sel000012.xml~a410d08dc4cfee11:
  Delete: mysql-test/xml/tests/sel000012.xml
BitKeeper/deleted/.del-sel000013.xml~2717cbfbe5730174:
  Delete: mysql-test/xml/tests/sel000013.xml
BitKeeper/deleted/.del-sel000014.xml~bcf55df6a036bd8f:
  Delete: mysql-test/xml/tests/sel000014.xml
BitKeeper/deleted/.del-sel000015.xml~b72689a8f9b21372:
  Delete: mysql-test/xml/tests/sel000015.xml
BitKeeper/deleted/.del-sel000016.xml~32f1ef2e3d214be0:
  Delete: mysql-test/xml/tests/sel000016.xml
BitKeeper/deleted/.del-sel000017.xml~81423597605ff77f:
  Delete: mysql-test/xml/tests/sel000017.xml
BitKeeper/deleted/.del-sel000018.xml~82e2e7bde83f56d8:
  Delete: mysql-test/xml/tests/sel000018.xml
BitKeeper/deleted/.del-sel000019.xml~c0f0b05e481b90e7:
  Delete: mysql-test/xml/tests/sel000019.xml
BitKeeper/deleted/.del-sel000020.xml~8849bbf91a4fd5ec:
  Delete: mysql-test/xml/tests/sel000020.xml
BitKeeper/deleted/.del-sel000021.xml~2763b87c1549ba87:
  Delete: mysql-test/xml/tests/sel000021.xml
BitKeeper/deleted/.del-sel000022.xml~da2083ef423ae39a:
  Delete: mysql-test/xml/tests/sel000022.xml
BitKeeper/deleted/.del-sel000023.xml~11993b379b9838be:
  Delete: mysql-test/xml/tests/sel000023.xml
BitKeeper/deleted/.del-sel000024.xml~dd067aa28220fa4c:
  Delete: mysql-test/xml/tests/sel000024.xml
BitKeeper/deleted/.del-sel000025.xml~3e766aa1e43b303:
  Delete: mysql-test/xml/tests/sel000025.xml
BitKeeper/deleted/.del-sel000026.xml~15145e496417646f:
  Delete: mysql-test/xml/tests/sel000026.xml
BitKeeper/deleted/.del-README~cd4bb681e5a0cd10:
  Delete: mysql-test/xml/xsl/README
BitKeeper/deleted/.del-sel000027.xml~95e7de3e9934b570:
  Delete: mysql-test/xml/tests/sel000027.xml
BitKeeper/deleted/.del-sel000028.xml~c72bfec6600949b:
  Delete: mysql-test/xml/tests/sel000028.xml
BitKeeper/deleted/.del-sel000029.xml~3aba1eb23ef86c9e:
  Delete: mysql-test/xml/tests/sel000029.xml
BitKeeper/deleted/.del-sel000030.xml~c2b25781eefaee9:
  Delete: mysql-test/xml/tests/sel000030.xml
BitKeeper/deleted/.del-mysqltest.xsl~1b8f6ec4f1b5f634:
  Delete: mysql-test/xml/xsl/mysqltest.xsl
sql/opt_sum.cc:
  Fixed typo

26dfae65

manual.texi: · 9adfd2e8

unknown authored Feb 05, 2002

  Updated general manual about InnoDB locking and CHECK TABLE


Docs/manual.texi:
  Updated general manual about InnoDB locking and CHECK TABLE

9adfd2e8