Commit graph

8627 commits

Author SHA1 Message Date
unknown
0e7bd4425b Add missing defines 2003-06-16 01:13:24 +03:00
unknown
7a938aea26 bad merge fixed
mysql-test/r/fulltext.result:
  test for CREATE FULLTEXT INDEX
mysql-test/t/fulltext.test:
  test for CREATE FULLTEXT INDEX
2003-06-16 00:13:23 +02:00
unknown
19a4898c72 merge
sql-common/client.c:
  Auto merged
scripts/mysql_install_db.sh:
  Use local version
2003-06-16 01:13:23 +03:00
unknown
7ababc3bb4 Fix for compilation error.
Compiler can signal error when init_sigpipe_variables expands as empty place.
Had to remove all semicolons after init_sigpipe_variables


libmysql/client_settings.h:
  semicolon added
sql-common/client.c:
  we don't need semicolons after init_sigpipe_variables
2003-06-16 03:13:22 +05:00
unknown
fc2ee2cc13 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
2003-06-15 18:13:21 -04:00
unknown
ed1d28fdb6 Fixes for make_win_src_distributions
Removed compiler warnings


scripts/make_win_src_distribution.sh:
  Added option --dirname
  Also copy sql-common directory
  Create mysql data files even if mysqld is not installed
scripts/mysql_create_system_tables.sh:
  Update for usage with make_win_src_distribution
scripts/mysql_install_db.sh:
  Update for usage with make_win_src_distribution
sql-common/client.c:
  Portability fix
sql/item_cmpfunc.cc:
  Removed compiler warning
sql/sql_acl.cc:
  Indentation cleanup
  Removed compiler warning
sql/sql_parse.cc:
  Removed compiler warning
sql/sql_select.cc:
  Removed compiler warning
sql/sql_yacc.yy:
  Removed compiler warning
strings/ctype-utf8.c:
  Removed compiler warning
2003-06-15 23:24:37 +03:00
unknown
fb2825e2b5 LAST_INSERT_ID()}will now return 0 if the last INSERT didn't insert any rows.
mysql-test/r/auto_increment.result:
  Update results after bug fix
2003-06-15 12:34:04 +03:00
unknown
fdd296c8b8 fixed bug with './' prefix in mysql_install_db
scripts/mysql_install_db.sh:
  fixed bug with './' prefix
2003-06-14 17:33:25 -04:00
unknown
96d305f86f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


client/mysql.cc:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
2003-06-14 11:38:09 +03:00
unknown
ccf59c3874 Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
Changed mysql_port and mysql_unix_port to mysqld_xxxx


client/mysql.cc:
  Removed valgrind & compiler warnings
client/sql_string.h:
  Fix to remove valgrind warnings
include/mysql.h:
  Added read_timeout and write_timeout to mysql options struct.
  This is to be used for slave when connection to master.
  code cleanup
include/mysql_com.h:
  Fixed wrong value for SQLSTATE_LENGTH
  Added CLIENT_REMEMBER_OPTIONS
include/sql_common.h:
  Cleanup after split of libmysql.c to client.c and libmysql.c
include/sql_state.h:
  Removed default states
libmysql/client_settings.h:
  Cleanup after split of libmysql.c to client.c and libmysql.c
libmysql/libmysql.c:
  Cleanup after split of libmysql.c to client.c and libmysql.c
mysql-test/r/type_blob.result:
  Update results after someone updated error messages without running tests
mysys/charset.c:
  More debug information
mysys/errors.c:
  Fixed wrong error message
sql-common/client.c:
  Cleanup after split of libmysql.c to client.c and libmysql.c
sql/Makefile.am:
  Added sql_client.cc
sql/client_settings.h:
  Cleanup after split of libmysql.c to client.c and libmysql.c
sql/log.cc:
  Changed mysql_port and mysql_unix_port to mysqld_xxxx
sql/mysql_priv.h:
  Changed mysql_port and mysql_unix_port to mysqld_xxxx
sql/mysqld.cc:
  Changed mysql_port and mysql_unix_port to mysqld_xxxx
sql/protocol.cc:
  Fix for SQLSTATE_LENGTH
  Moved function to sql_client.c
sql/repl_failsafe.cc:
  Cleanup after split of libmysql.c to client.c and libmysql.c
sql/set_var.cc:
  Changed mysql_port and mysql_unix_port to mysqld_xxxx
sql/slave.cc:
  Cleanup after split of libmysql.c to client.c and libmysql.c
2003-06-14 11:37:42 +03:00
unknown
2c70308c68 bug #251 - destroyed object reused - fixed 2003-06-13 23:00:04 +02:00
unknown
a5633cc967 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-13 22:37:14 +02:00
unknown
b9374fabff mysql.server should read [server] group from my.cnf - according to the manual 2003-06-13 19:25:26 +02:00
unknown
4a83fca1d7 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-13 09:12:20 -07:00
unknown
41485cf92b Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-13 09:11:15 -07:00
unknown
bb39536d78 cleaned user used in tests 'connect' and 'rpl_temporary'
mysql-test/r/connect.result:
  result update
mysql-test/t/connect.test:
  clean after we are done
mysql-test/t/rpl_temporary.test:
  use '' instead of 'boo'
2003-06-13 11:17:31 +02:00
unknown
01b44b972b Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-13 02:06:38 -07:00
unknown
5810811e6a consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
unknown
eae62211d4 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-13 01:58:29 -07:00
unknown
a32fbfbdb1 user change to avoid conflicts with user 'test'
mysql-test/t/rpl_temporary.test:
  user change to avoid conflicts with user 'test'
  (to which test connect.test gives password "gambling", so depending
  on the order of the tests, 'test' has password '' or 'gambling':
  better to use an unknown user which will be directed to ''@localhost
  with password always '').
2003-06-12 23:16:21 +02:00
unknown
33a8884b55 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-12 08:40:48 -07:00
unknown
723304853c Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-12 08:38:25 -07:00
unknown
361c0b1589 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-06-12 16:21:42 +02:00
unknown
a921cb3174 See each file's changeset for details.
- Comments for future devs.
- Start_log_event::exec_event() : when we hit it, do a rollback.
- We don't need LOG_EVENT_FORCED_ROTATE_F.
- Stop_log_event::exec_event() : when we hit it, we needn't clean anything.
- Removed LOG_EVENT_TIME_F and LOG_EVENT_FORCED_ROTATE_F.
- We don't need Stop events in the relay log.
- Now filtering of server id is done in the I/O thread first.


sql/log.cc:
  We don't need LOG_EVENT_FORCED_ROTATE_F
sql/log_event.cc:
  - Comments for future devs.
  - Start_log_event::exec_event() : when we hit it, do a rollback. If the SQL
  thread was inside a transaction (for example, the master died while writing
  to the binlog, so did not commit (because we write to the binlog before committing),
  so will rollback), it's sensible to rollback. If we're not in a transaction,
  rollback will not hurt (it will do nothing).
  - We don't need LOG_EVENT_FORCED_ROTATE_F.
  - Stop_log_event::exec_event() : when we hit it, we needn't clean anything, because
  each threads has already written some cleaning statements (DROP TEMPORARY TABLE,
  DO RELEASE_LOCK); we still clean in Start_log_event::exec_event() (if 4.x).
sql/log_event.h:
  - Comments for future devs.
  - Removed LOG_EVENT_TIME_F and LOG_EVENT_FORCED_ROTATE_F.
sql/slave.cc:
  - We don't need Stop events in the relay log (see changeset's description about
  log_event.cc). So we can make event queuing (writing to the relay log) simpler.
  - Something that was marked TODO: now filtering of server id (if the server id
  of this event is the same as mine ignore it) is done in the I/O thread if
  the master is 4.x (it still also done in the SQL thread whatever the version of
  the master is, for safe upgrades). This saves disk space.
sql/slave.h:
  We don't need master_info.ignore_stop_event anymore, as we don't write Stop_event
  to the relay log anymore.
2003-06-12 16:20:31 +02:00
unknown
4678681895 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


include/my_base.h:
  Auto merged
include/my_sys.h:
  Auto merged
myisam/myisamdef.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-06-12 06:22:35 -07:00
unknown
2aab83ccdf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
2003-06-12 06:20:11 -07:00
unknown
f3ecad8cc9 preload.result, preload.test:
new file
2003-06-12 05:26:50 -07:00
unknown
f7aed02405 Many files:
New feature: preload indexes into key cache.
mi_preload.c:
  new file
Many files:
  Added preload statement.


sql/ha_myisam.h:
  Added preload statement.
sql/handler.cc:
  Added preload statement.
sql/lex.h:
  Added preload statement.
sql/mysql_priv.h:
  Added preload statement.
sql/sql_lex.h:
  Added preload statement.
sql/sql_base.cc:
  Added preload statement.
sql/sql_table.cc:
  New feature: preload indexes into key cache.
sql/sql_parse.cc:
  New feature: preload indexes into key cache.
sql/mysqld.cc:
  New feature: preload indexes into key cache.
sql/set_var.cc:
  New feature: preload indexes into key cache.
sql/sql_yacc.yy:
  New feature: preload indexes into key cache.
sql/ha_myisam.cc:
  New feature: preload indexes into key cache.
sql/table.h:
  New feature: preload indexes into key cache.
mysys/mf_keycache.c:
  New feature: preload indexes into key cache.
myisam/myisamdef.h:
  New feature: preload indexes into key cache.
myisam/mi_extra.c:
  New feature: preload indexes into key cache.
myisam/Makefile.am:
  New feature: preload indexes into key cache.
include/my_base.h:
  New feature: preload indexes into key cache.
include/my_sys.h:
  New feature: preload indexes into key cache.
include/myisam.h:
  New feature: preload indexes into key cache.
2003-06-12 04:29:02 -07:00
unknown
edd9bd53f1 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-12 12:42:01 +02:00
unknown
3ec4772361 FT2 bug in mi_delete fixed 2003-06-12 12:41:29 +02:00
unknown
129cb8e9c0 ft_update.c:
Fix parse error per serg instructions.


myisam/ft_update.c:
  Fix parse error per serg instructions.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-06-11 16:27:26 -05:00
unknown
5693a27220 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-06-11 17:13:40 +02:00
unknown
41021a0fc8 test result updated
mysql-test/t/rpl_relayrotate.test:
  when mysqld has no innodb compiled in it's not a bug!
2003-06-11 17:07:34 +02:00
unknown
b7e0c11a27 We now require SUPER privilege for SET PSEUDO_THREAD_ID.
mysql-test/r/rpl_temporary.result:
  result update
mysql-test/t/rpl_temporary.test:
  test that PSEUDO_THREAD_ID now requires SUPER.
sql/set_var.cc:
  Class for pseudo_thread_id (it used to be sys_var_thd_ulong, but we 
  decided to require the SUPER privilege so we needed a check() function,
  which sys_var_thd_ulong does not feature (check() is virtual in sys_var
  and in sys_var_thd_ulong too).
sql/set_var.h:
  Class for pseudo_thread_id
2003-06-11 17:07:33 +02:00
unknown
3a4be00416 protect deleted objects from reusal with safemalloc technique 2003-06-11 13:32:50 +02:00
unknown
0826127b2b Merge cpedersen@bk-internal.mysql.com:/home/bk/mysql-4.1
into tsort.bitbybit.dk:/home/carsten/mysql/bk/mysql-4.1
2003-06-10 15:56:58 +02:00
unknown
c07680f15b Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-10 15:39:32 +02:00
unknown
6e4f383a1c test results updated 2003-06-10 15:19:59 +02:00
unknown
43e36bffb2 LOAD_FILE() is now COERCIBLE
LOAD_FILE() tests
2003-06-10 17:53:06 +05:00
unknown
dc5d1c87b0 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-10 14:01:29 +02:00
unknown
7b93f38505 Function INSERT() now works according to coercibility rules
Test for INSERT() has been added
2003-06-10 16:41:42 +05:00
unknown
54c04738a4 Coercibility tests for
- equal predicate
  - LIKE predicate
  - strcmp() function
2003-06-10 15:25:27 +05:00
unknown
8a40e2e8f8 Some more functions work according to coercibility now:
repeat, reverse, quote, soundex, substring
Test func_str has been extended to check them
2003-06-10 14:54:03 +05:00
unknown
189a91df4d Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-06-10 11:19:44 +02:00
unknown
4b420bb29b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1.latest
2003-06-10 12:20:17 +05:00
unknown
85be6a0ac8 Bugfix for HEAP table rb-index scan. 2003-06-10 12:19:28 +05:00
unknown
47e0ca90d3 mysqldump.c:
SET NAMES is not sent to server when SET NAMES is not dumped
  Server decides which character set to use in this case


client/mysqldump.c:
  SET NAMES is not sent to server when SET NAMES is not dumped
  Server decides which character set to use in this case
2003-06-10 12:07:02 +05:00
unknown
8484e6f759 mysqldump.c:
SET NAMES is not produced in compatibility modes


client/mysqldump.c:
  SET NAMES is not produced in compatibility modes
2003-06-10 11:34:00 +05:00
unknown
ba35872ae8 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


myisam/mi_delete.c:
  Auto merged
2003-06-09 22:28:15 +02:00
unknown
00320d3790 more DBUG_xxx tags 2003-06-09 22:26:22 +02:00