Commit graph

14293 commits

Author SHA1 Message Date
unknown
1b51f98e47 Remove extra '/' after mysql_real_data_home
Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump


mysql-test/mysql-test-run.sh:
  Ensure that clients used the supplied --socket argument
mysql-test/r/lowercase_table.result:
  Remove tables used in other tests that may affect this one
mysql-test/r/rename.result:
  Remove tables used in other tests that may affect this one
mysql-test/t/lowercase_table.test:
  Remove tables used in other tests that may affect this one
mysql-test/t/rename.test:
  Remove tables used in other tests that may affect this one
sql/item_cmpfunc.cc:
  Remove not relevant comment
sql/sql_class.cc:
  Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump
sql/sql_load.cc:
  Remove extra '/' after mysql_real_data_home
sql/sql_table.cc:
  Remove extra '/' after mysql_real_data_home
2004-09-03 02:25:27 +03:00
unknown
a88ab457e3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
tests/client_test.c:
  Auto merged
2004-09-02 16:58:01 +03:00
unknown
762bee96d2 After merge fixes
mysql-test/mysql-test-run.sh:
  Export MASTER_MYSOCK (used in some tests)
mysql-test/t/alter_table.test:
  Use MASTER_MYSOCK instead of master.sock
2004-09-02 16:57:26 +03:00
unknown
3c3db07321 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.4815
2004-09-02 15:22:59 +05:00
unknown
3fca0d245c Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-09-02 10:34:28 +03:00
unknown
36a4e21c07 Bug#4338 mysql-test-run fails if compiled with non-latin1 character set 2004-09-02 12:34:27 +05:00
unknown
4e7a4fc30e Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-09-02 10:17:58 +03:00
unknown
c4711fb9ea Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.4815


sql/sql_class.cc:
  Auto merged
2004-09-02 11:11:16 +05:00
unknown
848414cf11 Addition to the fix for #4815
sql/sql_class.cc:
  Code simplified with strxnmov
2004-09-02 11:10:26 +05:00
unknown
0ceb4ddc9f fixed typo in group_concat printing (BUG#5161)
mysql-test/r/func_gconcat.result:
  fixed typo
sql/item_sum.cc:
  fixed typo
2004-09-01 21:32:24 +03:00
unknown
e0820e7545 row0mysql.c:
row_drop_table_for_mysql(): Removed duplicated block of code.


innobase/row/row0mysql.c:
  row_drop_table_for_mysql(): Removed duplicated block of code.
2004-09-01 14:04:17 +03:00
unknown
94ecacdb97 Allow IN to convert arguments into Unicode in some cases. 2004-09-01 15:39:15 +05:00
unknown
705d50660d Move collation aggregation with superset conversion code
from Item_bool_func2 into DTCollation to make it reusable
for other types of items.
2004-09-01 13:56:33 +05:00
unknown
acd1321956 Make client_test pass on 64-bit HP-UX11: long is 64 bit,
replace all (mis)uses of it with int32.
2004-09-01 12:50:23 +04:00
unknown
fe937a2b1b Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Auto merged
BitKeeper/deleted/.del-convert.cc~437689acaffb7446:
  Auto merged
BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796:
  Auto merged
BitKeeper/deleted/.del-message.mc:
  Delete: VC++Files/sql/message.mc
BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
  Auto merged
BitKeeper/deleted/.del-win1251.conf~b6bb6681f02917b6:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqladmin.c:
  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/m_string.h:
  Auto merged
include/my_getopt.h:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
strings/strto.c:
  Auto merged
strings/strtol.c:
  Auto merged
strings/strtoll.c:
  Auto merged
strings/strtoull.c:
  Auto merged
support-files/Makefile.am:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
2004-09-01 04:12:09 +03:00
unknown
8122a67944 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
2004-09-01 02:13:35 +03:00
unknown
38105ee845 Do-compile:
Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.


Build-tools/Do-compile:
  Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.
2004-08-31 13:29:28 -05:00
unknown
7e8ca7fd4b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-not-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-08-31 21:11:54 +03:00
unknown
1dc52f0763 after review patch
mysql-test/r/negation_elimination.result:
  new tests of negation elimination
mysql-test/t/negation_elimination.test:
  new tests of negation elimination
sql/item.h:
  test of boolean functions added
sql/item_cmpfunc.cc:
  NOT subtree is already checked, so wee need to return just argument
sql/item_cmpfunc.h:
  test of boolean functions added
sql/mysql_priv.h:
  'place' to detect WHERE clause
sql/sql_parse.cc:
  function for creation negated expression
sql/sql_select.cc:
  removed unused function
sql/sql_select.h:
  removed unused function
sql/sql_yacc.yy:
  'place' to detect WHERE clause
2004-08-31 21:10:57 +03:00
unknown
c9394a0f0d Added global my_getopt_error_reporter function pointer which is
used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.


client/mysql.cc:
  Removed extra handle_optins()'s parameter.
client/mysqladmin.c:
  Removed extra handle_optins()'s parameter.
client/mysqlbinlog.cc:
  Removed extra handle_optins()'s parameter.
client/mysqlcheck.c:
  Removed extra handle_optins()'s parameter.
client/mysqldump.c:
  Removed extra handle_optins()'s parameter.
client/mysqlimport.c:
  Removed extra handle_optins()'s parameter.
client/mysqlmanager-pwgen.c:
  Removed extra handle_optins()'s parameter.
client/mysqlmanagerc.c:
  Removed extra handle_optins()'s parameter.
client/mysqlshow.c:
  Removed extra handle_optins()'s parameter.
client/mysqltest.c:
  Removed extra handle_optins()'s parameter.
extra/my_print_defaults.c:
  Removed extra handle_optins()'s parameter.
extra/mysql_install.c:
  Removed extra handle_optins()'s parameter.
extra/mysql_waitpid.c:
  Removed extra handle_optins()'s parameter.
extra/perror.c:
  Removed extra handle_optins()'s parameter.
extra/resolve_stack_dump.c:
  Removed extra handle_optins()'s parameter.
extra/resolveip.c:
  Removed extra handle_optins()'s parameter.
include/my_getopt.h:
  Removed extra handle_optins()'s parameter.
isam/isamchk.c:
  Removed extra handle_optins()'s parameter.
isam/pack_isam.c:
  Removed extra handle_optins()'s parameter.
myisam/mi_test1.c:
  Removed extra handle_optins()'s parameter.
myisam/myisam_ftdump.c:
  Removed extra handle_optins()'s parameter.
myisam/myisamchk.c:
  Removed extra handle_optins()'s parameter.
myisam/myisampack.c:
  Removed extra handle_optins()'s parameter.
sql/gen_lex_hash.cc:
  Removed extra handle_optins()'s parameter.
sql/mysqld.cc:
  Removed extra handle_optins()'s parameter.
tools/mysqlmanager.c:
  Removed extra handle_optins()'s parameter.
2004-08-31 21:27:58 +05:00
unknown
775c057ef4 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-31 15:53:28 +02:00
unknown
e9c594e6d4 Better easier to call error message format. 2004-08-31 18:53:27 +05:00
unknown
d6493dbefe - bumped up version number in configure.in to "4.1.5-gamma"
- tagged ChangeSet@1.2013 as "mysql-4.1.4"


configure.in:
   - bumped up version number in configure.in to "4.1.5-gamma"
2004-08-31 15:53:26 +02:00
unknown
ae3dd78b5f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_base.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
2004-08-31 16:53:25 +03:00
unknown
52df5f5b5a Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1


cmd-line-utils/libedit/Makefile.am:
  Auto merged
configure.in:
  Auto merged
2004-08-31 18:53:24 +05:00
unknown
8bf3885883 fixed two compiling bugs for libedit
acinclude.m4:
  added macro to check if dirent.d_namlen is defined
cmd-line-utils/libedit/config.h:
  added define for __attribute__
cmd-line-utils/libedit/readline.c:
  checked STRUCT_DIRENT_HAS_D_NAMLEN instead of
  old enumeration of problem platforms
configure.in:
  added checking if dirent has d_namlen member field
2004-08-31 18:29:01 +05:00
unknown
51fce2d247 fixed compiling bug of libedit on qnx
discarded using of uint in cmd-line-utils/libedit/chared.c
because it's undefined on qnx


cmd-line-utils/libedit/chared.c:
  discarded using of uint because it's undefined on qnx
2004-08-31 17:51:02 +05:00
unknown
7728843c66 fixed compiling bug
(non gcc compilers don't understand '-Dx()=' option)


cmd-line-utils/libedit/Makefile.am:
  discarded '-Dx()=' options for compatibility with non-gcc compilers
cmd-line-utils/libedit/config.h:
  added empty definitions of __RCSID(x), __COPYRIGHT(x), 
                            __RENAME(x), _DIAGASSERT(x)
cmd-line-utils/libedit/np/unvis.c:
  added #include "config.h" to define __RCSID(x)
cmd-line-utils/libedit/np/vis.c:
  reinsert #include "config.h" before using of __RCSID(x)
2004-08-31 17:29:47 +05:00
unknown
07f5a44bc0 Review of new pushed code (Indentation fixes and simple optimizations)
Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database
Safety fix for mailformed MERGE files


Build-tools/mysql-copyright:
  Print correct file name in case of errors
  Fixed indentation
include/config-win.h:
  Removed unnecessary #ifdef
myisammrg/myrg_open.c:
  Don't give a core if merge file contains INSERT_METHOD first (not legal but better safe than sorry)
  Don't set struct variables to zero that are already zero
  Indentation fixes
mysql-test/r/create.result:
  Use 'mysqltest' as test database
mysql-test/r/ndb_basic.result:
  Use 'mysqltest' as test database
mysql-test/r/ndb_blob.result:
  Use 'mysqltest' as test database
mysql-test/r/ndb_transaction.result:
  Use 'mysqltest' as test database
mysql-test/r/ps_1general.result:
  Use 'mysqltest' as test database
mysql-test/r/rpl_charset.result:
  Use 'mysqltest' as test database
mysql-test/r/rpl_delete_all.result:
  Use 'mysqltest' as test database
mysql-test/r/show_check.result:
  Use 'mysqltest' as test database
mysql-test/t/create.test:
  Use 'mysqltest' as test database
mysql-test/t/ndb_basic.test:
  Use 'mysqltest' as test database
mysql-test/t/ndb_blob.test:
  Use 'mysqltest' as test database
mysql-test/t/ndb_transaction.test:
  Use 'mysqltest' as test database
mysql-test/t/ps_1general.test:
  Use 'mysqltest' as test database
mysql-test/t/rpl_charset.test:
  Use 'mysqltest' as test database
mysql-test/t/rpl_delete_all.test:
  Use 'mysqltest' as test database
mysql-test/t/show_check.test:
  Use 'mysqltest' as test database
sql/field.h:
  Mark functions that should be deleted as soon as we have a new prototype for store(longlong)
sql/lock.cc:
  Indentation fix
sql/sql_base.cc:
  Better comment.
  Break find_item_in_list in case of perfect match
sql/sql_prepare.cc:
  Simple optimization
sql/sql_select.cc:
  Portability fix
2004-08-31 14:35:04 +03:00
unknown
d2baf0f12b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames


sql/sql_class.cc:
  Auto merged
2004-08-31 14:12:42 +04:00
unknown
851e3cabb0 Fix for bug#5312 Ndb Cluster returns wrong error code for duplicate key at insert 2004-08-31 12:07:48 +02:00
unknown
c62dd0d409 Change Item_arena::state to enum 2004-08-31 14:07:02 +04:00
unknown
e9a85134c7 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-31 10:20:51 +02:00
unknown
c52a30b5df Enabled HA_NULL_IN_KEY support 2004-08-31 10:19:10 +02:00
unknown
2e86cdb179 Simplified expensive test 2004-08-31 10:00:33 +02:00
unknown
e2f697bec0 Names listed as options should look like options,
not variables.
2004-08-30 11:11:10 -05:00
unknown
fb724e532c If the system has 64 bit "long", then "long long" does not add new
functionality. The existing code takes advantage of this when
"typedef"ing 'longlong' in 'my_global.h'. This holds for Alpha CPUs.
If the compiler then has prototypes for C99 functions 'strtoll()' and
'strtoull()' but no implementation, the existing code in 'strtoull.c'
collides with that prototype. These collisions are avoided now.
(backport from 4.1)


include/m_string.h:
  Extend the "fake" approach from 'strtoull()' onto 'strtoll()'
  (backport from 4.1).
strings/strto.c:
  Ensure that calling file has included necessary headers,
  as these are needed at the upper level already
  (backport from 4.1).
strings/strtol.c:
  Cleanup/alignment with the "long long" functions.
strings/strtoll.c:
  When "long" is 64 bit already, system function 'strtol()' can be used.
  Header files 'my_global.h' and 'm_string.h' will manage that,
  if they are included early enough (backport from 4.1).
strings/strtoul.c:
  Cleanup/alignment with the "long long" functions.
strings/strtoull.c:
  When "long" is 64 bit already, system function 'strtoul()' can be used.
  Header files 'my_global.h' and 'm_string.h' will manage that,
  if they are included early enough (backport from 4.1).
2004-08-30 17:41:41 +02:00
unknown
6bc2acce00 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/mysqld.cc:
  Auto merged
2004-08-30 16:32:10 +02:00
unknown
7982187476 space-stripping in _mi_prefix_search: BUG#5284 2004-08-30 16:12:53 +02:00
unknown
5bafde9ab0 Correct a typo error: cpp symbol is "BIG_TABLES", not "BIG_FILES".
configure.in:
  Defining "BIG_TABLES" works around a problem with the Sun Forte 
  compiler for Solaris on x86 platforms: improper handling of "long long".
  Error shows up on the "limit_rows_found" variable in test "union".
  Old "BIG_FILES" was a typing error.
2004-08-30 13:25:22 +02:00
unknown
88fe390a72 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-30 10:17:51 +02:00
unknown
4e2f80b457 typo fixed 2004-08-30 10:13:13 +02:00
unknown
0c549e366c - removed mysql-test/t/flush_block_commit-master.opt as it collided
with the sleep value we use for the test suite run during the
   release builds


BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796:
  Delete: mysql-test/t/flush_block_commit-master.opt
2004-08-30 09:20:52 +02:00
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
52581fb604 configure.in:
Ascii was written twice


configure.in:
  Ascii was written twice
2004-08-30 11:36:26 +05:00
unknown
877503f5af log.cc:
Fixed missing * in comment in setup_windows_event_source


sql/log.cc:
  Fixed missing * in comment in setup_windows_event_source
2004-08-30 00:50:39 +02:00
unknown
f45c482aa9 NOT elimination moved in parsing (suggested by Monty)
sql/item_cmpfunc.cc:
  NOT elimination moved in parsing (we do not need fix fields in it and PS processing)
sql/item_cmpfunc.h:
  NOT elimination moved in parsing (we do not need fix fields in it and PS processing)
sql/sql_select.cc:
  NOT elimination moved in parsing (we do not need fix fields in it and PS processing)
sql/sql_yacc.yy:
  NOT elimination moved in parsing
2004-08-29 23:14:46 +03:00
unknown
02d3c02281 Fix for BUG#5242: Made SQL Syntax Prepared Statement names case-insensitive.
mysql-test/r/ps.result:
  Testcase for BUG#5242
mysql-test/t/ps.test:
  Testcase for BUG#5242
2004-08-29 19:44:28 +04:00
unknown
d84b42b6e4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0


sql/log.cc:
  Auto merged
2004-08-29 14:14:32 +02:00
unknown
4014c093e2 Fix for BUG#4500 "set character set replicates incorrectly"
We must not reset the charset in slave after each statement, otherwise the SET CHARACTER SET is cancelled immediately.
Instead, we write a SET CHARACTER SET DEFAULT to the master's binlog when needed (like we already do for SET FOREIGN_KEY_CHECKS);
such writing is not necessary in 4.1 (in 4.1 the bug does not exist, as the SET ONE_SHOT syntax is used).
I have written a test and it works, but I'm not pushing the test as it requires building with all charsets.
I have noticed differences between what is inserted in the master's table in 4.0 and 4.1, and alerted Bar.


sql/log.cc:
  When SET CHARACTER SET has been used, we must reset the charset after the writing the statement, in the binlog.
  In 4.1, this resetting is already achieved by the SET ONE_SHOT syntax.
sql/log_event.cc:
  In slave, we must not simply reset the charset after each statement: if we do this, the charset gets
  immediately after executing the SET CHARACTER SET! (BUG#4500).
2004-08-29 14:13:51 +02:00