Commit graph

10349 commits

Author SHA1 Message Date
unknown
a8b7edda51 return proper value (otherwise mysld crashes here) 2003-10-25 21:12:38 +02:00
unknown
f081a54130 sql_parse.cc:
Add diagnostic printf to chack that number of connections for a user never drops below zero


sql/sql_parse.cc:
  Add diagnostic printf to chack that number of connections for a user never drops below zero
2003-10-25 19:12:29 +03:00
unknown
302b8b5bf3 A few more fixes.
And added new test for BUG#1644. (Disabled for now, not fixed yet.)


tests/client_test.c:
  A few more fixes:
  - Avoid buffer overruns in printf().
  - Corrected index for comment field in show table status output.
  
  And added new test for BUG#1644. (Disabled for now, not fixed yet.)
2003-10-25 17:19:35 +02:00
unknown
9bb8d2aa0d Merge serg:Abk/mysql-4.1
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-25 16:11:30 +02:00
unknown
3affc8103a A major overhaul to adopt to recent changes. It now passes all tests.
Note:
- All test results haven't been inspected in detail to see if they are correct.
- Some result set printing seems to have the wrong field width; most notably
  date/time fields and type fields (e.g. "int(4)").
- There are still some valgrind complaints, but they seem to be in assert() or
  in libmysql.


tests/client_test.c:
  A major overhaul to adopt to recent changes:
  
  - SHOW TABLE result has changed (more columns)
  - EXPLAIN result has VAR_STRING types now
  - Added missing mysql_bind_result() calls
  - Adopted to mysql_fetch_column() semantics: Don't use same pointers in MYSQL_BIND
    structs for fetch_column as for binding.
  - Removed a number of duplicated calls to tests
  - Added missing initialization of MYSQL_BIND structs fields (lenght fields),
    to shutup valgrind.
2003-10-25 15:53:41 +02:00
unknown
a837775acb Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/sql_parse.cc:
  Auto merged
2003-10-25 16:35:14 +03:00
unknown
d679b52e0f fixed unlinking SELECT methods 2003-10-25 16:29:35 +03:00
unknown
43e9677479 and -> && 2003-10-25 12:00:53 +02:00
unknown
f8b833c9f2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/sql_parse.cc:
  Auto merged
2003-10-25 10:18:37 +03:00
unknown
7f6d7aa1dd sql_parse.cc:
URGENT: MONTY AND SERGEI should check this patch! The patch fixes the memory corruption reported by a user. It happened because the code did not keep correct a count of how many connections a user has, and the user object got freed too soon if the same user had more than 1 connection. Also fix a typo by Sanja: 'and' is not a C operator, I think it should be &&


sql/sql_parse.cc:
  URGENT: MONTY AND SERGEI should check this patch! The patch fixes the memory corruption reported by a user. It happened because the code did not keep correct a count of how many connections a user has, and the user object got freed too soon if the same user had more than 1 connection. Also fix a typo by Sanja: 'and' is not a C operator, I think it should be &&
2003-10-25 01:38:42 +03:00
unknown
85d3e02e2e Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-10-25 00:03:44 +02:00
unknown
d8d642314c Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug


sql/sql_parse.cc:
  Auto merged
2003-10-24 23:53:53 +02:00
unknown
ea47b72d15 removed one more hack that - as usual - almost always worked
(but broke permission handling for *some* IP's after we started to compare in utf8)
Bug #1636
2003-10-24 23:27:21 +02:00
unknown
800f2f46d1 added quotas for database names
(fixed bug #1348)


client/mysqldump.c:
  added quotas for database names
2003-10-24 17:26:26 -04:00
unknown
4e5f086b59 fixes to Bitmap class 2003-10-24 22:44:48 +02:00
unknown
ddd5eebd1e added to mysql_secure_installation
changing root password on all hosts (bug 1228)


scripts/mysql_secure_installation.sh:
  added changing root password on all hosts
2003-10-24 15:20:46 -04:00
unknown
f38d78943c after merge fix 2003-10-24 21:14:26 +03:00
unknown
1ba35900d6 made 'TODO' 2003-10-24 20:09:57 +03:00
unknown
1f32eb5f18 Merge
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2003-10-24 19:42:39 +03:00
unknown
4ed1b23cd5 added comment 2003-10-24 19:30:47 +03:00
unknown
ce2c46ddd6 support 'parallel' updates and rallback of whole statement in case of error in evalueting value which should be assigned
(BUG#1484)


mysql-test/r/variables.result:
  test of swaping variables
mysql-test/t/variables.test:
  test of swaping variables
sql/item_func.cc:
  new method of user variables to pre-fetch value
sql/item_func.h:
  new method of user variables to pre-fetch value
sql/set_var.cc:
  check() methods fetch & store value
sql/set_var.h:
  check() methods fetch & store value
2003-10-24 17:28:32 +03:00
unknown
6b516a37ab style fixes 2003-10-24 13:23:06 +02:00
unknown
e05ea7b8ea Move the pid file testing after arguments are parsed (previous patch was not correct) 2003-10-24 14:22:54 +03:00
unknown
21f9a3a8ac ftbench fixes
myisam/ftbench/Ecompare.pl:
  bug in multi-column comparison fixed
myisam/ftbench/Ereport.pl:
  bug fixed
  report at 0, 0.5, 1
myisam/ftbench/README:
  updated
myisam/ftbench/ft-test-run.sh:
  various fixes
2003-10-23 23:33:06 +02:00
unknown
08236417fe Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2003-10-23 23:11:33 +02:00
unknown
e5386bcb6b added check of cardinality to IN/ALL/ANY subquery transformer
(BUG#1638)


mysql-test/r/subselect.result:
  test for BUG#1638
mysql-test/t/subselect.test:
  test for BUG#1638
sql/item_subselect.cc:
  always check cardinality first
2003-10-23 23:54:21 +03:00
unknown
5ee2807c49 Merge
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2003-10-23 23:06:43 +03:00
unknown
fdc78a7639 Merge
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2003-10-23 21:26:06 +03:00
unknown
e94666f8e7 Merge
sql/item.cc:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2003-10-23 21:09:40 +03:00
unknown
d3d001fd02 ufter review fix (BUG#1444)
sql/item.cc:
  used variable to avoid using prev_unit->item which should be more clean
sql/item_subselect.cc:
  uncachable tested on fix fields and correct bits set
2003-10-23 20:50:53 +03:00
unknown
d8ef1b5312 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0


sql/item_sum.h:
  Auto merged
2003-10-23 17:35:20 +02:00
unknown
e48a6c6c29 Undid previous fix (as it will be fixed by a merge). 2003-10-23 17:34:11 +02:00
unknown
ec3a39dc67 Post-merge fixes.
mysql-test/r/sp-error.result:
  Post-merge fixes. Error codes renumbered.
mysql-test/r/sp.result:
  Post-merge fixes. Error codes renumbered.
mysql-test/r/variables.result:
  Post-merge fixes. Error codes renumbered.
mysql-test/t/sp-error.test:
  Post-merge fixes. Error codes renumbered.
mysql-test/t/sp.test:
  Post-merge fixes. Error codes renumbered.
sql/item_subselect.cc:
  Post-merge fixes. thd->lex is a pointer.
sql/slave.cc:
  Post-merge fixes. Undid imported patch that's not 5.0 compatible.
sql/sql_parse.cc:
  Post-merge fixes. Changed access API calls, and fixed merge error.
sql/sql_table.cc:
  Post-merge fixes. No update log in 5.0.
2003-10-23 16:06:51 +02:00
unknown
0d97f0abe4 Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0
2003-10-23 15:29:29 +02:00
unknown
375f951476 Put username in the Subject line as well (with the changeset number). 2003-10-23 15:24:48 +02:00
unknown
aa98f58bae query expansion for fulltext search
myisam/ft_boolean_search.c:
  assert.h and queues.h moved to ftdefs.h
myisam/ft_parser.c:
  ft_parse() with alloc
myisam/ft_static.c:
  api changes, ft_max_word_len_for_sort variable removed
myisam/ft_update.c:
  ft_parse() with alloc
myisam/ftdefs.h:
  variable ft_max_word_len_for_sort -> define FT_MAX_WORD_LEN_FOR_SORT
  api changes, ft_max_word_len_for_sort variable removed
  ft_parse() with alloc
myisam/mi_check.c:
  variable ft_max_word_len_for_sort -> define FT_MAX_WORD_LEN_FOR_SORT
myisam/myisamchk.c:
  ft_max_word_len_for_sort removed
mysql-test/r/fulltext.result:
  query expansion tests
mysql-test/r/fulltext_var.result:
  ft_max_word_len_for_sort removed
mysql-test/t/fulltext.test:
  query expansion tests
sql/ha_myisam.h:
  ft api changes for query expansion
sql/mysqld.cc:
  ft_max_word_len_for_sort removed
  ft_query_expansion_limit added
sql/set_var.cc:
  ft_max_word_len_for_sort removed
  ft_query_expansion_limit added
sql/sql_yacc.yy:
  EXPANSION added to keyword: rule
2003-10-23 15:21:06 +02:00
unknown
4cc803c4dc small merge bug fixed
sql/item_sum.h:
  fixed merge bug
2003-10-23 16:11:51 +04:00
unknown
f1a9ebe932 Fix results after merge 2003-10-23 14:04:06 +03:00
unknown
f90558d645 Merge with 3.23 to get 4.0 tree in sync (no relevant changes to 4.0 tree)
BitKeeper/etc/logging_ok:
  auto-union
sql/mini_client.cc:
  Auto merged
client/mysqlbinlog.cc:
  use local file
mysql-test/t/myisam.test:
  Remove uncessesary drop table
sql/sql_parse.cc:
  Use local
sql/sql_repl.cc:
  use local
2003-10-23 13:25:16 +03:00
unknown
cd9b28f0dc Don't use atomic add for not critical statistics. 2003-10-23 13:07:13 +03:00
unknown
47f3a4fd4a Merge
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
2003-10-22 20:52:47 +03:00
unknown
a6aeb62749 Reverted a wrong patch from mysqlhotcopy. This is a real bug
in MySQL server...
2003-10-22 19:24:19 +03:00
unknown
fd85cc84e4 MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax
myisam/mi_write.c:
  cleanup
mysql-test/t/fulltext.test:
  after merge fix
2003-10-22 17:57:09 +02:00
unknown
3fdca01f24 Fixed a bug in mysqlhotcopy, which made special table names
to cause program to abort. Such table name could have been
one with a semicolon (:) in the middle.
2003-10-22 18:40:37 +03:00
unknown
cbc5304742 Fixed bug #954 mysqlhotcopy permission problem. The database
directory owner ship was not honored.
2003-10-22 18:19:59 +03:00
unknown
24f8b1cfa8 Merging 4.1->5.0
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-compile-netware-src~1:
  Delete: netware/BUILD/compile-netware-src
BitKeeper/deleted/.del-knetware.imp~1:
  Delete: netware/BUILD/knetware.imp
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-10-22 16:10:22 +02:00
unknown
15988a374d Applied a patch from Travis Wheeler to mysqlhotcopy that allows
using regexp with tablenames together with databasenames.
2003-10-22 16:02:27 +03:00
unknown
033a038296 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.pass
2003-10-22 15:38:20 +05:00
unknown
061cbf8734 ftbench fixes 2003-10-21 23:44:26 +02:00
unknown
eb0acc2996 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-10-21 20:26:28 +02:00