Commit graph

16864 commits

Author SHA1 Message Date
unknown
f0cf742fd3 Fix for BUG#7331.
The problem was that when a QUICK_SELECT access method is chosen,
test_if_skip_sort_order() discovered that the index being used
by the quick select will not deliver tuples in sorted order.
In this case test_if_skip_sort_order() tried to change the index
used by the quick select, but it didn't properly set the other
members of the quick select, and especially the range flags of
the ranges in QUICK_SELECT::ranges.

The fix re-invokes the function SQL_SELECT::test_quick_select
to correctly create a valid QUICK_SELECT object.


mysql-test/r/order_by.result:
  Added test results.
mysql-test/t/order_by.test:
  Added test for BUG#7331.
sql/sql_select.cc:
  Fix for BUG#7331.
2005-01-06 10:49:26 +02:00
unknown
0f00947b5d Add support for --default-character-set to mysqladmin (Bug #7524)
client/mysqladmin.cc:
  Handle default-character-set being specified
2005-01-06 01:08:03 +01:00
unknown
190f7a6f45 Fix "mysqladmin password" to use correct password scrambling function when
talking to pre-4.1 servers or 4.1 and later servers where the old_passwords
option is enabled. "mysqladmin old-password" is unchanged. (Bug #7451)


client/mysqladmin.cc:
  Check old_passwords from server, and use that to determine
  which scramble function to use (except in the case of the
  old-password command, which always use the old scramble function).
2005-01-05 21:56:18 +01:00
unknown
d9adebfa24 Merge
include/my_pthread.h:
  fix merge conflict
2005-01-05 19:22:58 +01:00
unknown
3edb7774ed Allow DEFAULT_THREAD_STACK to be set via -DDEFAULT_THREAD_STACK=... so our
official binary builds for Linux that are built against a static glibc with
a 128k thread stack size limit can be compiled with a default that doesn't
result in a harmless (but oft-misunderstood) warning message. (Bug #6226)


include/my_pthread.h:
  Allow DEFAULT_THREAD_STACK to be set via -DDEFAULT_THREAD_STACK=...
2005-01-05 19:02:17 +01:00
unknown
6f2f0d5cf3 my_sleep.c:
On Windows my_sleep() always gave a zero microsecond sleep


mysys/my_sleep.c:
  On Windows my_sleep() always gave a zero microsecond sleep
2005-01-05 16:35:43 +01:00
unknown
1d6a4a54c7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-05 14:14:30 +02:00
unknown
c99b4964ca replace position names and testes
fixed bug
2005-01-05 17:14:29 +05:00
unknown
af4ef15f82 mysql-test/mysql-test-run.sh
report test mode if case of failure (default/ps-protocol/embedded)


mysql-test/mysql-test-run.sh:
  report test mode if case of failure (default/ps-protocol/embedded)
2005-01-05 14:09:31 +02:00
unknown
d889e399a3 Merge
mysql-test/mysql_test_run_new.c:
  SCCS merged
2005-01-05 16:31:20 +05:00
unknown
8a1e77e23f WL#964
_stricmp was replaved on sting_compare_func
added breakes for windows


mysql-test/mysql_test_run_new.c:
  _stricmp was replaved on sting_compare_func
  added breakes for windows
2005-01-05 16:26:53 +05:00
unknown
329a6e9c22 Protect flags like -Wl,-O2 from being mangled by mysql_config (Bug #6964)
(Second commit of this patch -- first included wrong changes.)


scripts/mysql_config.sh:
  Make sure we are only removing whole options (protects -Wl,-O2, for example)
2005-01-05 03:43:37 +01:00
unknown
72801bc21b Use ZLIB_LIBS when linking libmysqlclient_r (Bug #6418)
libmysql_r/Makefile.am:
  Make sure we link against zlib
2005-01-05 03:05:19 +01:00
unknown
f89207c2e6 Make sure to include ZLIB_LIBS in mysql_config --libs_r (Bug #7021)
scripts/mysql_config.sh:
  include ZLIB_LIBS in --libs_r
2005-01-05 02:04:12 +01:00
unknown
284780167d Change mysqld_safe search for mysqld relative to the current working directory
to only look for the mysqld binary (and english error strings) and assume the
datadir from that. Then, if that datadir turns out to not exist, startup will
fail. This avoids the behavior where mysqld_safe would go off and run a totally
different binary because the data directory had been moved (even when --datadir
was specified on the command line). (Bug #7249)


scripts/mysqld_safe.sh:
  Don't actually verify that datadir exists when
  using relatively-located mysqld -- just assume
  that it does and either let it fail when it
  doesn't, or do the right thing when datadir
  is then set via the command line or my.cnf file.
2005-01-05 01:08:45 +01:00
unknown
b2dcf8f488 mysql_test_run_new.dsp:
Link mysql_test_run_new as console application
my_manage.c:
  The type intptr_t isn't defined for VC 6.0
  Changed return type for CreateProcess() to bool
mysql_test_run_new.c:
  The type intptr_t isn't defined for VC 6.0
mysqltest.dsp:
  Added regex to additional build types for mysqltest
mysqldump.dsp:
  Added mysys.lib for linking mysqldump


VC++Files/client/mysqldump.dsp:
  Added mysys.lib for linking mysqldump
VC++Files/client/mysqltest.dsp:
  Added regex to additional build types for mysqltest
mysql-test/mysql_test_run_new.c:
  The type intptr_t isn't defined for VC 6.0
mysql-test/my_manage.c:
  The type intptr_t isn't defined for VC 6.0
  Changed return type for CreateProcess() to bool
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Link mysql_test_run_new as console application
2005-01-04 23:07:29 +01:00
unknown
54cbfead74 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-04 19:22:50 +01:00
unknown
55ace5fd44 Merge mysql.com:/home/jwinstead2/mysql-4.1-5875
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-04 17:40:43 +01:00
unknown
e983f20445 Merge mysql.com:/home/jwinstead2/mysql-4.1-5878
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-04 17:37:14 +01:00
unknown
14e2c810db Merge
sql/set_var.cc:
  merge
2005-01-04 17:36:16 +01:00
unknown
54d86c8736 client.c:
Make multi-statements the preferred option name (to coincide
  with the renaming of the CLIENT_MULTI_RESULTS symbol to
  CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
  for backward compatibility.


sql-common/client.c:
  Make multi-statements the preferred option name (to coincide
  with the renaming of the CLIENT_MULTI_RESULTS symbol to
  CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
  for backward compatibility.
2005-01-04 10:32:42 -06:00
unknown
15dd964d5e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-04 13:48:12 +02:00
unknown
a2b18ed0d5 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-04 12:11:37 +01:00
unknown
8ffe8ab302 Make query_cache_wlock_invalidate visible in SHOW VARIABLES (Bug #7594)
sql/set_var.cc:
  Make query_cache_wlock_invalidate visible in SHOW VARIABLES
2005-01-04 02:45:01 +01:00
unknown
33aa4e381b Use 'ps xaww' in mysqld_safe (on Linux) so whole command-line is searched
for port and/or pid-file parameters. (Bug #5878)


scripts/mysqld_safe.sh:
  Change 'ps xa' to 'ps xaww' so whole command-line is examined
2005-01-04 01:49:29 +01:00
unknown
b709bb0df8 Fix typo in crash-me 'MATCHES' test (Bug # 5875)
sql-bench/crash-me.sh:
  Fix typo
2005-01-03 23:02:26 +01:00
unknown
a35b65375f Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.1-build


Build-tools/Bootstrap:
  Auto merged
2005-01-03 21:37:41 +01:00
unknown
7b7216e1f4 - Updated Bootstrap to include merge ChangeSets in the source distribution's
ChangeLog, too (to be more exact when tagging a release that's based on a
  merge ChangeSet)


Build-tools/Bootstrap:
  - include merge ChangeSets into the ChangeLog, too (to be more exact when
    tagging a release that's based on a merge ChangeSet)
2005-01-03 21:28:14 +01:00
unknown
a75e31b361 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-03 22:01:11 +02:00
unknown
82e5d5ef95 added ndb/include/ndb_global.h ndb/include/ndb_version.h to ignore
BitKeeper/etc/ignore:
  added ndb/include/ndb_global.h ndb/include/ndb_version.h
2005-01-03 22:00:32 +02:00
unknown
dcc3c7c363 Fixed a typo. 2005-01-03 20:48:49 +01:00
unknown
cae189b15e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


mysql-test/t/multi_update.test:
  Auto merged
2005-01-03 21:14:20 +02:00
unknown
65c2ab11bc Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1


ndb/include/ndb_global.h.in:
  Auto merged
2005-01-03 20:12:42 +01:00
unknown
9ecd9ac6b9 bug#7626 - post review version
ndb/include/ndb_global.h.in:
  move types into ndb_global.h.in
  Check sizeof of Uint8, Uint32 & Uint64
ndb/include/ndb_types.h:
  move types into ndb_global.h.in
2005-01-03 20:10:23 +01:00
unknown
8a0bfa019a Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-03 19:42:38 +01:00
unknown
e197fa459d bug#7626 - ndb UintPtr handling
ndb/include/ndb_types.h:
  redo UintPtr handling
2005-01-03 19:39:09 +01:00
unknown
c8cfe3d211 mtr_process.pl:
Added missing stop_reap_all() if returns early from function
mysql-test-run.pl:
  Improved output from --script-debug
  Initial Cygwin support
  Improved mysqld process termination


mysql-test/mysql-test-run.pl:
  Improved output from --script-debug
  Initial Cygwin support
  Improved mysqld process termination
mysql-test/lib/mtr_process.pl:
  Added missing stop_reap_all() if returns early from function
2005-01-03 16:54:08 +01:00
unknown
07290e3348 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-03 16:49:55 +01:00
unknown
d3be3cbcfd fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)
client/mysql.cc:
  bug #5920 (embedded-server mysql doesn't handle --defaults-file)
  defaults files handled
include/my_sys.h:
  bug #5920 (embedded-server mysql doesn't handle --defaults-file)
  get_defaults_file interface added
libmysqld/libmysqld.c:
  just small fix, not related to the bug.
mysys/default.c:
  bug #5920 (embedded-server mysql doesn't handle --defaults-file)
  get_defaults_files implementation
2005-01-03 19:21:54 +04:00
unknown
a35a9c985b Fix for bug #6434 (bad memory deletion in app using libmysqld)
We should build libmysqld in SAFEMALLOC mode.


VC++Files/libmysqld/libmysqld.dsp:
  SAFEMALLOC define added to the libmysqld/Debug configuration
2005-01-03 18:50:51 +04:00
unknown
ed99f914d6 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-01-03 18:38:37 +05:00
unknown
8bf7b342bc WL#964
added sort of file names for all OS


BitKeeper/etc/ignore:
  Added mysql-test/mysql-test-run.log mysql-test/r/alter_table.err mysql-test/r/archive.err mysql-test/r/bdb-alter-table-1.err mysql-test/r/bdb-alter-table-2.err mysql-test/r/bdb-crash.err mysql-test/r/bdb-deadlock.err mysql-test/r/bdb.err mysql-test/r/bdb_cache.err mysql-test/r/client_test.err mysql-test/r/csv.err mysql-test/r/ctype_ucs.err mysql-test/r/derived.err mysql-test/r/exampledb.err mysql-test/r/func_encrypt.err mysql-test/r/isam.err mysql-test/r/lowercase_table2.err mysql-test/r/multi_update.err mysql-test/r/mysql_protocols.err mysql-test/r/mysqlbinlog.err mysql-test/r/mysqlbinlog2.err mysql-test/r/mysqldump.err mysql-test/r/mysqltest.err mysql-test/r/ndb_alter_table.err mysql-test/r/ndb_autodiscover.err mysql-test/r/ndb_autodiscover2.err mysql-test/r/ndb_basic.err mysql-test/r/ndb_blob.err mysql-test/r/ndb_cache.err mysql-test/r/ndb_charset.err mysql-test/r/ndb_index.err mysql-test/r/ndb_index_ordered.err mysql-test/r/ndb_index_unique.err mysql-test/r/ndb_insert.err mysql-test/r/ndb_limit.err m
mysql-test/mysql_test_run_new.c:
  added sort of file names for all OS
2005-01-03 18:37:08 +05:00
unknown
1b2b19adb9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-03 15:36:00 +02:00
unknown
4696be1c4d Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-03 15:35:59 +02:00
unknown
a8341f1b77 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-03 15:35:58 +02:00
unknown
5ae33d6ee8 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-01-03 18:35:58 +05:00
unknown
d0a3752bac Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-03 15:35:58 +02:00
unknown
942ae30f8f Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.7545
2005-01-03 17:35:57 +04:00
unknown
d942c9a87b Fix for bug #7545 (Undefined symbols if --without-geometry)
myisam/mi_check.c:
  This code should be ifdefed in no HAVE_SPATIAL case
2005-01-03 17:33:04 +04:00
unknown
b6aff81bd1 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-03 11:41:24 +01:00