Commit graph

14,207 commits

Author SHA1 Message Date
unknown
d8f416a26c bug in my_strnncoll_utf8 (and friends) fixed
cleanups
better, charset-dependent, ft_max_len_for_sort value


myisam/ftdefs.h:
  better ft_max_len_for_sort value
myisam/mi_check.c:
  better, charset-dependent, ft_max_len_for_sort value
myisam/myisamchk.c:
  unused value from enum removed
myisam/sort.c:
  cleanup
sql/mysql_priv.h:
  cleanup
sql/mysqld.cc:
  cleanup
sql/sql_acl.cc:
  cleanup
sql/tztime.cc:
  cleanup
strings/ctype-utf8.c:
  bug in my_strnncoll_utf8 (and friends) fixed
2004-08-30 08:37:36 +02:00
unknown
82257f94f4 after merge
sql/item_row.cc:
  ds20 compat fix
2004-08-26 18:22:22 +02:00
unknown
94a39ec610 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-26 17:51:21 +02:00
unknown
90301a065c Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


client/mysql.cc:
  Auto merged
2004-08-26 17:49:16 +02:00
unknown
ad3fed2e7b Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-26 17:49:04 +02:00
unknown
717fc0b01e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


libmysql/libmysql.c:
  Auto merged
mysql-test/r/endspace.result:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
2004-08-26 18:27:33 +03:00
unknown
44b2807e4b Portability fixes
Fixed bug in end space handle for WHERE text_column="constant"


heap/hp_hash.c:
  Optimzations (no change of logic)
libmysql/libmysql.c:
  Added missing casts (portability fix)
myisam/mi_key.c:
  Changed macro to take arguments and not depend on local variables
  Simple indentation fixes ?
mysql-test/r/connect.result:
  Added test for setting empty password
mysql-test/r/create_select_tmp.result:
  TYPE -> ENGINE
mysql-test/r/ctype_utf8.result:
  Combine drop's
mysql-test/r/endspace.result:
  Added more tests to test end space behaviour
mysql-test/r/having.result:
  Added missing DROP TABLE
mysql-test/r/type_blob.result:
  Added more tests to ensure that fix for BLOB usage is correct
mysql-test/r/type_timestamp.result:
  Add test from 4.0
mysql-test/t/connect.test:
  Added test for setting empty password
mysql-test/t/create_select_tmp.test:
  TYPE -> ENGINE
mysql-test/t/ctype_utf8.test:
  Combine drop's
mysql-test/t/endspace.test:
  Added more tests to test end space behaviour
mysql-test/t/having.test:
  Added missing DROP TABLE
mysql-test/t/type_blob.test:
  Added more tests to ensure that fix for BLOB usage is correct
mysql-test/t/type_timestamp.test:
  Add test from 4.0
sql/field.cc:
  Removed not used variable
  Portability fix (cast)
  Simplified Field_str::double()
  Simple indentation cleanups
sql/field.h:
  Removed not needed class variable
sql/item_cmpfunc.cc:
  Indentation fix
sql/item_strfunc.cc:
  Use on stack variable for Item_str_func::val() instead of str_value.
  This makes it safe to use str_value inside the Item's val function.
  Cleaned up LEFT() usage, thanks to the above change
sql/item_sum.cc:
  Indentation cleanups
sql/protocol.cc:
  Added missing cast
sql/sql_acl.cc:
  Indentatin cleanups.
  Added missing cast
  Simple optimization of get_sort()
sql/sql_select.cc:
  Don't use 'ref' to search on text field that is not of type BINARY (use 'range' instead).
  The reson is that for 'ref' we use 'index_next_same' to read the next possible row. 
  For text fields, rows in a ref may not come in order, like for 'x', 'x\t' 'x ' (stored in this order) which causes a search for 'column='x ' to fail
sql/tztime.cc:
  Simple cleanup
strings/ctype-bin.c:
  Comment fixes
strings/ctype-mb.c:
  Changed variable names for arguments
2004-08-26 18:26:38 +03:00
unknown
5dbfa9db7b Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0
into hegel.txg.br:/home/miguel/bk/mysql-4.0
2004-08-26 11:44:02 -03:00
unknown
5c30236ab3 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-26 15:33:52 +02:00
unknown
e188532610 remove warning 2004-08-26 15:32:57 +02:00
unknown
e8d41a5b1b merged
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqladmin.c:
  Auto merged
BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlmanager-pwgen.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/my_getopt.h:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
2004-08-26 15:19:46 +02:00
unknown
c75e4dfed1 Fixed a bug in mysql.cc. Overriding password prompting
by giving password as an argument later did not work.
2004-08-26 16:15:36 +03:00
unknown
fccc404a10 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
2004-08-26 17:52:07 +05:00
unknown
11612dd3b4 Should check for GEOM_FLAG later because keyX may be partly initialized (min_flag is not set). 2004-08-26 17:43:08 +05:00
unknown
ad3e480c0f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-08-26 14:29:52 +02:00
unknown
536ce70814 FileLogHandler.cpp, ndb_global.h:
sco and others: use PATH_MAX always


ndb/include/ndb_global.h:
  sco and others: use PATH_MAX always
ndb/src/common/logger/FileLogHandler.cpp:
  sco and others: use PATH_MAX always
2004-08-26 14:06:39 +02:00
unknown
0eab587e93 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
2004-08-26 16:54:33 +05:00
unknown
45f49c60cd A fix (Bug#5219: Cannot use '||' with MBRContains(..)). 2004-08-26 16:51:26 +05:00
unknown
ad1f3bb17d 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
sql/mysql_priv.h:
  Auto merged
2004-08-26 13:43:27 +02:00
unknown
42771f9877 "SELECT BINARY x" now means "SELECT CAST(x AS BINARY)". 2004-08-26 16:31:37 +05:00
unknown
76ec262247 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-08-26 13:25:10 +02:00
unknown
08595c46e7 sco compile fix: MAXPATHLEN 2004-08-26 13:25:09 +02:00
unknown
337f02b74e Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-08-26 12:36:48 +02:00
unknown
0830992f2d - Updated RPM spec file: MySQL-Max now requires MySQL-server instead
of MySQL (BUG#3860)
2004-08-26 12:25:14 +02:00
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
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
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