Commit graph

17034 commits

Author SHA1 Message Date
unknown
d1e4a1f171 time independent test
mysql-test/r/ctype_ucs.result:
  result update
mysql-test/t/ctype_ucs.test:
  time independent
2004-11-17 17:06:24 +01:00
unknown
7f5be1b654 Use negate_expression() instead of new Item_func_not() 2004-11-17 15:49:12 +00:00
unknown
ae4c3d22d7 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/wl638.3
2004-11-17 15:49:11 +00:00
unknown
ebf110f9d5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
2004-11-17 17:49:10 +02:00
unknown
191fa29932 WL#638 - Fix precedence for parsing NOT ... LIKE expression s
Rework parser expression rules
  Rework handling for "||" concat/or
  Eliminate some shift/reduce conflicts
  Add support for "xxx IS [ NOT ] truth_value"


mysql-test/r/ansi.result:
  Fix test for new BROKEN_NOT mode bit
mysql-test/r/bool.result:
  WL#638
    New test for BROKEN_NOT mode
    New test for "expr IS [NOT] truth_value" syntax
mysql-test/r/sql_mode.result:
  Fix test for new BROKEN_NOT mode bit
mysql-test/t/bool.test:
  WL#638
    New test for BROKEN_NOT mode
    New test for "expr IS [NOT] truth_value" syntax
sql/lex.h:
  WL#638
    "&&" and "AND" return different tokens,
    NOT token changed to NOT_SYM
    OR_OR_CONCAT token changed to OR_OR_SYM
    New token "UNKNOWN"
sql/mysql_priv.h:
  WL#638
    New mode: BROKEN_NOT
sql/mysqld.cc:
  WL#638
    New mode: BROKEN_NOT
sql/set_var.cc:
  WL#638
    New mode: BROKEN_NOT
    BROKEN_NOT is set in MYSQL323 and MYSQL40 modes
sql/sql_lex.cc:
  Bug#638
    Alter tokens returned by lexer depending upon sql_mode:
    Return NOT2_SYM token instead of NOT_SYM when in BROKEN_NOT mode
    Return OR2_SYM token instead of OR_OR_SYM when not in PIPES_AS_CONCAT mode
sql/sql_yacc.yy:
  WL#638
    Change grammar to respect proper SQL syntax for NOT
    Clean up grammar, eliminate >100 shift/reduce conflicts
    New support for "expr IS [NOT] truth_value" SQL syntax
    Remove or_or_concat() support func. New support func is_truth_value()
2004-11-17 15:49:10 +00:00
unknown
1dad655030 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.1
2004-11-17 18:49:09 +03:00
unknown
173722db8b Fix for Auto_increment filed value in 'show table status'
code cleanup


mysql-test/r/information_schema.result:
  Fix for Auto_increment filed value in 'show table status'
mysql-test/t/information_schema.test:
  Fix for Auto_increment filed value in 'show table status'
2004-11-17 18:48:12 +03:00
unknown
ab51882b77 Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code.
Moving the part of user_var.test using UCS2 to ctype_ucs.test


mysql-test/r/ctype_ucs.result:
  result update
mysql-test/r/user_var.result:
  result update
mysql-test/t/ctype_ucs.test:
  importing test piece from user_var.test
mysql-test/t/user_var.test:
  using UCS2 in this test fails on non-USC2-capable binaries, so let's move this piece to ctype_ucs.test.
sql/slave.cc:
  changing arg type to uint32* (as what is used in this arg is &thd->db_length which is uint32*)
sql/slave.h:
  changing arg type to uint32*
sql/sql_parse.cc:
  changing arg types to uint32, as what is used in these args is a create_field::length which is uint32.
2004-11-17 16:41:30 +01:00
unknown
090a843fee Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
2004-11-17 16:58:08 +02:00
unknown
71da21b2e9 merged
sql/ha_innodb.cc:
  Auto merged
2004-11-17 15:28:37 +01:00
unknown
7fc70c7f40 #warning removed
AC_FUNC_MMAP changes to AC_CHECK_FUNCS(mmap)


configure.in:
  don't use AC_FUNC_MMAP - it checks for "private fixed mapping of
  already-mapped memory" - and we don't care about it.
  use regular AC_CHECK_FUNCS(mmap) instead
  (blame autoconf for misleading macro name - should've been
  AC_MMAP_CAN_DO_PRIVATE_FIXING_MAPPING_OF_ALREADY_MAPPED_MEMORY :)
include/my_pthread.h:
  not all cpp's understand #warning :-[]
2004-11-17 14:38:01 +01:00
unknown
835e0159b6 test for bug#5528 2004-11-17 13:38:35 +01:00
unknown
968dbbcd22 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0


sql/item_func.cc:
  Auto merged
sql/table.h:
  Auto merged
2004-11-17 14:20:28 +02:00
unknown
6eb81bbb22 fixing compiler warnings
sql/item_func.cc:
  fixed type
sql/sql_base.cc:
  keep kompiller happy about unused lable in libmysqld
sql/sql_view.cc:
  keep kompiller happy about unused variable in libmysqld
sql/table.h:
  correct type casting
2004-11-17 14:17:09 +02:00
unknown
c0114674fd don't fail if dbug manual cannot be built 2004-11-17 12:28:44 +01:00
unknown
5368ba56b5 Merge
sql/ha_ndbcluster.cc:
  SCCS merged
2004-11-17 10:59:16 +00:00
unknown
7cd9cc1bfc Fix warnings and compilation failures (Windows).
sql/field.cc:
  Fix warning.
sql/item_func.cc:
  Fix Windows compilation failure.
sql/opt_range.cc:
  Fix warnings and errors (Windows)
sql/sp_pcontext.h:
  Fix warning (Windows).
sql/table.h:
  Fix warning (Windows).
2004-11-17 13:45:05 +03:00
unknown
c617037b23 Enabled usage of new system variables for ndb
- ndb_use_exact_count
  - ndb_autoincrement_prefetch_sz
  - ndb_use_transactions
  - ndb_force_send
moved "inlined" functions to .cc file since they are virtual anyways
enabled printout od ndb errors in warnings even if mapping existst to mysql error code


sql/ha_ndbcluster.h:
  Enabled usage of new system variables for ndb
    - ndb_use_exact_count
    - ndb_autoincrement_prefetch_sz
    - ndb_use_transactions
    - ndb_force_send
  moved "inlined" functions to .cc file since they are virtual anyways
sql/mysqld.cc:
  Enabled usage of new system variables for ndb
    - ndb_use_exact_count
    - ndb_autoincrement_prefetch_sz
    - ndb_use_transactions
    - ndb_force_send
sql/set_var.cc:
  Enabled usage of new system variables for ndb
    - ndb_use_exact_count
    - ndb_autoincrement_prefetch_sz
    - ndb_use_transactions
    - ndb_force_send
sql/sql_class.h:
  Enabled usage of new system variables for ndb
    - ndb_use_exact_count
    - ndb_autoincrement_prefetch_sz
    - ndb_use_transactions
    - ndb_force_send
2004-11-17 08:15:53 +00:00
unknown
692311f53c enabled having system tables in ndb 2004-11-17 08:10:26 +00:00
unknown
3a301ac1f8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2004-11-16 15:07:49 -08:00
unknown
163d8b27aa portability fix
server-tools/instance-manager/mysqlmanager.cc:
  removed non-portable sys_siglist
2004-11-17 01:52:33 +03:00
unknown
d7729a859c Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
2004-11-17 01:26:23 +03:00
unknown
0033fa4be8 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-11-16 14:01:40 -08:00
unknown
2094d80b48 key_cache.result, key_cache.test:
Added a test case for bug #6447.
mf_keycache.c:
  Fixed bug #6447. Erronious code in the key_cache_read function
  caused problems when reading key blocks with offset>0 into
  key cache. The code of key_cache_insert and key_cache_write
  was modified similarly.


mysys/mf_keycache.c:
  Fixed bug #6447. Erronious code in the key_cache_read function
  caused problems when reading key blocks with offset>0 into
  key cache. The code of key_cache_insert and key_cache_write
  was modified similarly.
mysql-test/t/key_cache.test:
  Added a test case for bug #6447.
mysql-test/r/key_cache.result:
  Added a test case for bug #6447.
2004-11-16 13:58:49 -08:00
unknown
8c2ae72055 - added a cast to avoid a compiler error on HP-UX 2004-11-16 22:05:29 +01:00
unknown
190227dc57 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-11-16 22:50:29 +02:00
unknown
d711df11f5 ha_innodb.cc:
Anthony's http://lists.mysql.com/internals/18505 patch for DROP DATABASE broke caused it to return errno if .ibd files were present (bas_ext() was obsolete in ha_innodb.cc); fix this


sql/ha_innodb.cc:
  Anthony's http://lists.mysql.com/internals/18505 patch for DROP DATABASE broke caused it to return errno if .ibd files were present (bas_ext() was obsolete in ha_innodb.cc); fix this
2004-11-16 22:49:28 +02:00
unknown
a710ebb413 Fix comment.
sql/item_func.cc:
  Fix comment (used_table_cache is completely different from 
  used_tables_cache :)
2004-11-16 23:27:31 +03:00
unknown
7d074100d3 ha_innodb.cc:
Manually ported this bug fix from 4.0: 
 Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master


sql/ha_innodb.cc:
  Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
2004-11-16 20:45:52 +02:00
unknown
16d735adb0 ha_innodb.cc:
Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master


sql/ha_innodb.cc:
  Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
2004-11-16 20:37:42 +02:00
unknown
f2db7d57f5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug


heap/hp_hash.c:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
sql/ha_heap.cc:
  Auto merged
2004-11-16 21:36:31 +03:00
unknown
cb39ddfbb8 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0
into sinisa.nasamreza.org:/mnt/work/petica
2004-11-16 18:17:43 +02:00
unknown
906d871d12 don't delete ac_available_languages_fragment in configure - it may be needed later
BitKeeper/etc/ignore:
  added ac_available_languages_fragment
2004-11-16 16:52:29 +01:00
unknown
2b024cee73 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0
into sinisa.nasamreza.org:/mnt/work/petica
2004-11-16 17:46:35 +02:00
unknown
5119d6f73d Fixing a linking problem that occurs with some compilers, due to
unresolved symbols.
2004-11-16 17:42:36 +02:00
unknown
c9a09e12db ha_ndbcluster.cc:
reverting previous patch


sql/ha_ndbcluster.cc:
  reverting previous patch
2004-11-16 13:56:25 +00:00
unknown
5aab4ac28a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-11-16 16:50:17 +04:00
unknown
b226bebcc8 ctype-tis620.c:
Space allocated didn't take in account trailing '\0' bytes.


strings/ctype-tis620.c:
  Space allocated didn't take in account trailing '\0' bytes.
2004-11-16 16:45:47 +04:00
unknown
996986fea1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6449
2004-11-16 16:10:45 +04:00
unknown
9ae173c4ff Also print warning if there is an ndb->mysql errorcode mapping, this since the warning provides valuable info to the user 2004-11-16 12:10:44 +00:00
unknown
b23f183049 bad fix of the bad cleanup corrected :)
sql/sql_parse.cc:
  bad fix of the bad cleanup corrected
2004-11-16 12:39:10 +01:00
unknown
0f9f2b02c1 A fix (bug #6449: DO server-crashing bug).
sql/sql_yacc.yy:
  A fix (bug #6449: DO server-crashing bug).
  expr_list is used for DO command.
2004-11-16 14:36:25 +04:00
unknown
a2b3d71d1f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-16 09:28:17 +00:00
unknown
f4110834a3 In 5.0 we return 'out of range' instead of 'data truncated'.
mysql-test/r/rpl_rewrite_db.result:
  in 5.0 we return 'out of range' instead of 'data truncated'.
2004-11-16 10:12:09 +01:00
unknown
0babddfd79 Makefile.am:
changed link order to fix linking problems


client/Makefile.am:
  changed link order to fix linking problems
2004-11-16 09:10:29 +00:00
unknown
3790b5fd6b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-11-16 12:09:49 +04:00
unknown
b670ccac13 Bug #6552 CHAR column w/o length is legal, BINARY w/o length is not 2004-11-16 12:05:13 +04:00
unknown
cf41c306d2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-16 07:24:50 +00:00
unknown
1a9a113201 provided better error printout for mismatch of node types in configuratoin fetch
fixed to that mgmt server actually uses the connectsring


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  provided better error printout
ndb/src/mgmsrv/main.cpp:
  fixed to that mgmt server actually uses the connectsring
2004-11-16 07:24:11 +00:00
unknown
6e5c5b7839 Merge mysql.com:/home/mysql_src/mysql-4.1-clean
into mysql.com:/home/mysql_src/mysql-5.0-clean


client/mysqldump.c:
  Auto merged
2004-11-16 00:14:46 +01:00