Commits · 2d67f1e0cf5270f37816669bc8d7e606abce1469 · Kirill Smelkov / mariadb

19 May, 2004 1 commit

Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' · 2d67f1e0

unknown authored May 19, 2004

Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.


VC++Files/bdb/bdb.dsp:
  Small, automatic changes
VC++Files/client/mysql.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqladmin.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlclient.dsp:
  Removed files that should only be used with mysql command line client
VC++Files/client/mysqldump.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlimport.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlshow.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/comp_err/comp_err.dsp:
  Automatic changes
VC++Files/dbug/dbug.dsp:
  Automatic changes
VC++Files/heap/heap.dsp:
  automatic changes
VC++Files/innobase/innobase.dsp:
  Automatic changes
VC++Files/isam/isam.dsp:
  Automatic changes
VC++Files/isamchk/isamchk.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysql/libmysql.dsp:
  Automatic changes
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Add missing files
VC++Files/libmysqld/libmysqld.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysqltest/myTest.dsp:
  Automatic changes
VC++Files/merge/merge.dsp:
  Automatic changes
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisam/myisam.dsp:
  automatic changes
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  automatic changes
VC++Files/myisamchk/myisamchk.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisamlog/myisamlog.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisammrg/myisammrg.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisampack/myisampack.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysql.dsw:
  Automatic changes
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqldemb/mysqldemb.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlserver/mysqlserver.dsp:
  Automatic changes
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Automatic changes
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Automatic changes
VC++Files/mysys/mysys.dsp:
  Automatic changes
VC++Files/pack_isam/pack_isam.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/perror/perror.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/regex/regex.dsp:
  Automatic changes
VC++Files/replace/replace.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/sql/mysqld.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/strings/strings.dsp:
  Removed duplicate code for strnlen
VC++Files/test1/test1.dsp:
  Automatic changes
VC++Files/thr_test/thr_test.dsp:
  Automatic changes
VC++Files/vio/vio.dsp:
  Automatic changes
VC++Files/zlib/contrib/asm386/zlibvc.dsp:
  Automatic changes
VC++Files/zlib/zlib.dsp:
  Automatic changes
extra/my_print_defaults.c:
  Fixed bug in --verbose
include/m_string.h:
  Portability fix
include/mysql_embed.h:
  Better setting of server_version variable
include/mysql_version.h.in:
  Better license text handling
innobase/pars/pars0lex.l:
  Remove compiler warnings
innobase/trx/trx0sys.c:
  Remove compiler warnings
libmysqld/lib_sql.cc:
  Better setting of server_version variable
libmysqld/libmysqld.def:
  Add functions needed for mysql command line client
myisam/myisam_ftdump.c:
  Remove compiler warnings
mysys/sha1.c:
  Remove compiler warnings
scripts/make_win_src_distribution.sh:
  Safety fix
scripts/mysql_install_db.sh:
  Backport from 4.1 to allow make_win_src_distribution create the privilege tables
sql/Makefile.am:
  Add new file mysqld_suffix.h
  Remove not used file sql_olap.h
sql/ha_innodb.cc:
  Remove not used variable
sql/mysqld.cc:
  Better setting of server_version variable
sql/set_var.cc:
  Fixed bug when showing lower_case_file_system
strings/ctype-tis620.c:
  Remove compiler warnings

2d67f1e0

18 May, 2004 1 commit
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 · efbf373b
  unknown authored May 18, 2004
```
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3756
```
  efbf373b
17 May, 2004 7 commits

mem0pool.c: · 08d1de2c

unknown authored May 18, 2004

Fix a memory corruption bug: in 32-bit computers, every 4 billionth malloc outside innodb_additional_mem_pool_size was mistreated when freeing the memory; this could corrupt the InnoDB additional mem pool and could have caused crashes anywhere, also inside MySQL, or even database corruption! the bug exists also in 3.23 and 4.1; workaround: configure innodb_additional_mem_pool_size big enough

innobase/mem/mem0pool.c:
Fix a memory corruption bug: in 32-bit computers, every 4 billionth malloc outside innodb_additional_mem_pool_size was mistreated when freeing the memory; this could corrupt the InnoDB additional mem pool and could have caused crashes anywhere, also inside MySQL, or even database corruption! the bug exists also in 3.23 and 4.1; workaround: configure innodb_additional_mem_pool_size big enough

08d1de2c

dict0dict.c: · d4f6c7a4

unknown authored May 17, 2004

Allocate the table name buffer from the mem heap of a foreign key object rather than pointing to the name buffer in the table object; even though this apparently caused no bugs in RENAME, DROP, ALTER TABLE, or elsewhere, this convention was very prone to memory allocation bugs

innobase/dict/dict0dict.c:
Allocate the table name buffer from the mem heap of a foreign key object rather than pointing to the name buffer in the table object; even though this apparently caused no bugs in RENAME, DROP, ALTER TABLE, or elsewhere, this convention was very prone to memory allocation bugs

d4f6c7a4

InnoDB: srv0srv.c: Remove reference to sync0ipm.h (fix ChangeSet@1.1833) · 31280b06
unknown authored May 17, 2004
```
innobase/srv/srv0srv.c:
  Remove reference to sync0ipm.h
```
31280b06
added newline at the end of the file. · f948d7bb
unknown authored May 17, 2004

f948d7bb

InnoDB: Remove unused module sync0ipm · 29f480c5

unknown authored May 17, 2004


BitKeeper/deleted/.del-sync0ipm.c~48eb5196b6819734:
  Delete: innobase/sync/sync0ipm.c
BitKeeper/deleted/.del-sync0ipm.h~92a27f3bd9b15164:
  Delete: innobase/include/sync0ipm.h
BitKeeper/deleted/.del-sync0ipm.ic~2024167f6418de39:
  Delete: innobase/include/sync0ipm.ic
innobase/sync/makefilewin:
  Remove unused file sync0ipm.c
innobase/include/Makefile.am:
  Remove unused files sync0ipm.h and sync0ipm.ic
innobase/sync/Makefile.am:
  Remove unused file sync0ipm.c

29f480c5

InnoDB: Remove unused module os0shm · c0044631

unknown authored May 17, 2004


BitKeeper/deleted/.del-os0shm.h~72e5e03d7b74061f:
  Delete: innobase/include/os0shm.h
BitKeeper/deleted/.del-os0shm.c~489ce7f33d07ffa:
  Delete: innobase/os/os0shm.c
BitKeeper/deleted/.del-os0shm.ic~1cac6731d2a64d53:
  Delete: innobase/include/os0shm.ic
innobase/include/Makefile.am:
  Remove unused files os0shm.h and os0shm.ic
innobase/os/Makefile.am:
  Remove unused file os0shm.c
innobase/os/makefilewin:
  Remove unused file os0shm.c

c0044631

A fix (bug #3756: ISNULL(QUOTE()) returns 1 for every row after 1st NULL) · ff23273b
unknown authored May 17, 2004

ff23273b

15 May, 2004 1 commit
- Extra safety fixes (probably not needed, but can't hurt) · fa163d0b
  unknown authored May 15, 2004
```
sql/ha_innodb.cc:
  simple optimization
sql/sql_show.cc:
  Simple optimization
```
  fa163d0b
14 May, 2004 4 commits

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · 5c7ed146
unknown authored May 14, 2004
```
into mysql.com:/home/mysql_src/mysql-4.0
```
5c7ed146

Replication testsuite: making the master-slave synchronization less likely to fail, · 028a672f

unknown authored May 14, 2004

by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
in sync_with_master and sync_slave_with_master.
The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
but may affect 4.x as well, so fixing it here. Note that I am also fixing
5.0 too, with the same exact patch, because I don't want to leave 5.0 broken
until the next 4.0->4.1->5.0 merge.


client/mysqltest.c:
  in sync_with_master (and sync_slave_with_master), if MASTER_POS_WAIT() returns NULL,
  it may be that the slave SQL thread did not have time to start yes, so we sleep
  1 sec and retry, 4 times at most.
mysql-test/r/rpl_server_id2.result:
  result update
mysql-test/t/rpl_server_id2.test:
  master_slave.inc already drops the table

028a672f

Many files: · 7bd91ac0

unknown authored May 14, 2004

Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query

sql/sql_class.h:
Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
sql/ha_innodb.cc:
Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
sql/log_event.cc:
Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
sql/slave.cc:
Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
sql/sql_db.cc:
Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
sql/sql_parse.cc:
Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
sql/sql_show.cc:
Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query

7bd91ac0

InnoDB: Remove unused function ut_str_catenate() · 2d743fe2

unknown authored May 14, 2004


innobase/include/ut0mem.h:
  Remove unused function ut_str_catenate()
innobase/ut/ut0mem.c:
  Remove unused function ut_str_catenate()

2d743fe2

13 May, 2004 8 commits

ha_innodb.cc, trx0trx.h, lock0lock.c, trx0trx.c: · ae17c3c7

unknown authored May 13, 2004

Reserve the MySQL LOCK_thread_count mutex when printing thd->query of
an arbitrary transaction; if we are printing thd->query of a transaction that
we know is currently executing inside InnoDB, then we know that MySQL cannot
meanwhile change thd->query, and no need to reserve the MySQL mutex; note
that this patch still leaves open the possibility of races in MySQL's
thd->query_len

innobase/trx/trx0trx.c:
Reserve the MySQL LOCK_thread_count mutex when printing thd->query of an arbitrary transaction; if we are printing thd->query of the a transaction that we know is currently executing inside InnoDB, then we know that MySQL cannot meanwhile change thd->query, and no need to reserve the MySQL mutex; note that thsi patch still leaves aopen the possibility of races in MySQL's thd->query_len
innobase/lock/lock0lock.c:
Reserve the MySQL LOCK_thread_count mutex when printing thd->query of an arbitrary transaction; if we are printing thd->query of the a transaction that we know is currently executing inside InnoDB, then we know that MySQL cannot meanwhile change thd->query, and no need to reserve the MySQL mutex; note that thsi patch still leaves aopen the possibility of races in MySQL's thd->query_len
innobase/include/trx0trx.h:
Reserve the MySQL LOCK_thread_count mutex when printing thd->query of an arbitrary transaction; if we are printing thd->query of the a transaction that we know is currently executing inside InnoDB, then we know that MySQL cannot meanwhile change thd->query, and no need to reserve the MySQL mutex; note that thsi patch still leaves aopen the possibility of races in MySQL's thd->query_len
sql/ha_innodb.cc:
Reserve the MySQL LOCK_thread_count mutex when printing thd->query of an arbitrary transaction; if we are printing thd->query of the a transaction that we know is currently executing inside InnoDB, then we know that MySQL cannot meanwhile change thd->query, and no need to reserve the MySQL mutex; note that thsi patch still leaves aopen the possibility of races in MySQL's thd->query_len

ae17c3c7

Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0 · e5a2fc8e
unknown authored May 13, 2004
```
into mysql.com:/space/my/mysql-4.0
```
e5a2fc8e

ha_innodb.cc: · 6be0dc12

unknown authored May 13, 2004

A flawed fix of the thd->query race in SHOW INNODB STATUS; see the comments in code about how to fix this properly; we cannot use LOCK_thread_count to protect thd->query, because that will cause a deadlock of threads

sql/ha_innodb.cc:
A flawed fix of the thd->query race in SHOW INNODB STATUS; see the comments in code about how to fix this properly; we cannot use LOCK_thread_count to protect thd->query, because that will cause a deadlock of threads

6be0dc12

Merge mysql.com:/space/my/mysql-4.0 · 377f3356
unknown authored May 13, 2004
```
into mysql.com:/space/my/mysql-4.0-build
```
377f3356

- make sure the binaries are executable before calling them during · a6ff8d00

unknown authored May 13, 2004

   make_binary_distribution (bug#2857)


scripts/make_binary_distribution.sh:
   - make sure the binaries are executable before calling them (bug#2857)

a6ff8d00

ha_innodb.cc: · 9e20f63a

unknown authored May 13, 2004

  innobase_mysql_print_thd(): protect thd with LOCK_thread_count (Bug #3596)


sql/ha_innodb.cc:
  innobase_mysql_print_thd(): protect thd with LOCK_thread_count

9e20f63a

InnoDB: fixed bug in dict0dict.c: dict_index_name_print() · 6a397320
unknown authored May 13, 2004
```
innobase/dict/dict0dict.c:
  dict_index_name_print(): output table name to file, not stderr
```
6a397320
InnoDB: Remove os_file_lock() from the 4.0 tree (unfix Bug #3608) · 72595ada
unknown authored May 13, 2004
```
innobase/os/os0file.c:
  Remove os_file_lock()
```
72595ada

12 May, 2004 2 commits

InnoDB: avoid some data races in innobase_mysql_print_thd() (Bug #3596) · fc5445ac
unknown authored May 12, 2004
```
sql/ha_innodb.cc:
  innobase_mysql_print_thd(): initial fix to Bug #3596
```
fc5445ac

eval0eval.c: · 79229d6d

unknown authored May 12, 2004

  Backport suppression of MSVC++ warning from 4.1


innobase/eval/eval0eval.c:
  Backport suppression of MSVC++ warning from 4.1

79229d6d

11 May, 2004 4 commits

- Bumped up version number from 4.0.19 -> 4.0.20 · 64d2ddbf

unknown authored May 12, 2004

 - Tagged ChangeSet@1.1800.1.1 as "mysql-4.0.19"


configure.in:
   - Bumped up version number from 4.0.19 -> 4.0.20

64d2ddbf

Merge bk-internal:/home/bk/mysql-4.0/ · 699cbc02
unknown authored May 11, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
```
699cbc02
bug#3612 - Item_func_div set decimals incorrectly · 76bc6771
unknown authored May 11, 2004

76bc6771

InnoDB: Changed bug reporting address to http://bugs.mysql.com · 5b007249

unknown authored May 11, 2004


innobase/btr/btr0btr.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/dict/dict0load.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/ibuf/ibuf0ibuf.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/lock/lock0lock.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/row/row0ins.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/row/row0sel.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/row/row0umod.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/row/row0upd.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/trx/trx0rec.c:
  Changed bug reporting address to http://bugs.mysql.com
innobase/ut/ut0dbg.c:
  Changed bug reporting address to http://bugs.mysql.com

5b007249

10 May, 2004 7 commits

Merge marko@build.mysql.com:/home/bk/mysql-4.0 · 9e18773c
unknown authored May 10, 2004
```
into hundin.mysql.fi:/home/marko/j/mysql-4.0
```
9e18773c
InnoDB: Fix assertion failure for orphaned tables in DROP DATABASE · b89bb867
unknown authored May 10, 2004
```
innobase/row/row0mysql.c:
  Compare database part of table name with memcmp(), not strcmp()
```
b89bb867
Merge mysql.com:/home/mydev/mysql-4.0 · 2abb48de
unknown authored May 10, 2004
```
into mysql.com:/home/mydev/mysql-4.0-bug2831
```
2abb48de
Merge bk-internal:/home/bk/mysql-4.0/ · 2b4a56b9
unknown authored May 10, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
```
2b4a56b9

backport from 4.1: · 0bfea087

unknown authored May 10, 2004

"phrase search" should not match partial words (it should not match 'paraphrase searches')

0bfea087

Merge mysql.com:/home/mydev/mysql-4.0 · 41545954
unknown authored May 10, 2004
```
into mysql.com:/home/mydev/mysql-4.0-bug2831
```
41545954

Fix replace_result of $MASTER_MYPORT instead of literal numbers. · 3f46a5fd

unknown authored May 10, 2004


mysql-test/t/rpl000015.test:
  Fix replace_result of $MASTER_MYPORT instead of literal numbers.
  The test case rpl000015 needs one exlpicit literal number.
  It changes partial master settings, which seems to reset other settings
  to their defaults. To test this is obviously the intent of this case.

3f46a5fd

07 May, 2004 3 commits

Merge marko@build.mysql.com:/home/bk/mysql-4.0 · bd4be3f1
unknown authored May 07, 2004
```
into hundin.mysql.fi:/home/marko/l/mysql-4.0
```
bd4be3f1

Fix auto_inc locking bug introduced in ChangeSet@1.1794.1.1 · 95600183

unknown authored May 07, 2004


innobase/row/row0mysql.c:
  Revert accidental modification to row_lock_table_autoinc_for_mysql()
  made in ChangeSet@1.1794.1.1
mysql-test/r/innodb.result:
  Revert ChangeSet@1.1794.1.1

95600183

Merge mysql.com:/home/mydev/mysql-4.0 · 146019b5

unknown authored May 07, 2004

into mysql.com:/home/mydev/mysql-4.0-bug2831


BitKeeper/etc/logging_ok:
  auto-union

146019b5

06 May, 2004 2 commits
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0 · ae2b73a5
  unknown authored May 07, 2004
```
into a80-186-24-72.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
```
  ae2b73a5
- Fixed a problem with option --where, which earlier was not dynamic. One was not able · b20399d9
  unknown authored May 07, 2004
```
to use long query strings with it.
Bug#3633


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
  b20399d9