Commit graph

14337 commits

Author SHA1 Message Date
unknown
fe9b9d57cf Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-08-26 13:18:10 +03:00
unknown
c1825f208c Fix ndb home path 2004-08-26 12:10:32 +02:00
unknown
a0dd3a30a5 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/mysql-4.0
2004-08-26 11:02:53 +02:00
unknown
b6425bc22c ctype-latin1.c:
Revert this change, it was done in a mistake.


strings/ctype-latin1.c:
  Revert this change, it was done in a mistake.
2004-08-26 12:02:11 +05:00
unknown
0572112d43 merge
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge (use new code)
2004-08-26 00:39:43 +03:00
unknown
8ed5952a86 Remove default argument to mysql_truncate()
Update to new valgrind


mysql-test/mysql-test-run.sh:
  Update for new valgrind
sql/mysql_priv.h:
  Remove default argument to mysql_truncate()
sql/sql_parse.cc:
  Remove default argument to mysql_truncate()
2004-08-26 00:37:25 +03:00
unknown
3818b0d3b3 mysql.h:
Fix a misleading plural that should be singular.
  Fix other typos while I'm at it.


include/mysql.h:
  Fix a misleading plural that should be singular.
  Fix other typos while I'm at it.
2004-08-25 12:52:19 -05:00
unknown
3b55c6f394 Test case for Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list
lowercase_table.result:
  New results for modified lowercase_table test
lowercase_table.test:
  Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792


mysql-test/t/lowercase_table.test:
  Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792
mysql-test/r/lowercase_table.result:
  New results for modified lowercase_table test
2004-08-25 17:25:38 +02:00
unknown
7dfdfa9fa3 Cleanup. 2004-08-25 17:20:12 +04:00
unknown
ca59bf4746 Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list
sql_base.cc:
  Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792


sql/sql_base.cc:
  Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792
2004-08-25 15:12:31 +02:00
unknown
69e536708b Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2004-08-25 11:04:14 +02:00
unknown
b20d1ce4f3 mysql.cc:
Bug#3453: MySQL output formatting in multibyte character sets


client/mysql.cc:
  Bug#3453: MySQL output formatting in multibyte character sets
2004-08-25 13:03:34 +05:00
unknown
f0fed74629 A new function to meassure terminal screen cells number for a string. 2004-08-25 11:39:43 +05:00
unknown
51fd9ed418 utr11-dump.c:
new file
2004-08-25 10:15:46 +05:00
unknown
335a791aba Adding binary version information for debug/release version of libmysqld.dll
This was a customer request for to get the XP Logo Certification.

Note for LenZ:
Adding to the project libmysqld.dsp the file libmysqld.rc at compilation time will be created
the libmysqld.res and this linked. For every release edit the libmysqld.rc
version number.
2004-08-25 02:04:45 -03:00
unknown
b15ee67874 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2004-08-25 06:39:19 +02:00
unknown
340d40a77c Cleaned up rnd_init 2004-08-24 23:13:32 +02:00
unknown
92dfd1bf9a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-clean
2004-08-24 21:13:31 +00:00
unknown
b7a13b5559 more aliases in ndb config
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  more aliases
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
  oops bug
2004-08-24 21:12:53 +00:00
unknown
5b1c2decaa compatibility fixes
client/mysql.cc:
  removed readline-4.2 compatibility fix
  readline 4.2 is broken, use 4.2a instead
cmd-line-utils/libedit/search.c:
  regex.h fix
acinclude.m4:
  removed readline-4.2 compatibility fix
  readline 4.2 is broken, use 4.2a instead
2004-08-24 22:37:05 +02:00
unknown
5aca69d9a1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 22:37:04 +02:00
unknown
2ce9f883b2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-clean
2004-08-24 20:37:03 +00:00
unknown
76a9aeb7f7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_select.cc:
  Auto merged
2004-08-24 22:37:03 +02:00
unknown
89b7c75f29 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-5034
2004-08-25 00:37:02 +04:00
unknown
aa8a12fe94 committed skipped file 2004-08-25 01:37:01 +05:00
unknown
8368559fef Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-08-25 01:02:08 +05:00
unknown
5e85c28475 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
2004-08-24 22:02:08 +02:00
unknown
16a364f566 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-5034
2004-08-25 00:02:08 +04:00
unknown
6564806be7 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear


acinclude.m4:
  Auto merged
configure.in:
  Auto merged
2004-08-25 01:02:07 +05:00
unknown
4cf158b0ac bug fix 2004-08-24 19:49:45 +00:00
unknown
c2d207e8b0 resurrect fix for
Bug #4696  	segfault in cmd-line-utils/libedit/history.c:history_save() 
(bundled libedit)
2004-08-25 00:26:53 +05:00
unknown
45c94a288d enables case insensitivity in ndb config file 2004-08-24 19:07:09 +00:00
unknown
d5996e18ed Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


BitKeeper/etc/ignore:
  added support-files/my-innodb-heavy-4G.cnf
sql/sql_select.cc:
  Auto merged
2004-08-24 21:07:08 +02:00
unknown
205cf8044b Merge: manual resolve
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_class.cc:
  Manual resolve of the merge
2004-08-24 23:07:08 +04:00
unknown
a8f24dc7d9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-clean
2004-08-24 19:07:08 +00:00
unknown
6b20f46abc fixed AC_DEFINE(HAVE_HIST_ENTRY) in acinclude.m4
acinclude.m4:
  fixed AC_DEFINE(HAVE_HIST_ENTRY)
2004-08-25 00:07:07 +05:00
unknown
f8f627d050 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear_v2


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
2004-08-24 23:38:31 +05:00
unknown
99538ee3af fixed AC_DEFINE's for libedit-2.6.7
acinclude.m4:
  fixed AC_DEFINE(HAVE_HIST_ENTRY)
configure.in:
  fixed new AC_DEFINE's
2004-08-24 23:32:58 +05:00
unknown
9d3009eaea Fix for bug #4815 (embedded server calculates wrong places for outfiles)
In some places in mysqld behaviour depends on system working directory
It works badly in libmysqld because user can set it in the way he needs.
I think we should explicitly insert mysql_real_data_home value in
paths in these places


sql/sql_class.cc:
  here we concat mysql_real_data_home and thd->db to be the prefix
sql/sql_load.cc:
  it's better to build the prefix from mysql_real_data_home
  also i think it's better always to call my_load_path to not to depend
  of current system working directory
2004-08-24 22:45:32 +05:00
unknown
73fe243d43 buf0rea.c:
Fix bug: if there was little file I/O in InnoDB, but the insert buffer was used, it could happen that 'Pending normal aio reads' was bigger than 0, but the I/O handler thread did not get waken up in 600 seconds. This resulted in a hang, and crashing of InnoDB.


innobase/buf/buf0rea.c:
  Fix bug: if there was little file I/O in InnoDB, but the insert buffer was used, it could happen that 'Pending normal aio reads' was bigger than 0, but the I/O handler thread did not get waken up in 600 seconds. This resulted in a hang, and crashing of InnoDB.
2004-08-24 20:17:23 +03:00
unknown
47d87c639c All 'Makefile's must use '$(AR)' (not just 'ar') because the variable may contain options.
libmysqld/Makefile.am:
  Always use 'make' variable '$(AR)' so that options (AIX 64 bit!) are included.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-24 19:05:42 +02:00
unknown
b755d75170 added skipped file for libedit-2.6.7 2004-08-24 21:52:13 +05:00
unknown
ac9d0ce119 automerged 2004-08-24 18:22:33 +02:00
unknown
44a7555384 followup 2004-08-24 18:20:27 +02:00
unknown
f5ce37d7fe Fix for bug #4340: find_in_set is case insensitive even on binary operators(for 4.1) 2004-08-24 20:18:59 +04:00
unknown
49bd559eb8 Fix for Bug#5034 "prepared "select 1 into @arg15", second
execute crashes server": we were deleting lex->result
after each execute, but prepared statements assumed that
it's left intact.
The fix adds cleanup() method to select_result hierarchy,
so that result objects can be reused.
Plus we now need to delete result objects more wisely.


mysql-test/r/ps.result:
  Test results fixed: test case for bug#5034
mysql-test/t/ps.test:
  A test case for bug#5034, few followups
sql/sql_class.cc:
  - fix warning in THD::THD
  - implementation of cleanup() for select_result hierarchy
  - select_export::send_eof was identical to 
    select_dump::send_eof: moved to the base class select_to_file.
  - Statement::end_statement() to end lex, free items, and
    delete possible select_result
sql/sql_class.h:
  - select_result::cleanup() declaration
  -
sql/sql_insert.cc:
  - implementation of select_insert::cleanup(): currently
    we always create a new instance of select_insert/
    select_create on each execute.
sql/sql_lex.cc:
  - with more complicated logic of freeing lex->result it's 
    easier to have it non-zero only if it points to a valid
    result.
sql/sql_lex.h:
  Now st_lex::st_lex is not empty.
sql/sql_parse.cc:
  mysql_execute_command():
  - delete select_result *result only if it was created in
    this function.
  - use end_statement() to cleanup lex and thd in the end of
    each statement.
  - no need to save THD::lock if this is explain. This save
    apparently left from times when derived tables were 
    materialized here, not in open_and_lock_tables.
sql/sql_prepare.cc:
  - call result->cleanup() in reset_stmt_for_execute
  - now Statement is responsible for freeing its lex->result.
sql/sql_select.cc:
  handle_select():
  - don't delete result, it might be needed
    for next executions
  - result is never null
2004-08-24 20:17:11 +04:00
unknown
b4727f7609 added skipped macro for new libedit-2.6.7 in configure.in
configure.in:
  added skipped macro for new libedit-2.6.7
2004-08-24 21:01:11 +05:00
unknown
af043308a9 upgrade to libedit-2.6.7
(fixed Bug #4462 libedit compile failure)


BitKeeper/etc/ignore:
  change config.h -> config.h to commit cmd-line-utils/libedit/config.h
cmd-line-utils/libedit/Makefile.am:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/chared.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/chared.h:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/common.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/el.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/el.h:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/emacs.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/hist.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/hist.h:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/histedit.h:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/history.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/key.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/key.h:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/makelist.sh:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/map.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/map.h:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/parse.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/prompt.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/read.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/readline.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/readline/readline.h:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/refresh.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/search.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/search.h:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/sig.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/sig.h:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/sys.h:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/term.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/tokenizer.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/tokenizer.h:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/tty.c:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/tty.h:
  upgrade to libedit-2.6.7
cmd-line-utils/libedit/vi.c:
  upgrade to libedit-2.6.7
configure.in:
  change liblibedit.a to correct libedit.a
2004-08-24 20:41:41 +05:00
unknown
a49c12f515 manually merged
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/binary.result:
  Auto merged
mysql-test/r/truncate.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/truncate.test:
  Auto merged
mysys/my_lib.c:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
support-files/Makefile.am:
  Auto merged
2004-08-24 17:24:23 +02:00
unknown
68a1e80df4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/rburnett/mysql41
2004-08-24 17:24:06 +02:00