Commit graph

18585 commits

Author SHA1 Message Date
unknown
90b9065dce Fix accesses to uninitialized memory (found by valgrind)
mysys/my_alloc.c:
  Added comment for free_root
sql/filesort.cc:
  Removed valgrind warning
sql/sql_select.cc:
  Remove not needed my_casedn_str() for internal files
  (Old code actually didn't do any god as it was accessing not used memory)
sql/sql_view.cc:
  Removed access to uninitialized memory
sql/table.cc:
  Cleanup of error handling
2005-01-13 03:02:49 +02:00
unknown
a21bb57546 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-01-12 18:08:41 +02:00
unknown
c153522d35 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-01-12 20:05:32 +04:00
unknown
5b0678232f --defaults-extra-file bug fixed
mysys/default.c:
  silly mistake happened during the merge
2005-01-12 19:57:26 +04:00
unknown
3a13246cb0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-01-12 16:02:46 +02:00
unknown
332b0609d9 Merge mysql.com:/space/my/mysql-4.1-merge
into mysql.com:/space/my/mysql-5.0


Build-tools/Do-compile:
  Auto merged
2005-01-12 13:07:48 +01:00
unknown
d862f84643 - Modified Do-compile to run the test suite with ps-protocol and against
the embedded server by default (if included). These additional steps can
  be skipped by providing "--skip-embedded-test" and "--skip-ps-test"


Build-tools/Do-compile:
  - enabled running the test suite with ps-protocol and against the embedded
    server by default (if included). These additional steps can be skipped
    by providing "--skip-embedded-test" and "--skip-ps-test"
2005-01-12 13:06:06 +01:00
unknown
e234bbeab0 renamed charset name 'eucjp_ms' to 'eucjpms' 2005-01-12 02:58:15 -08:00
unknown
edbef416f4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/opt_range.cc:
  Auto merged
2005-01-12 11:45:04 +02:00
unknown
dd3cfa8d88 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-look-valgrind
2005-01-12 09:05:10 +03:00
unknown
2b73271ceb Fix for use of unitialized variable errors: Manually delete
{min,max}_functions_it as it is not allocated on the pool.
2005-01-12 08:15:46 +03:00
unknown
d67a56cb21 uncommented the drop table statement
mysql-test/t/ctype_eucjp_ms.test:
  uncommnented the drop table statement
2005-01-11 20:26:43 -08:00
unknown
37a15ec061 added new character set - cp932, eucjp_ms
config/ac-macros/character_sets.m4:
  added cp932, eucjp_ms character set
include/m_ctype.h:
  added cp932, eucjp_ms character set
libmysql/Makefile.shared:
  added cp932, eucjp_ms character set
mysys/charset-def.c:
  added cp932, eucjp_ms character set
sql/share/charsets/Index.xml:
  added cp932, eucjp_ms character set
strings/Makefile.am:
  added cp932, eucjp_ms character set
2005-01-11 17:45:36 -08:00
unknown
547b78c504 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


sql/field.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2005-01-12 03:40:02 +02:00
unknown
24a0275722 Fixed memory reference errors found by valgrind
sql/ha_federated.cc:
  Change mode to -rw-rw-r--
myisam/mi_create.c:
  Ensure that all referenced memory is reset
mysql-test/r/type_timestamp.result:
  More tests
mysql-test/t/func_compress.test:
  Added comment
mysql-test/t/type_timestamp.test:
  More tests
sql/field.h:
  Count number of varchars in table
sql/item_cmpfunc.cc:
  Safety fix (to avoid warning from valgrind)
sql/opt_range.cc:
  Simple optimzation
sql/sql_acl.cc:
  Safety fix (to avoid warning from valgrind)
sql/sql_parse.cc:
  Safety fix for prepared statements
sql/sql_show.cc:
  Move variable declarations first in function
  Remove hidden variable (it)
  Remove accessing freed memory (table_list->table_name)
sql/sql_update.cc:
  Compare records with varchars correctly
sql/table.cc:
  Safety fix when running with purify/valgrind
  Fix wrong memory reference in case of errors
sql/table.h:
  Added counting of varchar fields
strings/ctype-mb.c:
  Fill max_str properly
2005-01-12 03:38:53 +02:00
unknown
8c71efbcd4 strict.result, strict.test:
Clean-up for the previous change: VARCHAR and trailing spaces.


mysql-test/t/strict.test:
  Clean-up for the previous change: VARCHAR and trailing spaces.
mysql-test/r/strict.result:
  Clean-up for the previous change: VARCHAR and trailing spaces.
2005-01-11 23:28:57 +04:00
unknown
c7fbf424c7 Merging fixed 2005-01-11 23:28:56 +04:00
unknown
a1b522f809 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-01-11 22:15:29 +04:00
unknown
4f113ac4f3 Merging conflicts resolved
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Libraries changed
mysys/default.c:
  get_defaults_files implementation added
sql/sql_base.cc:
  merging
sql/sql_show.cc:
  merging
2005-01-11 21:00:53 +04:00
unknown
6dbadfa12e merge 2005-01-11 17:02:30 +01:00
unknown
577b8e4e28 removed compiler warnings from ha_ndbcluster
sql/ha_ndbcluster.cc:
  removed compiler warnings
2005-01-11 17:00:31 +01:00
unknown
7bb97a4ad8 Bug #7730 Server crash using soundex on an utf8 table
Don't use my_tolower: it works only for 8bit charsets.
2005-01-11 19:58:53 +04:00
unknown
427bdc28ee Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5920


client/mysql.cc:
  Auto merged
2005-01-11 19:58:52 +04:00
unknown
febd527e03 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-11 16:49:52 +01:00
unknown
4245f22b56 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-01-11 16:02:45 +01:00
unknown
62113c1011 A fix for Bug#7365 "embedded server for MacOS: problem with prepared
statements": no test case, the test case is there already, 
libmysqld/examples/client_test.c, we just need to run it on a daily basis.


libmysqld/lib_sql.cc:
  Convert statement id to least significant byte first format,
  uset for data transmission in MySQL protocol. It's assumed to be 
  in this format by mysql_stmt_execute.
2005-01-11 18:02:44 +03:00
unknown
27354d5654 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-11 16:02:42 +01:00
unknown
a31c35022d bug fixed parsing with comments on same line 2005-01-11 16:00:11 +01:00
unknown
962512ad1b - Create the mysqld binaries with the correct file names during the build
instead of renaming them in the packaging stage with Do-win-build later:
  mysqld-opt.exe -> mysqld.exe, mysqld.exe -> mysqld-debug.exe
2005-01-11 15:41:42 +01:00
unknown
c9079c1340 - Housekeeping: removed a few unreferenced variables, noticed while doing
Windows builds


sql/sql_base.cc:
  - removed an unreferenced variable
sql/strfunc.cc:
  - removed an unreferenced variable
2005-01-11 15:38:03 +01:00
unknown
c951307478 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-11 14:56:49 +01:00
unknown
5e6debe6b1 Suma.cpp:
same as prev fix, wrong read of 64 bit value


ndb/src/kernel/blocks/suma/Suma.cpp:
  same as prev fix, wrong read of 64 bit value
2005-01-11 14:54:58 +01:00
unknown
927eef9ea1 Backup.cpp:
bug#7660


ndb/src/kernel/blocks/backup/Backup.cpp:
  bug#7660
2005-01-11 14:49:35 +01:00
unknown
64b4131cf0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-11 14:29:22 +01:00
unknown
7233b5d563 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.7330
2005-01-11 17:29:21 +04:00
unknown
0dcd8b6e24 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.7330
2005-01-11 17:27:54 +04:00
unknown
95fa0d99e1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-11 14:21:58 +01:00
unknown
4ebb09797b Removed compiler warnings 2005-01-11 14:06:44 +01:00
unknown
d067695909 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-01-11 13:56:06 +01:00
unknown
f2e368483d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-01-11 13:50:28 +01:00
unknown
7bdd452ddb If VARCHAR strips only trailing spaces, then produce
a note, not a warning or error.
2005-01-11 16:49:45 +04:00
unknown
89866c5430 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-11 13:36:27 +01:00
unknown
e7b38aa7bd Fixes for two compile-time failures.
ndb/src/common/transporter/TransporterRegistry.cpp:
  make it compile with -ansi -pedantic
sql/sql_lex.cc:
  a fix for compile-time failure
2005-01-11 15:32:23 +03:00
unknown
d73a4de9b7 bug#7798 - ndb - range scan with invalid table version could cause node failure
mysql-test/r/ndb_index_ordered.result:
  Test scan with invalid table version
mysql-test/t/ndb_index_ordered.test:
  Test scan with invalid table version
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Set apiConnectstate= CS_ABORTING when receving a scan req with invalid
    table version
2005-01-11 13:30:11 +01:00
unknown
87080e7874 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.7330
2005-01-11 16:10:06 +04:00
unknown
9c498652d7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-11 13:06:04 +01:00
unknown
fc8ac2c1e4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-11 12:54:53 +01:00
unknown
ae7169786e can't use my_pread,my_pwrite since it uses mutexes on the files 2005-01-11 12:50:54 +01:00
unknown
7bf677dd64 Merge mysql.com:/home/kostja/work/mysql-4.1-7428
into mysql.com:/home/kostja/work/mysql-5.0-root


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-01-11 14:47:12 +03:00
unknown
194937169f Followup: rename the declaration (hash_reset -> my_hash_reset) 2005-01-11 13:57:07 +03:00