Commit graph

7145 commits

Author SHA1 Message Date
unknown
dcf29d5ec8 Fix for bug when zeros are to be prepended to decimal field 2003-11-18 15:58:27 +02:00
unknown
c072804d51 Merge with 3.23 (only comment changes)
BUILD/compile-pentium-gcov:
  Use local file
mysys/thr_alarm.c:
  Get comment from 3.23
sql/mini_client.cc:
  Get comment from 3.23
2003-11-17 16:16:56 +02:00
unknown
e830279524 Merge service name code 2003-11-17 13:10:07 +02:00
unknown
348416e930 Fix for service names on windows; Now we always put the service name last when we create a service
myisam/mi_test2.c:
  Moved test so that resize_key_cache() is always tested
mysys/mf_keycache.c:
  Fixed comment
2003-11-17 13:06:32 +02:00
unknown
d544ef768c Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-11-17 13:00:15 +02:00
unknown
b57a1dd227 Safety fix for alarms on windows.
mysys/thr_alarm.c:
  Safety fix for alarms on windows
sql/mini_client.cc:
  Added comments
2003-11-17 12:59:07 +02:00
unknown
194dbe1a9a fixed bug #1650 "mysql_config --libmysqd-libs misses libwrap"
scripts/Makefile.am:
  added processing of @WRAPLIBS@ in scripts
scripts/mysql_config.sh:
  added @WRAPLIBS@ to embedded_libs option line
2003-11-15 19:37:54 -04:00
unknown
75392a0d2e make error message more detailed 2003-11-12 22:33:28 +01:00
unknown
25f9971aaa Fix for Bug #1752 Wrong letter cases.
Thanks to Daniel Convissor


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-11-05 14:35:08 +02:00
unknown
8da83dce77 Merge akishkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40
2003-11-05 02:36:33 +05:00
unknown
5d8b9b3c6b compile-pentium-gcov:
Stop line wraping for compiler warnings.
  It needs for warnings statistic in code coverage


BUILD/compile-pentium-gcov:
  Stop line wraping for compiler warnings.
  It needs for warnings statistic in code coverage
2003-11-05 02:24:34 +05:00
unknown
e6298f379e compile-pentium-gcov:
Stop the line wrapping for warnings.
  it needs for warnings statistic in code coverage


BUILD/compile-pentium-gcov:
  Stop the line wrapping for warnings.
  it needs for warnings statistic in code coverage
2003-11-05 02:23:13 +05:00
unknown
52d7e97413 Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/kostja/mysql/mysql-4.0-root
2003-11-04 12:55:39 +03:00
unknown
e23018167b Word Police law is abided
mysql-test/t/range.test:
  Word Police memo is abided
2003-11-04 12:38:09 +03:00
unknown
56ebe77bd1 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-03 23:19:20 +01:00
unknown
91b22c5abe fixed a bug in boolean fts where a word queue was created based on min_word_len, while with trunc* operator one could get shorter words 2003-11-03 23:18:55 +01:00
unknown
bc296f9495 Merge mysql.com:/home/kostja/mysql/mysql-4.0-root
into mysql.com:/home/kostja/mysql/mysql-4.0-1724
2003-11-03 22:53:42 +03:00
unknown
fdd0e7078d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-11-03 18:25:47 +01:00
unknown
5ec3a67132 When we delete the slave's temp tables from memory, we reset
rli->save_temporary_tables and slave_open_temp_tables
(in old 4.0 you could make "SHOW STATUS LIKE 'slave_open_temp_tables'" grow
indefinitely by doing RESET SLAVE and replicating always the same CREATE
TEMPORARY TABLE).
It's critical to reset save_temporary_tables to 0 (otherwise you may later
read memory which has been freed) so this changeset should go into 4.1.


mysql-test/r/rpl_reset_slave.result:
  result update
mysql-test/t/rpl_reset_slave.test:
  test for RESET SLAVE and creating twice the same temp table in the slave.
sql/slave.cc:
  when we delete the slave's temp tables (when slave server shuts down and when
  RESET SLAVE), we reset 2 variables: rli->save_temporary_tables & slave_open_temp_tables.
2003-11-03 18:24:01 +01:00
unknown
22bc137c2e fix for bug #1724 'WHERE ... IN() optimizer behaviour
has changed since 4.0.14'
We need to calculate cost of RANGE
scan if it is present instead of cost of 
FULL scan.


mysql-test/r/order_by.result:
  more accurate row estimation
  for RANGE scan
mysql-test/r/range.result:
  added test case for bug #1724
  'WHERE ... IN() optimizer behaviour has changed since 4.0.14'
mysql-test/r/select.result:
  please ignore
mysql-test/t/range.test:
  added test case for bug #1724
  'WHERE ... IN() optimizer behaviour has changed since 4.0.14'
sql/sql_select.cc:
  fix for bug #1724 'WHERE ... IN() optimizer behaviour 
  has changed since 4.0.14'
  We need to calculate cost of RANGE
  scan instead of cost of FULL scan
  if RANGE is present
  Few comments cleaned up.
2003-11-03 19:56:01 +03:00
unknown
15cc0ad2ec Portability fix 2003-11-02 16:38:27 +02:00
unknown
7960f2c4a8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
2003-11-02 15:55:25 +02:00
unknown
c97a38c4d3 Call my_sync() after all data is written to .frm file
Added my_sync() to mysys which will do fsync/fdatasync/_commit() on a file.


VC++Files/mysys/mysys.dsp:
  Added my_sync.c
configure.in:
  Added testing of fsync and fdatasync
include/my_sys.h:
  Added my_sync()
include/mysys_err.h:
  Added my_sync()
isam/extra.c:
  Added my_sync()
myisam/mi_extra.c:
  Added my_sync()
myisam/mi_locking.c:
  Added my_sync()
mysql-test/mysql-test-run.sh:
  Added option --valgrind-all
mysys/Makefile.am:
  Added my_sync.c
mysys/errors.c:
  Added my_sync()
mysys/my_symlink.c:
  Removed compiler warning
mysys/thr_alarm.c:
  Fix for link error on windows
sql/unireg.cc:
  Call my_sync() after all data is written to .frm file
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-11-02 15:55:02 +02:00
unknown
b920ab261e 4 small items in this:
- when we don't have in_addr_t, use uint32.
- a forgotten initialization of slave_proxy_id in sql/log_event.cc (was not really "forgot", was
"we needn't init it there", but there was one case where we needed...).
- made slave_proxy_id always meaningful in THD and Log_event, so we can
rely more on it (no need to test if it's meaningful). THD::slave_proxy_id
is equal to THD::thread_id except for the slave SQL thread.
- clean up the slave's temporary table (i.e. free their memory) when slave
server shuts down.


extra/resolveip.c:
  removed #define as it is simpler to put it in my_net.h
  (because we need the #define elsewhere)
include/my_net.h:
  When in_addr_t is not defined, use uint32.
libmysql/libmysql.c:
  using in_addr_t is more generic.
libmysql/manager.c:
  using in_addr_t is more generic.
mysql-test/t/rpl_chain_temp_table.test:
  comments
sql/log_event.cc:
  * Had forgot to initialize slave_proxy_id in the event constructor (char* buf...).
  Initializing is in fact only needed for Create_file_log_event, because
  it uses slave_proxy_id even if it does not write an event to the binlog
  (it uses slave_proxy_id to write it to SQL-LOAD.info).
  * When we write events we now always write slave_proxy_id, which is now always
  meaningful (as thd->slave_proxy_id is now always meaningful, see change in
  sql_class.cc).
sql/mini_client.cc:
  in_addr_t is more generic.
sql/slave.cc:
  A RELAY_LOG_INFO method to free the slave's temporary tables from memory
  at slave's server shutdown.
  It is called by end_slave(), which is called by close_connections(),
  which is called when the server terminates
  (close_connections() is just before clean_up(); putting the call in 
  clean_up() was buggy, as active_mi is already deleted by close_connections().
sql/slave.h:
  new method
sql/sql_class.cc:
  By default we set THD::slave_proxy_id to THD::thread_id,
  so THD::slave_proxy_id is always meaningful (not 0).
  It's always the same as the thread id except for the slave
  SQL thread.
2003-10-31 23:20:23 +01:00
unknown
40ed42e14a minor fix in rm
libmysqld/Makefile.am:
  minor fix for rm
2003-10-31 17:13:42 +03:00
unknown
9396db013a thd->query assignment moved out
of lock scope
2003-10-31 17:03:08 +03:00
unknown
116cf01024 Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/kostja/mysql/mysql-4.0-root
2003-10-30 21:31:15 +03:00
unknown
1d1bdcc6fe comments about designation of thd->where and
thd->proc_info added


sql/sql_class.h:
  comments about thd->where and thd->proc_info
  added
2003-10-30 21:30:20 +03:00
unknown
8a66a844ce Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-10-30 16:13:38 +01:00
unknown
b4bc448eba Fix to be able to run
mysql-test-run --manager --valgrind
(without this fix, the manager fails to start mysqld and the tests hang).


mysql-test/mysql-test-run.sh:
  When running with --manager: the MySQL manager wants the complete path of the
  executable (it uses execv(), not execvp(), so does not search in the $PATH,
  so telling him to start 'valgrind' is not enough, it wants '/usr/bin/valgrind'
  or so).
  So this is a fix to be able to
  mysql-test-run --manager --valgrind
  Plus a warning (previously, if valgrind was not installed, tests silently
  hanged when run with --valgrind).
2003-10-30 16:12:21 +01:00
unknown
faeb0065b7 Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/kostja/mysql/mysql-4.0-root
2003-10-30 12:26:28 +03:00
unknown
55686819aa fix for bug #1634 '"operator new" in my_new wastes memory'
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-10-30 12:25:15 +03:00
unknown
cee3ddb401 Safety fix for adding service name to search config groups 2003-10-30 01:20:38 +02:00
unknown
7da08881a3 Change back service name to MySQL
Don't add service name to read config file segments if it's "MySQL"
Fixed possible memory leak when CHANGE USER failed.


include/mysql_com.h:
  Change back service name to MySQL (With new, better spelling)
myisam/myisamchk.c:
  Improved --help
sql/mysqld.cc:
  Don't add service name to read config file segments if it's "MySQL"
sql/sql_parse.cc:
  Fixed possible memory leak when CHANGE USER failed.
2003-10-30 01:01:53 +02:00
unknown
03dbf8ccbb Fix for BUG#1686
"If 2 master threads with same-name temp table, slave makes bad binlog"
and (two birds with one stone) for
BUG#1240 "slave of slave breaks when STOP SLAVE was issud on parent slave
and temp tables".

Here is the design change:
in a slave running with --log-slave-updates, events are now logged with the
thread id they had on the master. So no more id conflicts between master threads,
but introduces id conflicts between one master thread and one normal 
client thread connected to the slave. This is solved by storing the server id
in the temp table's name.

New test which requires mysql-test-run to be run with --manager,
otherwise it will be skipped.

Undoing a Monty's change (hum, a chill runs down my spine ;) which was
"Cleanup temporary tables when slave ends" in ChangeSet 1.1572.1.1.


mysql-test/mysql-test-run.sh:
  One new test which needs more than one slave so must be hardcoded in mysql-test-run.sh.
sql/log_event.cc:
  The event needs to carry a slave_proxy_id (which is set at event's creation
  and used at event's logging).
  This is used for events created by ::exec_event() in the slave SQL thread:
  now we want to log these events with the thread id they had on the master.
  This is so that several same-name temp tables simultaneously created on
  the master end up with not the same thread id in the slave's binlog.
sql/log_event.h:
  Query and Load need to carry a slave_proxy_id, like they carried a thread_id
  (to replicate temp tables well).
sql/slave.cc:
  Do not free temp tables in the slave SQL thread. Or they will be lost when
  one does STOP SLAVE / START SLAVE.
  We even save them in rli->save_temporary_tables and set thd->temporary_tables=0
  to prevent them to be freed.
sql/sql_base.cc:
  Put the server id in the table cache key name for temp tables
  (we already put the slave_proxy_id, but we also need the server id
  in case normal clients (not slave threads) are using temp tables
  on the slave).
sql/unireg.h:
  4 more bytes, to store the server id.
2003-10-29 14:23:35 +01:00
unknown
a483fd2191 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-10-29 14:01:14 +01:00
unknown
5f2611d318 followup to max_user_connections fix, keep the count more accurate 2003-10-29 08:33:31 +01:00
unknown
efd5a55fcd Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-10-28 19:55:08 +02:00
unknown
b11f9c1053 Fix for problem of installing MySQL as a service with
mysql --install mysql --defualts-file=path-to-file
(Bug #1643)


include/mysql_com.h:
  MySQL should install as default service "mysqld"
sql/mysqld.cc:
  Fix for problem of installing MySQL as a service with
  mysql --install mysql --defualts-file=path-to-file
2003-10-28 18:36:41 +02:00
unknown
710418eb08 row0sel.c:
If innodb_force_recovery >= 5, do not try to fetch an old version of a clustered index record: this reduces crashes when dumping tables from a corrupt database


innobase/row/row0sel.c:
  If innodb_force_recovery >= 5, do not try to fetch an old version of a clustered index record: this reduces crashes when dumping tables from a corrupt database
2003-10-28 15:55:18 +02:00
unknown
8507b00b34 fixes for max_user_connections (connections are now counted even if
max_user_connections is not set - that is no limit - so that when
max_user_connections is set (with SET) old connections are also
taken into account
mutexes are added where appropriate
2003-10-27 15:14:03 +01:00
unknown
8f917ccd9d correct casting in ulonglong2double 2003-10-27 11:18:44 +01:00
unknown
489b3926db cleanup 2003-10-25 22:43:19 +02:00
unknown
0152ed020b Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1228/mysql-4.0
2003-10-25 16:43:18 -04:00
unknown
ca399fec00 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1348/mysql-4.0
2003-10-25 16:31:49 -04:00
unknown
977a1b8eee Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1228/mysql-4.0
2003-10-25 16:23:24 -04:00
unknown
800f2f46d1 added quotas for database names
(fixed bug #1348)


client/mysqldump.c:
  added quotas for database names
2003-10-24 17:26:26 -04:00
unknown
ddd5eebd1e added to mysql_secure_installation
changing root password on all hosts (bug 1228)


scripts/mysql_secure_installation.sh:
  added changing root password on all hosts
2003-10-24 15:20:46 -04:00
unknown
e05ea7b8ea Move the pid file testing after arguments are parsed (previous patch was not correct) 2003-10-24 14:22:54 +03:00
unknown
0d97f0abe4 Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0
2003-10-23 15:29:29 +02:00