Commit graph

7678 commits

Author SHA1 Message Date
unknown
57c48a22b6 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-23 19:26:03 +01:00
unknown
d7801e0624 comment 2004-03-23 19:25:30 +01:00
unknown
a99039f8bf Changes to project files precipitated from 4.1 test builds.
BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28:
  Delete: VC++Files/libmysql/libmysql.def
VC++Files/innobase/innobase.dsp:
  'com' module no longer exists.
VC++Files/strings/MASM6x/strings.dsp:
  Add strnlen
VC++Files/strings/strings.dsp:
  Add strnlen
2004-03-22 14:30:30 -07:00
unknown
76bff7b6b6 sync0sync.c:
Actually, assembler is used onnly on 32-bit x86 Win, and no need to exclude Netware specifically


innobase/sync/sync0sync.c:
  Actually, assembler is used onnly on 32-bit x86 Win, and no need to exclude Netware specifically
2004-03-22 18:11:13 +02:00
unknown
741f55c667 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-03-22 18:07:49 +02:00
unknown
c656035e67 sync0sync.c:
Fix typo __NETWARE --> __NETWARE__ in mutex creation


innobase/sync/sync0sync.c:
  Fix typo __NETWARE --> __NETWARE__ in mutex creation
2004-03-22 18:06:26 +02:00
unknown
6a4c0ccb14 "automagically" is not a word. 2004-03-22 09:38:57 -06:00
unknown
071aed6980 Fixed wrong 'mysql.func' definition 2004-03-22 11:18:29 +02:00
unknown
331ff0d8f5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-20 15:49:55 +01:00
unknown
02d2d70cb1 The automatic DROP TEMPORARY TABLE is now DROP TEMPORARY TABLE IF EXISTS,
this is better in this case:
- imagine user1 has created a temp table
- imagine user2 does FLUSH TABLES WITH READ LOCK, then takes a backup,
then RESET MASTER then UNLOCK TABLES, like mysqldump --first-slave
- then in the binlog you will finally have the DROP TEMPORARY TABLE,
but not the CREATE TEMPORARY TABLE, so when you later restore with
mysqlbinlog|mysql, mysql will complain that table does not exist.
Replication was already protected of this (it processes DROP TEMPORARY
TABLE as if there was a IF EXISTS), now I add it directly to the query
for mysqlbinlog|mysql to work.


mysql-test/r/drop_temp_table.result:
  result update (query changed)
2004-03-20 15:49:17 +01:00
unknown
3e5f1eaecf btr0btr.c:
Correct previous bk commit comment about page splits: actually, in versions < 4.0.19 space utilization is very poor if 1500 - 8000 byte rows are inserted in the order of the primary key


innobase/btr/btr0btr.c:
  Correct previous bk commit comment about page splits: actually, in versions < 4.0.19 space utilization is very poor if 1500 - 8000 byte rows are inserted in the order of the primary key
2004-03-20 06:09:18 +02:00
unknown
72d15bccaa btr0btr.c:
Improve space utilization if we have 3 kB - 8 kB rows to insert in the order of the primary key
btr0cur.c:
  Fix bug: The row count and key cardinality estimate was grossly too small if each clustered index page only contained one record


innobase/btr/btr0cur.c:
  Fix bug: The row count and key cardinality estimate was grossly too small if each clustered index page only contained one record
innobase/btr/btr0btr.c:
  Improve space utilization if we have 3 kB - 8 kB rows to insert in the order of the primary key
2004-03-19 22:51:25 +02:00
unknown
eb72cf6649 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-03-19 18:57:45 +01:00
unknown
a53fc49e80 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2004-03-19 18:50:18 +01:00
unknown
84418a9edc - Do-pkg: PGK and DMG names now include the full arch name (e.g.
"-apple-darwin7.3.0-powerpc") - this is needed as we now will provide
   Mac OS X 10.2.x and Mac OS X 10.3.x PGKs (and it's more in line of
   how we name all other packages)


Build-tools/Do-pkg:
   - PGK and DMG names now include the full arch name (e.g. 
     "-apple-darwin7.3.0-powerpc") - this is needed as we now will provide
     Mac OS X 10.2.x and Mac OS X 10.3.x PGKs (and it's more in line of
     how we name all other packages)
2004-03-19 18:49:14 +01:00
unknown
fd15d5ae1f Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-19 18:09:32 +01:00
unknown
c56697f095 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-19 17:37:36 +01:00
unknown
86ae07cd24 Portability fixes
Fixed some wrong column specifications in mysql_fix_privilege_tables


mysql-test/mysql-test-run.sh:
  Portability fix
mysql-test/r/func_math.result:
  portability fix
mysql-test/r/rpl_error_ignored_table.result:
  portability fix
mysql-test/t/func_math.test:
  portability fix
mysql-test/t/rpl_error_ignored_table.test:
  portability fix
scripts/mysql_fix_privilege_tables.sh:
  func.name was not generated correctly
scripts/mysql_fix_privilege_tables.sql:
  Fixed some wrong column specifications
2004-03-19 18:26:02 +02:00
unknown
88267ae534 typo in mysql_install_db fixed
scripts/mysql_install_db.sh:
  typo fixed
  (thanks Alex Dupre <ale@FreeBSD.org> for noticing this!)
2004-03-19 17:19:33 +01:00
unknown
6b46555767 Removed \r 2004-03-19 15:03:12 +02:00
unknown
9935110b30 Portability fixes
Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work


client/mysqltest.c:
  More debug information
innobase/que/que0que.c:
  Fixed wrong usage of __attribute
mysql-test/mysql-test-run.sh:
  Portability fix; Added CLIENT_BINDIR
mysql-test/t/system_mysql_db_fix.test:
  Removed \r
mysql-test/t/system_mysql_db_refs.test:
  Removed \r
scripts/mysql_fix_privilege_tables.sh:
  Don't set root password from first option
  Added --bindir option
2004-03-19 14:52:48 +02:00
unknown
00ff1f609e Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-03-19 13:04:46 +02:00
unknown
c6a0599642 WL #1510 "Implement support for "commercial" binaries on handshake",
client library:
- implemented 'check_license' function


include/errmsg.h:
  WL #1510: new error code
include/mysql_version.h.in:
  WL #1510: fallback define for LICENSE
libmysql/errmsg.c:
  WL #1510: error message to print in case when client and server license 
  mismatch.
libmysql/libmysql.c:
  WL#1510: implementation of 'check_license' function
sql/set_var.cc:
  removed unused variable 'license'
2004-03-17 20:04:50 +03:00
unknown
d730756649 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-17 21:04:49 +04:00
unknown
6fd2a7bcba fixed structure error from last merge for bug #2874
BitKeeper/deleted/.del-system_mysql_db.test~f5a7ec0e9440c043:
  Delete: mysql-test/t/reserv/system_mysql_db.test
BitKeeper/deleted/.del-system_mysql_db_fix.test~180b2fd4873a9c49:
  Delete: mysql-test/t/reserv/system_mysql_db_fix.test
BitKeeper/deleted/.del-system_mysql_db_fix-master.opt~2897a9ebb17f930e:
  Delete: mysql-test/t/reserv/system_mysql_db_fix-master.opt
BitKeeper/deleted/.del-system_mysql_db_refs.test~e5bffdb55190a23c:
  Delete: mysql-test/t/reserv/system_mysql_db_refs.test
2004-03-17 21:01:07 +04:00
unknown
8b623739ef Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-17 10:35:55 +01:00
unknown
9d78adc16f Fix for BUG#2922 "Crash (signal11) after "load data from master""
with a testcase.
We needed to init_master_info before we flush_master_info
in LOAD DATA FROM MASTER.


mysql-test/r/rpl000009.result:
  result update
mysql-test/t/rpl000009.test:
  adding a test for RESET SLAVE + LOAD DATA FROM MASTER
sql/repl_failsafe.cc:
  LOAD DATA FROM MASTER udpates the master info in the slave,
  so needs to ensure that it is properly inited first
  (otherwise, after RESET SLAVE, we are flush_io_cache()ing
  an uninitialized IO_CACHE master.info).
  Note that it master info is already inited (active_mi->inited==1),
  init_master_info() will do nothing, which is what we want.
2004-03-17 10:35:03 +01:00
unknown
b54698374b Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-03-17 10:25:53 +02:00
unknown
d6b91f6cb2 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-16 22:25:16 +01:00
unknown
5164e2911e Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0
2004-03-16 11:43:53 -06:00
unknown
e5fa42d9e8 Fix usage line. 2004-03-16 11:42:35 -06:00
unknown
7812cd8737 InnoDB: Remove some debug variables unless UNIV_SEARCH_PERF_STAT is defined
innobase/btr/btr0sea.c:
  Remove variable btr_search_n_succ unless #ifdef UNIV_SEARCH_PERF_STAT
innobase/include/btr0sea.h:
  Remove variable btr_search_n_succ unless #ifdef UNIV_SEARCH_PERF_STAT
innobase/page/page0cur.c:
  Make page_rnd a static variable
  Remove variable page_cur_short_succ unless #ifdef UNIV_SEARCH_PERF_STAT
innobase/include/page0cur.h:
  Remove variable page_cur_short_succ unless #ifdef UNIV_SEARCH_PERF_STAT
2004-03-16 18:55:44 +02:00
unknown
8d2bb926fb InnoDB: Make btr_cur_unmark_extern_fields() a static function
innobase/btr/btr0cur.c:
  Make btr_cur_unmark_extern_fields() a static function
innobase/include/btr0cur.h:
  Remove btr_cur_unmark_extern_fields()
2004-03-16 15:26:33 +02:00
unknown
e11a162bc4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-03-16 13:52:05 +02:00
unknown
771233cefb Increase max size of number of elements in key. This fixed a bug when using count(DISTINCT) with lot of distinct values and big 'max_heap_table_size' 2004-03-16 13:51:35 +02:00
unknown
2bda791f27 InnoDB: Remove unused directory "cry"
BitKeeper/deleted/.del-makefilewin~f993e50b7f057fde:
  Delete: innobase/cry/makefilewin
2004-03-16 12:48:17 +02:00
unknown
2c5fb79089 InnoDB: remove debug code from non-debug version
innobase/include/que0que.h:
  Remove que_graph_is_select()
  Make que_node_print_info() a static function
innobase/include/que0que.ic:
  Remove que_graph_is_select()
innobase/que/que0que.c:
  Remove que_node_print_info() unless #ifdef UNIV_DEBUG
2004-03-16 12:18:02 +02:00
unknown
9b6e7ac1af Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-03-16 11:49:13 +02:00
unknown
924255133b InnoDB: Remove log debug code when UNIV_LOG_DEBUG is not defined
innobase/include/log0log.h:
  Remove debug variables unless #ifdef UNIV_LOG_DEBUG
innobase/include/log0log.ic:
  Remove log_check_log_recs() unless #ifdef UNIV_LOG_DEBUG
innobase/log/log0log.c:
  Remove log_debug_writes unless #ifdef UNIV_LOG_DEBUG
  log_io_complete_checkpoint(): Remove parameter; move debug output to log_io_complete(), the only caller
  Test log_debug_writes only #ifdef UNIV_LOG_DEBUG
innobase/log/log0recv.c:
  Test log_debug_writes only #ifdef UNIV_LOG_DEBUG
2004-03-16 11:48:20 +02:00
unknown
cc5b1779c8 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.0.3067
2004-03-16 11:33:36 +04:00
unknown
5adbc611dd Fix for bug #2629 NULLIF() doesn't behave as described in manual 2004-03-16 11:33:03 +04:00
unknown
277cf702da Remove not needed patch 2004-03-16 02:59:39 +02:00
unknown
e9eb02398c Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-03-13 22:48:58 +02:00
unknown
1f7f2662b9 InnoDB: Replace ut_a(0) with ut_error
innobase/btr/btr0btr.c:
  Replace ut_a(0) with ut_error
innobase/buf/buf0flu.c:
  Replace ut_a(0) with ut_error
innobase/buf/buf0lru.c:
  Replace ut_a(0) with ut_error
innobase/data/data0data.c:
  Replace ut_a(0) with ut_error
innobase/dict/dict0crea.c:
  Replace ut_a(0) with ut_error
innobase/dict/dict0dict.c:
  Replace ut_a(0) with ut_error
innobase/dict/dict0load.c:
  Replace ut_a(0) with ut_error
innobase/fil/fil0fil.c:
  Replace ut_a(0) with ut_error
innobase/fsp/fsp0fsp.c:
  Replace ut_a(0) with ut_error
innobase/ibuf/ibuf0ibuf.c:
  Replace ut_a(0) with ut_error
innobase/include/buf0buf.ic:
  Replace ut_a(0) with ut_error
innobase/include/data0type.ic:
  Replace ut_a(0) with ut_error
innobase/include/mtr0log.ic:
  Replace ut_a(0) with ut_error
innobase/include/trx0rseg.ic:
  Replace ut_a(0) with ut_error
innobase/lock/lock0lock.c:
  Replace ut_a(0) with ut_error
innobase/log/log0log.c:
  Replace ut_a(0) with ut_error
innobase/log/log0recv.c:
  Replace ut_a(0) with ut_error
innobase/mem/mem0pool.c:
  Replace ut_a(0) with ut_error
innobase/mtr/mtr0log.c:
  Replace ut_a(0) with ut_error
innobase/os/os0file.c:
  Replace ut_a(0) with ut_error
innobase/page/page0cur.c:
  Replace ut_a(0) with ut_error
innobase/page/page0page.c:
  Replace ut_a(0) with ut_error
innobase/pars/lexyy.c:
  Replace ut_a(0) with ut_error
innobase/que/que0que.c:
  Replace ut_a(0) with ut_error
innobase/rem/rem0cmp.c:
  Replace ut_a(0) with ut_error
innobase/rem/rem0rec.c:
  Replace ut_a(0) with ut_error
innobase/row/row0ins.c:
  Replace ut_a(0) with ut_error
innobase/row/row0mysql.c:
  Replace ut_a(0) with ut_error
innobase/row/row0purge.c:
  Replace ut_a(0) with ut_error
innobase/row/row0row.c:
  Replace ut_a(0) with ut_error
innobase/row/row0sel.c:
  Replace ut_a(0) with ut_error
innobase/row/row0undo.c:
  Replace ut_a(0) with ut_error
innobase/srv/srv0srv.c:
  Replace ut_a(0) with ut_error
innobase/sync/sync0arr.c:
  Replace ut_a(0) with ut_error
innobase/trx/trx0purge.c:
  Replace ut_a(0) with ut_error
innobase/trx/trx0trx.c:
  Replace ut_a(0) with ut_error
innobase/trx/trx0undo.c:
  Replace ut_a(0) with ut_error
2004-03-13 22:48:00 +02:00
unknown
8dd15d3173 after merge fixes. 2004-03-13 21:22:55 +02:00
unknown
05b1020397 multi_update.result:
Fix for a bug in the result
multi_update.test:
  Fix for a bug in the test


mysql-test/t/multi_update.test:
  Fix for a bug in the test
mysql-test/r/multi_update.result:
  Fix for a bug in the result
2004-03-13 21:06:36 +02:00
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
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