Commit graph

13996 commits

Author SHA1 Message Date
unknown
8f68a9eb6f Bug#4594 "column index make = failed for gbk, but like works"
Fix for MyISAM. Tests for MyISAM and HASH+BTREE.
2004-08-20 21:29:36 +05:00
unknown
a6352443c1 compile error fixes for some platforms 2004-08-20 16:29:35 +00:00
unknown
b11203f38b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4302
2004-08-20 20:04:49 +04:00
unknown
80d924d934 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-20 16:04:48 +00:00
unknown
25c2c2a77c fix compile error on some platforms 2004-08-20 16:04:06 +00:00
unknown
764dd4918c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4302


sql/sql_select.cc:
  Auto merged
2004-08-20 19:30:45 +04:00
unknown
a9ea217c1b Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-08-20 17:30:45 +02:00
unknown
03990ba490 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-20 15:30:44 +00:00
unknown
18421a6c97 small helptext fix 2004-08-20 15:29:54 +00:00
unknown
f9c3cb5f2e Fix for bug#4302 "ambiguos order by when renamed column is identical to another in result"
When in find_item_in_list() we are looking for item we should take into account unaliased 
names of the fields but only if item with such aliased name is not found.
Also we should ignore aliases when looking for fully specified field.


mysql-test/r/order_by.result:
  Fixed wrong (non-standard) test results
  Added test case for bug #4302
  Added tests for other ambiguos and potentially ambigous cases in order by clause
mysql-test/t/order_by.test:
  Fixed wrong (non-standard) test results
  Added test case for bug #4302
  Added tests for other ambiguos and potentially ambigous cases in order by clause
sql/sql_select.cc:
  We should ignore only not_found_item errors when searching for item in find_order_in_list() 
  to be able to catch ambiguities.
2004-08-20 17:53:46 +04:00
unknown
1c90c388a4 - do not link statically on our IA64 and AMD64 build hosts, as
static linking against an unpatched glibc 2.3 is causing trouble
 - add "glibc23" to the release suffix in this case
 - re-ordered the Changelog that was messed up by a BK merge
   (RPM is picky about this)
2004-08-20 15:52:16 +02:00
unknown
3253551435 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1
2004-08-20 14:47:41 +02:00
unknown
aa3e61d312 Compile fixes for Mac OS X 2004-08-20 14:43:23 +02:00
unknown
3003e7d2d1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1
2004-08-20 14:04:30 +02:00
unknown
6527c6fee7 Bugfix for bug#5072, removed table version in BLOB table name since this is incremented at alter table 2004-08-20 14:04:29 +02:00
unknown
9c2bb7b628 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1
2004-08-20 13:25:48 +02:00
unknown
0432bec311 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb
2004-08-20 16:25:47 +05:00
unknown
6d0f675a45 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-clean
2004-08-20 11:25:46 +00:00
unknown
734fdcdf81 fixed some help tests for ndb executables 2004-08-20 11:24:41 +00:00
unknown
20dab90aad Fixed compiler warnings in sql/field.h.
sql/field.h:
  Fixed compiler warnings.
2004-08-20 13:11:14 +02:00
unknown
57a3d79b7f Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-08-20 15:39:26 +05:00
unknown
89d155aa57 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-08-20 10:39:25 +00:00
unknown
d31e9cf78d Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-08-20 13:39:00 +04:00
unknown
a8767c732c Fix to make range.test work smoothly --without-innidb
mysql-test/t/range.test:
  warnings disabled
2004-08-20 14:29:28 +05:00
unknown
33d29688d8 Resolving merging conflict 2004-08-20 12:33:52 +04:00
unknown
ba72b450bd Merge mskold@build.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-20 09:00:13 +02:00
unknown
2e09e96b05 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb


include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
2004-08-20 10:50:23 +05:00
unknown
ed7d4eeb69 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-20 06:53:23 +02:00
unknown
b228b58ad9 Merge mskold@build.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-20 06:51:02 +02:00
unknown
83e6ea37be merged 2004-08-20 01:38:20 +02:00
unknown
5b85dca572 typo in libedit fixed - possible buffer overflow - bug#4696 2004-08-20 01:34:34 +02:00
unknown
04c3915343 merged
BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
mysql-test/r/rpl_heap.result:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2004-08-20 00:52:43 +02:00
unknown
560d8ea342 sql_class.h:
removing unneeded var left from 4.0


sql/sql_class.h:
  removing unneeded var left from 4.0
2004-08-20 00:01:00 +02:00
unknown
6e1b567ab3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-19 23:45:44 +02:00
unknown
e7157aba3a (manual port from 4.0 - was needed)
Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)":
replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().


mysql-test/r/rpl_heap.result:
  result update
mysql-test/t/rpl_heap.test:
  changing test to test a bug (but anyway, mysql-test-run --manager looks like not working in 4.1 currently,
  so this test is never run).
sql/log.cc:
  new class Disable_binlog used to temporarily disable binlogging for one thread.
sql/mysql_priv.h:
  removing argument no_log from mysql_create_table(); no_log was not perfect as some
  binlogging could still be done by open_unireg_entry() for a HEAP table.
sql/sql_class.h:
  new class Disable_binlog used to temporarily disable binlogging for one thread.
sql/sql_parse.cc:
  removing no_log arg from mysql_create_table()
sql/sql_table.cc:
  removing no_log from mysql_create_table(); instead using new class Disable_binlog.
  Disabling binlogging in some cases, where the binlogging is done later by some other code
  (case of CREATE SELECT and ALTER).
2004-08-19 23:24:35 +02:00
unknown
d1c5ca31f6 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-19 23:11:16 +02:00
unknown
432a0f3683 less strict assert to take into account weird cases 2004-08-19 23:10:33 +02:00
unknown
03a20c23b3 ha_innodb.cc:
innobase_mysql_tmpfile(): call dup() and my_close() on the file
  returned by create_temp_file()
  in order to avoid memory leak caused by my_open() being paired with close()


sql/ha_innodb.cc:
  innobase_mysql_tmpfile(): call dup() and my_close() on the file
  returned by create_temp_file()
  in order to avoid memory leak caused by my_open() being paired with close()
2004-08-19 23:22:16 +03:00
unknown
8c1af75515 Build bug on 64-Bit platforms.
Removed improper casts.
Thanks to Joerg Bruehe for the fix.


include/my_global.h:
  Build bug on 64-Bit platforms.
  Removed improper casts.
  Changed to uniform writing style.
  Appended 'L' to 32-Bit constants which doesn't hurt on 32-Bit,
  but can be important for some 64-Bit compilers.
2004-08-19 21:41:10 +02:00
unknown
ae79d22224 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-19 21:37:58 +02:00
unknown
0ed563e801 Fixed symbol name problems that made build fail.
include/mysql.h:
  Fixed symbol name change.
include/mysql_com.h:
  Reverted parts of previous changeset (name changes) to make it build.
libmysql/libmysql.c:
  Fixed symbol name change.
sql/sql_parse.cc:
  Fixed symbol name change.
2004-08-19 20:48:00 +02:00
unknown
f72cec1b1c Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-19 18:42:01 +02:00
unknown
4f8bbaeda0 Bug #4769 - ft in subqueries 2004-08-19 18:40:15 +02:00
unknown
1d3a929ec9 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb
2004-08-19 21:25:37 +05:00
unknown
792c4c23b0 fixes for some compile problems on some platforms
ndb/src/mgmsrv/MgmtSrvr.cpp:
  atoll missing on some platforms
ndb/src/ndbapi/NdbScanOperation.cpp:
  compile error on some platforms
ndb/test/ndbapi/testIndex.cpp:
  Added some explicit templates
ndb/test/ndbapi/testNdbApi.cpp:
  Added some explicit templates
ndb/test/ndbapi/testRestartGci.cpp:
  Added some explicit templates
ndb/test/ndbapi/testScan.cpp:
  Added some explicit templates
ndb/test/run-test/main.cpp:
  Added some explicit templates
ndb/test/src/HugoOperations.cpp:
  Added some explicit templates
ndb/test/tools/cpcc.cpp:
  Added some explicit templates
2004-08-19 15:01:44 +00:00
unknown
883bda5dd8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-19 14:30:02 +00:00
unknown
e3c56fd4d7 mysql_com.h:
still better names for enum; removing unneeded symbol


include/mysql_com.h:
  still better names for enum; removing unneeded symbol
VC++Files/winmysqladmin/mysql_com.h:
  still better names for enum; removing unneeded symbol
2004-08-19 15:15:52 +02:00
unknown
d4590fa8bf Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-08-19 15:11:37 +02:00
unknown
32ad58799d mysql_com.h:
Better names for defines, as these are visible in API


include/mysql_com.h:
  Better names for defines, as these are visible in API
VC++Files/winmysqladmin/mysql_com.h:
  Better names for defines, as these are visible in API
2004-08-19 15:10:59 +02:00
unknown
0c33b59b93 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-19 12:36:54 +00:00