Commit graph

7984 commits

Author SHA1 Message Date
unknown
098a1e3afa Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug2688
2004-06-24 12:07:00 +02:00
unknown
b24c837ecd Development.fgl:
add typelib.h to filelist
Clients and Tools.fgl:
  add libmysql.dll to file list
4.0.XX-gpl.ipr:
  Various fixes to installshield project file (added files)


VC++Files/InstallShield/4.0.XX-gpl/4.0.XX-gpl.ipr:
  Various fixes to installshield project file (added files)
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl:
  add libmysql.dll to file list
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl:
  add typelib.h to filelist
2004-06-23 21:02:37 -07:00
unknown
e31f042f84 Do-rpm:
Small fix to handle the src rpm file correctly (contains '0', release number in spec file)


Build-tools/Do-rpm:
  Small fix to handle the src rpm file correctly (contains '0', release number in spec file)
2004-06-23 20:26:20 -07:00
unknown
429f9d05a2 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-06-23 16:44:54 +03:00
unknown
3db93f8086 lower_case_table_names=2 (Keep case for table names) was not honored
with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
Make net_buffer_length visible for mysql clients (Bug #4206)


include/mysql.h:
  Make net_buffer_length visible for mysql clients
libmysql/libmysql.c:
  Make net_buffer_length visible for mysql clients
mysql-test/mysql-test-run.sh:
  Don't give warning for some common 'safe' warnings
mysql-test/r/lowercase_table2.result:
  Test name conversion with ALTER TABLE / CREATE INDEX (Bug #3109)
mysql-test/t/lowercase_table2.test:
  Test name conversion with ALTER TABLE / CREATE INDEX (Bug #3109)
scripts/mysql_install_db.sh:
  Removed not used variable
sql/sql_table.cc:
  lower_case_table_names=2 (Keep case for table names) was not honored
  with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
2004-06-23 16:44:34 +03:00
unknown
a2c506702e Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-06-23 12:17:50 +03:00
unknown
9a9c59db83 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0
2004-06-22 13:03:20 -05:00
unknown
5b2e07b1c8 Merge here.mwagner.org:/Volumes/BK/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
2004-06-22 12:58:47 -05:00
unknown
05d7867d57 my_md5sum:
Change behaviour to be like the md5sum in GNU coreutils


Build-tools/my_md5sum:
  Change behaviour to be like the md5sum in GNU coreutils
2004-06-22 12:57:52 -05:00
unknown
1c1dcdd152 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-06-22 17:55:57 +02:00
unknown
1f9209cc04 - rephrased comment 2004-06-22 17:54:38 +02:00
unknown
e2e0eb3bc0 - Applied some portability fixes for SGI IRIX/MipsPro compiler
(e.g. a fix for BUG#3507 and some modifications recommended
   by Andrea Suatoni and Joerg Behrens - thank you!)


acinclude.m4:
   - OpenSSL libs are installed in /usr/freeware/include and
     /usr/freeware/lib32 on SGI IRIX - expanded search list
man/mysqlaccess.1.in:
   - cosmetical fix
man/mysqldump.1.in:
   - cosmetical fix
mysys/hash.c:
   - portability fix: some compilers can't handle inlining of rec_hashnr
     (BUG#3507)
vio/test-sslserver.c:
   - portability fix for SGI MipsPro compiler: define client_len as
     "socklen_t" instead of "size_t"
2004-06-22 17:35:34 +02:00
unknown
8f3b8de272 bug#2688 - Wrong index_merge query results for BDB table with variable length primary key.
dded code to clear the tail of the reference buffer if the actual key length 
is less than the maximum key length.


mysql-test/r/bdb.result:
  bug#2688 - Wrong index_merge query results for BDB table with variable length primary key.
  Added the test case results.
mysql-test/t/bdb.test:
  bug#2688 - Wrong index_merge query results for BDB table with variable length primary key.
  Added the test case.
sql/ha_berkeley.cc:
  bug#2688 - Wrong index_merge query results for BDB table with variable length primary key.
  Added code to clear the tail of the reference buffer if the actual key length 
  is less than the maximum key length.
2004-06-22 17:27:57 +02:00
unknown
a331664dab lexyy.c, pars0lex.l:
Document the handling of quoted strings


innobase/pars/pars0lex.l:
  Document the handling of quoted strings
innobase/pars/lexyy.c:
  Document the handling of quoted strings
2004-06-22 16:15:58 +03:00
unknown
81221dcbdc Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-06-22 16:14:21 +03:00
unknown
4d39221a0f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
2004-06-22 13:22:00 +03:00
unknown
073de02c13 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0


mysql-test/r/range.result:
  Auto merged
2004-06-21 19:44:20 +03:00
unknown
83a4e46d8e use ref not range for ... WHERE key IN (val) 2004-06-21 19:42:00 +03:00
unknown
a6204676ee Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-06-21 11:06:45 +03:00
unknown
306942c94c do not clear list of changed tables on one statement rollback (Bug #4213)
mysql-test/r/innodb_cache.result:
  test of rollback one statement in transaction
mysql-test/t/innodb_cache.test:
  test of rollback one statement in transaction
sql/handler.cc:
  clear changed tables list only for total roll back
2004-06-20 23:44:21 +03:00
unknown
94df4f36dd mem0dbg.c:
InnoDB with UNIV_MEM_DEBUG did not compile because a global variable was forgotten when we put back mem_print_info() functions 2 days ago; add that variable


innobase/mem/mem0dbg.c:
  InnoDB with UNIV_MEM_DEBUG did not compile because a global variable was forgotten when we put back mem_print_info() functions 2 days ago; add that variable
2004-06-19 12:12:00 +03:00
unknown
c02eb02cd4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work


BitKeeper/etc/logging_ok:
  auto-union
2004-06-18 15:00:17 -05:00
unknown
00ad281dae my_md5sum:
new file, simulates 'md5sum' as a perl script


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-18 14:57:42 -05:00
unknown
eac5455aa4 mach0data.ic, mach0data.h:
Improve documentation of mach_*write_*compressed()
mtr0log.ic, mtr0log.h:
  Improve documentation of mlog_write_initial_log_record_fast()


innobase/include/mtr0log.h:
  Improve documentation of mlog_write_initial_log_record_fast()
innobase/include/mtr0log.ic:
  Improve documentation of mlog_write_initial_log_record_fast()
innobase/include/mach0data.h:
  Improve documentation of mach_*write_*compressed()
innobase/include/mach0data.ic:
  Improve documentation of mach_*write_*compressed()
2004-06-18 15:54:19 +03:00
unknown
20985f3e90 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0
into hegel.txg:/home/miguel/bk/mysql-4.0
2004-06-18 01:43:25 -03:00
unknown
0badf47d5a Fix for bug #4182
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-18 01:42:28 -03:00
unknown
5fa063ba7e ke it possible to use mysys functions in netware/mysql_test_run.c
Don't pass --user to mysqld if --user is not used


netware/Makefile.am:
  Make it possible to use mysys functions in mysql_test_run.c
netware/mysql_test_run.c:
  Make it possible to use mysys functions in mysql_test_run.c
scripts/mysql_install_db.sh:
  Don't pass --user to mysqld if --user is not used
2004-06-18 04:22:43 +03:00
unknown
81ceac59f8 Removed not used file sql_olap.cc 2004-06-18 03:26:28 +03:00
unknown
32f5a8eb11 Applied patch from Novell (2004-06-03) 2004-06-18 03:23:08 +03:00
unknown
8764abf237 Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0
libmysql/libmysql.c:
  Auto merged
2004-06-18 02:48:01 +03:00
unknown
2871477d5d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-06-18 02:31:36 +03:00
unknown
209cfe7758 Fixed unlikely bug in the range optimzer when using many IN() queries on different key parts. (Bug #4157)
mysql-test/r/range.result:
  Test of range optimizer bug
mysql-test/t/range.test:
  Test of range optimizer bug
sql/opt_range.cc:
  Fixed unlikely bug in the range optimzer when using many IN() queries on
  different key parts. (Bug #4157)
2004-06-18 02:31:11 +03:00
unknown
6646140f39 mem0dbg.h, mem0dbg.c:
Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base


innobase/mem/mem0dbg.c:
  Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base
innobase/include/mem0dbg.h:
  Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base
2004-06-17 17:30:33 +03:00
unknown
b57fe1e26a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-3.23
into mysql.com:/home/mysql_src/mysql-3.23


libmysql/libmysql.c:
  Auto merged
2004-06-17 15:41:54 +02:00
unknown
414250c4f2 Fix for BUG#4017 "mysql_real_connect buffer overflow"
libmysql/libmysql.c:
  safety fix
2004-06-17 15:40:13 +02:00
unknown
1ebf24b957 que0que.c, srv0que.c:
Put asserts that make sure srv_que_task_enqueue() is never called under MySQL


innobase/srv/srv0que.c:
  Put asserts that make sure srv_que_task_enqueu() is never called under MySQL
innobase/que/que0que.c:
  Put asserts that make sure srv_que_task_enqueu() is never called under MySQL
2004-06-17 16:05:19 +03:00
unknown
3774abe3c0 log0recv.c:
Revert the patch that put log debug code behind UNIV_LOG_DEBUG


innobase/log/log0recv.c:
  Revert the patch that put log debug code behind UNIV_LOG_DEBUG
2004-06-17 15:13:27 +03:00
unknown
e08b4cbf30 log0log.h:
Revert the patch that put log debug code behind UNIV_LOG_DEBUG
log0log.ic, log0recv.c, log0log.c, log0log.h:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version


innobase/log/log0log.c:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
innobase/log/log0recv.c:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
innobase/include/log0log.ic:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
innobase/include/log0log.h:
  Revert the patch that put log debug code behind UNIV_LOG_DEBUG
2004-06-17 15:11:37 +03:00
unknown
2c259f0e89 Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040316101802|63386
innobase/include/que0que.h:
  Exclude
innobase/include/que0que.ic:
  Exclude
innobase/que/que0que.c:
  Exclude
2004-06-17 14:01:56 +03:00
unknown
04bddf7532 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-06-17 14:01:55 +03:00
unknown
82472a06f3 Fixed issue 'the definition of macro DES_ede3_cbc_encrypt is corrupt' 2004-06-17 15:01:54 +04:00
unknown
a7139dd280 Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613
innobase/trx/trx0sys.c:
  Remove #ifdef UNIV_HOT_BACKUP: best to keep the codebase as uniform as possible
innobase/dict/dict0dict.c:
  Exclude
innobase/dict/dict0mem.c:
  Exclude
innobase/ha/hash0hash.c:
  Exclude
innobase/include/data0data.h:
  Exclude
innobase/include/dict0mem.h:
  Exclude
innobase/include/hash0hash.h:
  Exclude
innobase/include/hash0hash.ic:
  Exclude
innobase/include/mtr0mtr.h:
  Exclude
innobase/include/row0ins.h:
  Exclude
innobase/include/row0upd.h:
  Exclude
innobase/row/row0ins.c:
  Exclude
innobase/row/row0upd.c:
  Exclude
innobase/thr/thr0loc.c:
  Exclude
2004-06-17 13:25:06 +03:00
unknown
3414f67485 Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040526164114|35829
innobase/que/que0que.c:
  Exclude
2004-06-17 12:40:09 +03:00
unknown
beb80a37a6 srv0que.c:
Revert Marko's untested changeset 1.1844.1.6 to the stable 4.0 version; stable 4.0 must NOT BE modified except in case of bugs
srv0que.c, srv0que.h:
  new file


innobase/srv/srv0que.c:
  Revert Marko's untested changeset 1.1844.1.6 to the stable 4.0 version; stable 4.0 must NOT BE modified except in case of bugs
2004-06-17 12:35:04 +03:00
unknown
a00824b53b Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870
BitKeeper/deleted/.del-srv0que.c~d1feebb77b5a9b96:
  Exclude
BitKeeper/deleted/.del-srv0que.h~f12ecb4b5afe203e:
  Exclude
innobase/include/que0que.h:
  Exclude
innobase/include/trx0roll.h:
  Exclude
innobase/include/trx0trx.h:
  Exclude
innobase/include/usr0sess.h:
  Exclude
innobase/que/que0que.c:
  Exclude
innobase/srv/Makefile.am:
  Exclude
innobase/include/Makefile.am:
  Exclude
innobase/srv/srv0srv.c:
  Exclude
innobase/trx/trx0purge.c:
  Exclude
innobase/trx/trx0roll.c:
  Exclude
innobase/trx/trx0trx.c:
  Exclude
innobase/usr/usr0sess.c:
  Exclude
2004-06-17 11:57:45 +03:00
unknown
6a99971f1b 2004-06-17 11:57:24 +03:00
unknown
c1ef1bea7d Cset exclude: heikki@hundin.mysql.fi|ChangeSet|20040617084849|64488
sql/sql_parse.cc:
  Exclude
2004-06-17 11:53:17 +03:00
unknown
1696521e69 Cset exclude: guilhem@mysql.com|ChangeSet|20040609132715|17355
sql/sql_parse.cc:
  Exclude
2004-06-17 11:48:49 +03:00
unknown
c0edb2e0ce ut0mem.c:
Remove printf's that were accidentally pushed in the last push


innobase/ut/ut0mem.c:
  Remove printf's that were accidentally pushed in the last push
2004-06-16 23:46:47 +03:00
unknown
ce4973d616 ut0mem.h, ut0mem.c:
Implement ut_realloc
lexyy.c, pars0lex.l:
  Start using ut_malloc, ut_free, ut_realloc in pars0lex.l and lexyy.c; mem_realloc was broken; eliminate possible memcpy(NULL, ..., 0) from string_append()


innobase/pars/pars0lex.l:
  Start using ut_malloc, ut_free, ut_realloc in pars0lex.l and lexyy.c; mem_realloc was broken; eliminate possible memcpy(NULL, ..., 0) from string_append()
innobase/pars/lexyy.c:
  Start using ut_malloc, ut_free, ut_realloc in pars0lex.l and lexyy.c; mem_realloc was broken; eliminate possible memcpy(NULL, ..., 0) from string_append()
innobase/ut/ut0mem.c:
  Implement ut_realloc
innobase/include/ut0mem.h:
  Implement ut_realloc
2004-06-16 23:42:58 +03:00