Commit graph

14256 commits

Author SHA1 Message Date
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
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
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
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
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
ebf4ce0501 Minor edits to error messsage. 2004-08-28 13:07:47 -05:00
unknown
8165b519e2 - adding more missing libedit files 2004-08-27 22:52:33 +02:00
unknown
f0239303b9 - add missing file "read.h" to the source distribution 2004-08-27 21:18:51 +02:00
unknown
00a11f790a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 19:35:24 +02:00
unknown
f1825699fa mysql.cc:
Minor edits to help command messages.


client/mysql.cc:
  Minor edits to help command messages.
2004-08-27 12:27:57 -05:00
unknown
6eac99a5b6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 19:02:46 +02:00
unknown
d393ff72b6 Bu#4526 building with utf8_bin collation causes help to be case sensitive 2004-08-27 21:12:53 +05:00
unknown
f71662695d Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION conflict 2004-08-27 20:48:19 +05:00
unknown
3d2e2ddd12 grant.result:
Forgot to push in the previous changeset


mysql-test/r/grant.result:
  Forgot to push in the previous changeset
2004-08-27 20:48:18 +05:00
unknown
7f8e7315b3 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-08-27 17:48:17 +02:00
unknown
12e10b11d9 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2004-08-27 20:48:16 +05:00
unknown
f4abefe36a fixed format of history of new libedit for compatibility
with old libedit and readline

1. discarded reading and writting of hist_cookie as the begin of the file
2. skip strvis for string before saving



cmd-line-utils/libedit/history.c:
  fixed format of history for compatibility with old libedit and readline
  
  1. discarded reading and writting of hist_cookie as the begin of file
  2. skip strvis for string before saving
2004-08-27 20:32:28 +05:00
unknown
aa243adb8f bug-5252 fix (tinyblob)
ndb/src/ndbapi/NdbBlob.cpp:
  theBlobTable is NULL for tinyblob
2004-08-27 15:10:53 +02:00
unknown
c0c6513864 Fix order by 2004-08-27 14:15:47 +02:00
unknown
85391d227f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 14:02:02 +02:00
unknown
0e30907761 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-08-27 15:56:27 +05:00
unknown
1ba9966b7d grant.result:
Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.


mysql-test/r/grant.result:
  Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.
2004-08-27 15:55:16 +05:00
unknown
9fff2bdc05 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 08:54:34 +02:00
unknown
f87f890eff Adding the file needed for windows build (on behalf of Reggie) 2004-08-27 03:27:16 +04:00
unknown
cb76f3c076 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-27 01:01:47 +02:00
unknown
b5ebc0f259 Fix ordered index scan with partially specified key 2004-08-27 00:59:16 +02:00
unknown
1b0dee296d 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-26 16:44:01 -05:00
unknown
811093e591 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-5126
2004-08-26 22:48:05 +04:00
unknown
ce91cbb867 A short fix and test case for Bug#5126
"Mediumint and PS problem": just treat mediumint as long.


libmysql/libmysql.c:
  A short fix for bug #5126 "Mediumint and PS problem": just
  treat mediumint as long, as it's sent just like long.
tests/client_test.c:
  A test case for bug#5126
2004-08-26 22:47:34 +04:00
unknown
78b4ddbe22 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
2004-08-26 20:43:58 +02:00
unknown
4b47cc97aa - typo fix - make sure to include an existing file in the source
distribution...
2004-08-26 19:46:11 +02:00
unknown
82257f94f4 after merge
sql/item_row.cc:
  ds20 compat fix
2004-08-26 18:22:22 +02:00