Commit graph

26967 commits

Author SHA1 Message Date
unknown
4857e205a3 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/13327-bug-5.0-mysql
2005-10-12 00:12:54 +04:00
unknown
cdec188e1d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/13327-bug-5.0-mysql
2005-10-11 23:31:32 +04:00
unknown
49a33c57f2 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/eric/dev/mysql-5.0
2005-10-11 09:13:27 -07:00
unknown
efd15a5883 Merge mysql.com:/home/jimw/my/mysql-5.0-13650
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-11 08:40:23 -07:00
unknown
d471e9de7d Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
2005-10-11 17:03:41 +05:00
unknown
a942a6c394 complete.c:
Fixed compilation problem on FreeBSD,
  after discussion with Jani.
  Doesn't FreeBSD follow the standard?
  


cmd-line-utils/readline/complete.c:
  Fixed
2005-10-11 16:56:42 +05:00
unknown
f1b93086d9 Merging
mysql-test/r/type_float.result:
  merging
2005-10-11 16:39:35 +05:00
unknown
57e970dbdd Merging
mysql-test/t/type_float.test:
  Auto merged
mysql-test/r/type_decimal.result:
  merging
mysql-test/r/type_float.result:
  merging
mysql-test/r/union.result:
  merging
mysql-test/t/type_decimal.test:
  merging
sql/item.cc:
  merging
2005-10-11 14:58:25 +05:00
unknown
7efa1939ee BUG#13724 conditionally added CONNECTION='connect string' for SHOW CREATE TABLE
mysql-test/r/federated.result:
  test results for SHOW CREATE TABLE
mysql-test/t/federated.test:
  added test for SHOW CREATE TABLE
sql/sql_show.cc:
  added connect_string for SHOW CREATE TABLE
2005-10-10 17:41:36 -07:00
unknown
62d6227871 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0
2005-10-10 21:52:50 +02:00
unknown
56af2fc168 Added missing HAVE_REPLICATION define 2005-10-10 21:42:14 +02:00
unknown
55ca2515ce Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/svoj/devel/mysql/engine/mysql-5.0
2005-10-11 00:35:09 +05:00
unknown
f08fdca304 Always save/restore connect string.
sql/table.cc:
  If extra block present always restore connect string.
sql/unireg.cc:
  Always save connect string.
2005-10-10 23:53:53 +05:00
unknown
57ef857681 Store and read engine type string in extra block of .frm.
sql/handler.cc:
  Use my_strnncoll instead of my_strcasecmp (it is possible to
  compare non-asciiz strings now).
sql/handler.h:
  extra block size added to HA_CREATE_INFO.
2005-10-10 23:01:45 +05:00
unknown
17a7fbd59c After merge fixes 2005-10-10 19:38:58 +02:00
unknown
a90ab1e280 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0
2005-10-10 18:34:35 +02:00
unknown
aac2575bdb Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.13372


sql/item.cc:
  Auto merged
2005-10-10 21:09:34 +05:00
unknown
37c98812b3 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
into  mysql.com:/users/lthalmann/bk/mysql-5.0


myisam/mi_rkey.c:
  Auto merged
mysql-test/r/subselect2.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
configure.in:
  After merge fixes
myisam/mi_search.c:
  After merge fixes
mysql-test/r/select.result:
  After merge fixes
sql/item.cc:
  After merge fixes
sql/sql_parse.cc:
  After merge fixes
sql/sql_update.cc:
  After merge fixes
2005-10-10 17:50:19 +02:00
unknown
748b5ce3f0 fixed init of variables in ndb block constructors 2005-10-10 17:09:27 +02:00
unknown
ee5795f2f4 Fix bug#13327 check_equality() wasn't checking view's fields
check_equality() finds equalities among field items. It checks input items
to be Item_fields thus skipping view's fields, which are represented by
Item_direct_view_ref. Because of this index wasn't applied in all cases
it can be.

To fix this problem check_equality() now takes real item of
Item_direct_view_ref, except outer view refs (with depended_from set).


sql/sql_select.cc:
  Fix bug #13327 VIEW performs index scan
   For proper views fields handling check_equality() now takes real item from Item_direct_view_ref, with exception of outer view refs.
mysql-test/r/view.result:
  Test case for bug#13327 VIEW performs index scan
mysql-test/t/view.test:
  Test case for bug#13327 VIEW performs index scan
2005-10-10 18:53:57 +04:00
unknown
5d2bc92523 BUG#12618: Removing fake locking
mysql-test/r/rpl_multi_update3.result:
  New test case
mysql-test/t/rpl_multi_update3.test:
  New test case
sql/sql_parse.cc:
  Removed fake locking
  Changed so that filtering is done later for multi-update
  Removed redundant code
sql/sql_update.cc:
  Moved call to sql_parse.cc
2005-10-10 15:10:14 +02:00
unknown
931771422f - typo fix: rott->root in the file attributes for mysql_client_test of the RPM spec file
support-files/mysql.spec.sh:
  - typo fix: rott->root in the file attributes for mysql_client_test
2005-10-10 13:00:41 +02:00
unknown
2b603902cc Bug #13611 double [TCP DEFAULT] in config.ini crashes ndb_mgmd
- Added error printout and nice exit for duplicate default sections
2005-10-10 12:27:48 +02:00
unknown
a53386aaae Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmsrv/Services.cpp:
  Auto merged
2005-10-10 09:38:18 +02:00
unknown
20a6f1524a Remove protocol_cursor.cpp (no longer used) from sources
Fix a compile failure


BitKeeper/deleted/.del-protocol_cursor.cc~2a1ab8e023a166a4:
  Delete: sql/protocol_cursor.cc
VC++Files/libmysqld/libmysqld.dsp:
  Remove protocol_cursor.cpp (no longer used) from sources
VC++Files/sql/mysqld.dsp:
  Remove protocol_cursor.cpp (no longer used) from sources
sql/mysqld.cc:
  Fix a compile failure
2005-10-09 14:45:08 +04:00
unknown
eb4da9fda7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


server-tools/instance-manager/mysql_connection.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-10-08 16:59:41 +02:00
unknown
0c16a7ccc7 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-10-08 16:59:08 +02:00
unknown
3a97babbc2 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/rpl_flush_tables.result:
  Auto merged
mysql-test/t/rpl_flush_tables.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-10-08 16:56:10 +02:00
unknown
0f60474f29 pthread_handler_decl() changed to be ctags-friendly
(and contain extern "C" when necessary)
2005-10-08 16:39:55 +02:00
unknown
51907576bd Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE"
don't allow STOP SLAVE if global read lock is in taken
2005-10-08 14:46:04 +02:00
unknown
63e7824fc2 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-10-07 20:40:09 +04:00
unknown
9cf3d4b4a5 fix compile failure (which shows up in cygwin environment)
server-tools/instance-manager/mysql_connection.cc:
  fix pragma statement
server-tools/instance-manager/user_map.cc:
  fix pragma statement
2005-10-07 20:25:51 +04:00
unknown
38a0e9130b added missing signal to VoidFs 2005-10-07 17:43:59 +02:00
unknown
30d81f0041 Merge mysqldev@production.mysql.com:my/mysql-4.1-release
into  mysql.com:/usr/home/ram/work/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged
2005-10-07 20:34:40 +05:00
unknown
d1e71faf61 Populate t1 in order to get more predictable explain results. 2005-10-07 20:14:34 +05:00
unknown
d40a0f423f Copy zlib.a and valgrind.supp if exists.
Copy disabled.def
(Backport of Kent's change from the main tree to the 4.1.15 build clone.
Original changeset:  2005/10/07 13:08:07+02:00 kent@mysql.com )


scripts/make_binary_distribution.sh:
  Copy zlib.a and valgrind.supp if exists.
  Copy disabled.def
  (Backport of Kent's change from the main tree to the 4.1.15 build clone.)
2005-10-07 16:37:53 +02:00
unknown
c533a6bf04 make_binary_distribution.sh:
Copy zlib.a and valgrind.supp if exists
  Copy disabled.def


scripts/make_binary_distribution.sh:
  Copy zlib.a and valgrind.supp if exists
2005-10-07 13:08:07 +02:00
unknown
7d3044fc80 Merge
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2005-10-07 12:55:00 +02:00
unknown
8b1936fa12 Increase the version number. 2005-10-07 12:50:29 +02:00
unknown
eb1b1e7721 after merge fix 2005-10-07 15:09:44 +05:00
unknown
a5ea2e5cab 4.1 -> 5.0 merge
client/mysql.cc:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/r/rpl_openssl.result:
  manual merge
2005-10-07 14:26:32 +05:00
unknown
9ea8ce72ff Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails
allow select into outfile from I_S tables
  it is enough to add FILE_ACL for I_S tables only to 'check_table_access' function
  as we use 'any_db' for 'check_access' function in places where FILE_ACL is required


mysql-test/t/outfile.test:
  Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails
    test case
2005-10-07 14:16:44 +05:00
unknown
a9363ce9c3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug13484


sql/ha_innodb.cc:
  Auto merged
mysql-test/r/index_merge_innodb.result:
  Auto merged
mysql-test/r/rowid_order_innodb.result:
  Auto merged
mysql-test/t/index_merge_innodb.test:
  Auto merged
2005-10-07 11:14:40 +04:00
unknown
0ecbc17ccc Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2005-10-07 04:02:53 +03:00
unknown
0559483cec Fix use of "%*s" *printf() specifiers that were really meant to be
"%.*s". (Bug #13650)


sql/sp.cc:
  Fix print specifiers for strings. %*s sets the minimum width of the
  string from a variable, %.*s sets the maximum width.
sql/sp_cache.cc:
  Fix print specifiers for strings. %*s sets the minimum width of the
  string from a variable, %.*s sets the maximum width.
sql/sp_head.cc:
  Fix print specifiers for strings. %*s sets the minimum width of the
  string from a variable, %.*s sets the maximum width.
2005-10-06 17:37:24 -07:00
unknown
3dcf205664 Review of new code since last pull
- Use %lx instead of %p as %p is not portable
- Don't replace ROW item with Item_null


myisam/mi_rkey.c:
  Use %lx instead of %p as %p is not portable
myisam/mi_search.c:
  Use %lx instead of %p as %p is not portable
mysql-test/r/select.result:
  More test for ROW comparison
mysql-test/t/select.test:
  More test for ROW comparison
sql/item.cc:
  We can't replace a ROW item with Item_null because:
  - Arg_comparator is still using the orignal row items and it's not good to have args[0] different from what is actually compared
  - If we are using the <=> comparator, NULL can still be compared as true
  - We would break things if we would ever use resolve_const_item() for operators like >, < etc.
2005-10-07 03:12:15 +03:00
unknown
2d017ee897 make_binary_distribution.sh:
Corrected platform name output
Services.cpp:
  Dont print null address (back port from 5.0)


ndb/src/mgmsrv/Services.cpp:
  Dont print null address (back port from 5.0)
scripts/make_binary_distribution.sh:
  Corrected platform name output
2005-10-07 01:56:11 +02:00
unknown
707a4b6539 make_binary_distribution.sh:
Reintroduced --machine
  Better sh compatibility, "for i ; do" is not portable


scripts/make_binary_distribution.sh:
  Reintroduced --machine
  Better sh compatibility, "for i ; do" is not portable
2005-10-06 22:57:13 +02:00
unknown
979446f356 Merge mysql.com:/home/dellis/mysqlab/bk/local_mysql-4.1
into  mysql.com:/home/dellis/mysqlab/bk/mysql-5.0
2005-10-06 15:52:01 -05:00
unknown
f306c37c86 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/dellis/mysqlab/bk/mysql-4.1
2005-10-06 15:42:35 -05:00