Commit graph

11558 commits

Author SHA1 Message Date
unknown
fe60928fe7 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-03-12 23:30:06 +02:00
unknown
2c9487abdc InnoDB: disable unreachable debug functions unless #ifdef UNIV_MEM_DEBUG
innobase/include/mem0dbg.ic:
  Disable debug functions unless #ifdef UNIV_MEM_DEBUG
innobase/mem/mem0dbg.c:
  Disable debug functions unless #ifdef UNIV_MEM_DEBUG
  Make some global variables static
2004-03-12 23:26:13 +02:00
unknown
1bc8817d93 Cast for VC++ compiler errors
sql/log_event.cc:
  Cast for VC++ compiler error
sql/opt_range.cc:
  Cast for VC++ compiler error
2004-03-12 18:05:51 -03:00
unknown
a3ee065b14 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0


client/mysqlbinlog.cc:
  Auto merged
2004-03-12 22:03:27 +01:00
unknown
0f16438954 Force mysqlbinlog to require an argument if --local-load is used
(--local-load alone means "I want files to be prepared for LOAD 
DATA INFILE, in the default temp directory", and mysqlbinlog already
does this without --local-load).


client/mysqlbinlog.cc:
  --local-load always needs an argument; --local-load alone is of no use.
2004-03-12 22:01:29 +01:00
unknown
db98fc8694 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.local:/home/miguel/bk/mysql-4.1
2004-03-12 17:59:06 -03:00
unknown
635b9d7858 InnoDB: remove redundant functions mach_write() and mach_read()
innobase/include/mach0data.h:
  Remove mach_write() and mach_read()
innobase/include/mach0data.ic:
  Remove mach_write() and mach_read()
innobase/mem/mem0dbg.c:
  Replace mach_write() with mach_write_to_4()
  Replace mach_read() with mach_read_from_4()
2004-03-12 22:55:46 +02:00
unknown
8752019413 For to export the renamed functions 2004-03-12 15:51:18 -03:00
unknown
8b11f1c106 fix to make client.c compile on windows 2004-03-12 18:53:45 +03:00
unknown
454b01928a Remove constant parameter MLOG_8BYTES from mtr_read_dulint() and mlog_write_dulint() 2004-03-12 17:44:25 +02:00
unknown
e1cb1ca6fe Allow UNIV_SYNC_DEBUG to be disabled while UNIV_DEBUG is enabled 2004-03-12 17:14:51 +02:00
unknown
4d8ebaf8ca Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-03-12 15:43:53 +01:00
unknown
5ddad9ae78 - added AC_PROG_LIBTOOL to innobase/configure.in to be able to compile
MySQL with InnoDB on IBM AIX 5.2 in 64bit mode (which requires a special
   AR flag)


innobase/configure.in:
   - added AC_PROG_LIBTOOL to be able to compile MySQL with InnoDB on IBM
     AIX 5.2 in 64bit mode (which requires a special AR flag)
2004-03-12 15:42:26 +01:00
unknown
9a817bea5a Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-03-12 15:56:29 +02:00
unknown
8f59091a71 Fixes to newly pushed code 2004-03-12 15:56:28 +02:00
unknown
de448d41c0 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2985/mysql-4.0


sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
2004-03-12 17:56:27 +04:00
unknown
7430fc2e14 extra correction of check_db_name, check_table_name and check_column_name 2004-03-12 17:55:33 +04:00
unknown
c4ddf58428 Rudimentary part of libmysql patch:
set_mysql_error is deployed


libmysql/client_settings.h:
  declaration for set_mysql_error
libmysql/libmysql.c:
  - set_mysql_error moved to client.c
  - st_stmt_errmsg -> set_stmt_error
sql-common/client.c:
  deployment of set_mysql_error
2004-03-12 15:21:48 +03:00
unknown
8b328b24c9 Replace ut_anp with ut_a
innobase/include/ut0dbg.h:
  Remove ut_anp
  Replace fprintf with fputs
  Move string constants to .c file
innobase/ut/ut0dbg.c:
  Move string constants to .c file
2004-03-12 13:46:26 +02:00
unknown
54042aa975 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.spa
2004-03-12 12:05:08 +04:00
unknown
f84ec3c062 Spatial code changed to get rid of inconsistent this->* operation
Now we use virtual calls instead and redirect VMT pointer of the
geometry object with 'new' operation


sql/field.cc:
  Usage of the Geometry class changed
sql/item_geofunc.cc:
  Usage of the Geometry class changed
sql/spatial.cc:
  Now we rewrite the real VMT of the object with new operation
sql/spatial.h:
  No need for the VMT-like structure and pointers to it
sql/sql_yacc.yy:
  enum items was renamed accordingly to coding standards
2004-03-12 12:04:00 +04:00
unknown
f85032f16e Portability fixes & fixing of test suite
mysql-test/r/func_math.result:
  Updated tests after merge with 3.23
mysql-test/r/multi_update.result:
  Fixed not portable test
mysql-test/r/mysqlbinlog.result:
  Fixed test after push without doing 'make test'
mysql-test/t/multi_update.test:
  Fixed not portable test
sql/sql_parse.cc:
  Don't use static inline, as this is not portable
2004-03-12 09:15:08 +02:00
unknown
965158f28f Merge
mysql-test/install_test_db.sh:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  SCCS merged
2004-03-12 01:13:04 +02:00
unknown
dd8b25510e Merge with 3.23 to get patch for floor()
BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_check.c:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/t/func_math.test:
  Auto merged
sql/item_func.cc:
  Auto merged
2004-03-12 01:12:14 +02:00
unknown
a1d9e1eec4 Ensure that install_test_db.sh script works with both 'make install' and 'make_binary_distribution' layouts
Abort if we can't allocate memory for table cache
Fix bug with multi-update-tables and BDB tables.


extra/replace.c:
  Fix comments
mysql-test/install_test_db.sh:
  Change internal option from -bin to --bin
  Ensure that script works with both 'make install' and 'make_binary_distribution' layouts (Bug #3031)
mysql-test/mysql-test-run.sh:
  Change internal option from -bin to --bin
sql/ha_berkeley.cc:
  More debug
sql/mysql_priv.h:
  Change table_cache_init to return error
sql/mysqld.cc:
  Abort if we can't allocate memory for table cache. (Bug #3085)
  Enable warnings by default
sql/sql_base.cc:
  Change table_cache_init to return error
sql/sql_update.cc:
  Fix bug with multi-update-tables and BDB tables. Bug #3098
  Problem was that we didn't initialize BDB for calls to rnd_pos()
2004-03-12 01:10:22 +02:00
unknown
bebe22a99e Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-03-11 23:13:43 +02:00
unknown
edc17c009a More consistent handling of magic numbers
innobase/include/data0data.h:
  dtuple_struct:magic_n: Enclose in #ifdef UNIV_DEBUG
innobase/dict/dict0dict.c:
  Use magic_n only #ifdef UNIV_DEBUG
innobase/dict/dict0mem.c:
  Use magic_n only #ifdef UNIV_DEBUG
innobase/ha/hash0hash.c:
  Remove unused functions hash_mutex_enter_all and hash_mutex_exit_all
  Use magic_n only #ifdef UNIV_DEBUG
  Add ut_ad(table->magic_n == HASH_TABLE_MAGIC_N)
innobase/include/dict0mem.h:
  Use magic_n only #ifdef UNIV_DEBUG
innobase/include/hash0hash.h:
  Remove unused functions hash_mutex_enter_all and hash_mutex_exit_all
  Use magic_n only #ifdef UNIV_DEBUG
innobase/include/hash0hash.ic:
  Add ut_ad(table->magic_n == HASH_TABLE_MAGIC_N)
innobase/include/mtr0mtr.h:
  Use state, magic_n only #ifdef UNIV_DEBUG
innobase/include/row0ins.h:
  Use magic_n only #ifdef UNIV_DEBUG
innobase/include/row0upd.h:
  Use magic_n only #ifdef UNIV_DEBUG
innobase/row/row0ins.c:
  Use magic_n only #ifdef UNIV_DEBUG
  Add ut_ad(node->magic_n == INS_NODE_MAGIC_N)
innobase/row/row0upd.c:
  Use magic_n only #ifdef UNIV_DEBUG
  Add ut_ad(node->magic_n == UPD_NODE_MAGIC_N)
innobase/thr/thr0loc.c:
  Use magic_n only #ifdef UNIV_DEBUG
2004-03-11 23:12:02 +02:00
unknown
e6f59dd60e Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-11 22:27:17 +02:00
unknown
dc970f9518 multi_update.result:
Test case for a #2996 bug fix
multi_update.test:
  test case for a #2996 bug fix
sql_select.cc:
  Fix for a bug #2996 involving multi-table updates over the const tables


sql/sql_select.cc:
  Fix for a bug #2996 involving multi-table updates over the const tables
mysql-test/t/multi_update.test:
  test case for a #2996 bug fix
mysql-test/r/multi_update.result:
  Test case for a #2996 bug fix
2004-03-11 22:26:03 +02:00
unknown
a20bf68aeb merge correcttion in mysql-test/r/mysqldump.result
mysql-test/r/mysqldump.result:
  merge correction
2004-03-11 22:43:10 +04:00
unknown
bb30549439 Fixed error in version. 2004-03-11 20:12:16 +02:00
unknown
f3112e648c Merge
mysql-test/r/mysqldump.result:
  e
mysql-test/t/mysqldump.test:
  SCCS merged
2004-03-11 22:01:25 +04:00
unknown
bd6c4ef400 Fix for BUG#2983 "If statement was killed on master, slave errors despite replicate-wild-ignore-t"
We introduce a new function mysql_test_parse_for_slave().
If the slave sees that the query got a really bad error on master
(killed e.g.), then it calls this function to know if this query
can be ignored because of replicate-*-table rules (do not worry
about replicate-*-db rules: they are checked so early that they have
no bug). If the answer is yes, it skips the query and continues. If
it's no, then it stops and say "fix your slave data manually" (like it
did before this change).


mysql-test/r/rpl_error_ignored_table.result:
  result update
mysql-test/t/rpl_error_ignored_table-slave.opt:
  ignore more tables
mysql-test/t/rpl_error_ignored_table.test:
  we test if a killed query on the master, is ignored on the slave
  if the tables it involves should be excluded because of replicate-*-table
  rules.
sql/log_event.cc:
  If the query got a really bad error on the master (thread killed etc),
  parse it to test the table names: if the replicate-*-do|ignore-table
  rules say "this query must be ignored" then we exit gracefully;
  otherwise we warn about the bad error and tell DBA to check/fix it.
  Before this change, we always warned and stopped.
sql/mysql_priv.h:
  new function
sql/slave.cc:
  don't print error immediately as we need to do one more test to
  be sure.
sql/sql_parse.cc:
  we add a function mysql_test_parse_for_slave(), to be used only
  by the slave if it wants to know if the query should be ignored or not;
  so this function only parses the query, does not execute it.
2004-03-11 17:38:19 +01:00
unknown
b1e0a38f18 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0


sql/set_var.cc:
  Auto merged
2004-03-11 16:24:47 +01:00
unknown
f808030209 Fix for BUG#2921 "Replication problem on mutex lock in mySQL-4.0.18":
re-using unused LOCK_active_mi to serialize all administrative
commands related to replication:
START SLAVE, STOP SLAVE, RESET SLAVE, CHANGE MASTER, init_slave()
(replication autostart at server startup), end_slave() (replication
autostop at server shutdown), LOAD DATA FROM MASTER.
This protects us against a handful of deadlocks (like BUG#2921
when two START SLAVE, but when two STOP SLAVE too).
Removing unused variables.


sql/item_func.cc:
  We don't need LOCK_active_mi just to MASTER_POS_WAIT().
sql/repl_failsafe.cc:
  no need for macro
sql/set_var.cc:
  no need for macro
sql/slave.cc:
  Re-using unused LOCK_active_mi to serialize all administrative
  commands related to replication:
  START SLAVE, STOP SLAVE, RESET SLAVE, CHANGE MASTER, init_slave()
  (replication autostart at server startup), end_slave() (replication
  autostop at server shutdown), LOAD DATA FROM MASTER.
  This protects us against a handful of deadlocks.
  Removing unused variables.
sql/slave.h:
  Re-using LOCK_active_mi to serialize administrative replication commands.
  Macros unneeded. Removing unneeded variables.
sql/sql_parse.cc:
  found unused variable.
  Replacing macros.
sql/sql_show.cc:
  replacing macros
2004-03-11 16:23:35 +01:00
unknown
cf58302d8b fixed bug #2591 "mysqldump quotas names inconsistently"
mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"
2004-03-11 18:46:27 +04:00
unknown
cb9f304897 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-03-11 16:37:00 +02:00
unknown
713ca805f3 Remove remaining references to the built-in ODBC driver of InnoDB
BitKeeper/deleted/.del-ib_odbc.h~6882a6fe66f9b3e:
  Delete: innobase/include/ib_odbc.h
BitKeeper/deleted/.del-odbc0odbc.h~6cdf5ecedbf3b3f0:
  Delete: innobase/include/odbc0odbc.h
innobase/include/Makefile.am:
  Remove odbc0odbc.h and ib_odbc.h
innobase/srv/srv0srv.c:
  Remove reference to odbc0odbc.h
innobase/include/pars0pars.h:
  Remove unused functions related to ODBC and stored procedures
  Made pars_print_lexed conditional [UNIV_SQL_DEBUG]
innobase/pars/pars0pars.c:
  Remove unused functions related to ODBC and stored procedures
  Made pars_print_lexed conditional [UNIV_SQL_DEBUG]
  Output to stderr instead of stdout
2004-03-11 16:36:19 +02:00
unknown
89cdc136b6 Remove libcom.a from acinclude.m4 (should have been done in ChangeSet 1.1741)
acinclude.m4:
  innodb_libs: Remove libcom.a
2004-03-11 16:29:16 +02:00
unknown
1999806733 a fix (bug #2885: like datetime) 2004-03-11 18:21:57 +04:00
unknown
27b6f2837b Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-11 15:41:09 +02:00
unknown
233c422f80 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0
into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.0
2004-03-11 15:41:08 +02:00
unknown
46e4f5984c Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-03-11 15:41:07 +02:00
unknown
24f85213cd Small fixes.
client/mysqlbinlog.cc:
  Patched patch for Bug#2491.
sql/set_var.cc:
  Added max_insert_delayed_threads into 'SHOW VARIABLES'.
2004-03-11 15:41:07 +02:00
unknown
3767866654 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
2004-03-11 17:41:06 +04:00
unknown
39b63f9281 mysqldump.c:
reverting fix


client/mysqldump.c:
  reverting fix
2004-03-11 15:35:08 +02:00
unknown
3fbf812f78 Remove unneeded module "com"
BitKeeper/deleted/.del-Makefile.am~2b013aa835a140c4:
  Delete: innobase/com/Makefile.am
BitKeeper/deleted/.del-com0com.c~473a1f0f440ce91b:
  Delete: innobase/com/com0com.c
BitKeeper/deleted/.del-com0shm.c~6a16f0c3d81de1f:
  Delete: innobase/com/com0shm.c
BitKeeper/deleted/.del-makefilewin~3e26f0df100887f2:
  Delete: innobase/com/makefilewin
BitKeeper/deleted/.del-com0com.h~533a7eaa16ec585a:
  Delete: innobase/include/com0com.h
BitKeeper/deleted/.del-com0com.ic~671e309916e285b:
  Delete: innobase/include/com0com.ic
BitKeeper/deleted/.del-com0shm.h~5f3df7c04221b0fe:
  Delete: innobase/include/com0shm.h
BitKeeper/deleted/.del-com0shm.ic~f827cfca1603fa6b:
  Delete: innobase/include/com0shm.ic
innobase/configure.in:
  Remove com/Makefile
innobase/include/Makefile.am:
  Remove com*.h
innobase/include/usr0sess.h:
  Remove unused communication functions
innobase/include/usr0sess.ic:
  Remove unused communication functions
innobase/include/usr0types.h:
  Remove sess_sys_t and sess_sig_t
innobase/usr/usr0sess.c:
  Remove unused functions
innobase/dict/dict0crea.c:
  Remove unneeded params of que_fork_start_command()
innobase/include/que0que.h:
  Remove unneeded params of que_fork_start_command()
innobase/row/row0mysql.c:
  Remove unneeded params of que_fork_start_command()
innobase/include/srv0srv.h:
  Remove references to the com module
innobase/srv/srv0srv.c:
  Remove references to the com module
  Remove unused vars srv_n_{com,worker}_threads
  Make some global vars static
innobase/que/que0que.c:
  Remove references to odbc
  Add #ifdef UNIV_SYNC_DEBUG around some ut_ad()
  Remove unneeded params of que_fork_start_command()
  Remove unreachable code
  Output diagnostics to stderr, not stdout
innobase/include/trx0trx.h:
  Remove unneeded params of trx_sig_send() and trx_sig_reply()
innobase/trx/trx0trx.c:
  Remove unneeded params of trx_sig_send() and trx_sig_reply()
  Remove params of sess_open()
innobase/srv/srv0start.c:
  Remove reference to com0com.h
  Remove call to sess_sys_init_at_db_start()
innobase/trx/trx0purge.c:
  Remove references to the com module
  Remove params of sess_open()
  Remove unneeded params of que_fork_start_command()
innobase/trx/trx0roll.c:
  Remove params of sess_open()
  Remove unneeded params of que_fork_start_command()
  Remove unneeded params of trx_sig_send() and trx_sig_reply()
2004-03-11 12:55:28 +02:00
unknown
4d47802f25 sync0arr.c, os0file.h:
Print always the count of pending pread() and pwrite() calls if there is a long semaphore wait


innobase/include/os0file.h:
  Print always the count of pending pread() and pwrite() calls if there is a long semaphore wait
innobase/sync/sync0arr.c:
  Print always the count of pending pread() and pwrite() calls if there is a long semaphore wait
2004-03-11 10:38:37 +02:00
unknown
06b776f910 data0data.c:
Do not test a magic number with =, use == instead :)


innobase/data/data0data.c:
  Do not test a magic number with =, use == instead :)
2004-03-11 10:26:08 +02:00
unknown
8dcefa6f47 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0


mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2004-03-10 23:36:22 +04:00