Commit graph

9153 commits

Author SHA1 Message Date
unknown
3be8c60c25 temporary modification of rpl_loaddata.test until 4.0 is merged in 4.1.
This is to avoid a test failure, which is fixed in 4.0 in
ChangeSet@1.1455.34.1, 2003-06-10 23:29:49+02:00, guilhem@mysql.com
by making RESET SLAVE reset the error.


mysql-test/r/rpl_loaddata.result:
  temporary modification until 4.0 is merged in 4.1
mysql-test/t/rpl_loaddata.test:
  temporary modification until 4.0 is merged in 4.1
2003-07-23 16:48:45 +02:00
unknown
9dce7500d7 --with-openssl-includes/libraries 2003-07-23 16:13:07 +02:00
unknown
bacddcc5f5 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-07-23 15:48:52 +02:00
unknown
dae34fb60f On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-table
and other replicate-*-table options in SHOW SLAVE STATUS.
Seems like it had not been done, so I push it now:
there's 4 new columns to SHOW SLAVE STATUS.


mysql-test/r/rpl000015.result:
  Result update (more columns)
mysql-test/r/rpl_empty_master_crash.result:
  Result update (more columns)
mysql-test/r/rpl_flush_log_loop.result:
  Result update (more columns)
mysql-test/r/rpl_log.result:
  Result update (more columns)
mysql-test/r/rpl_log_pos.result:
  Result update (more columns)
mysql-test/r/rpl_redirect.result:
  Result update (more columns)
mysql-test/r/rpl_replicate_do.result:
  Result update (more columns)
mysql-test/r/rpl_rotate_logs.result:
  Result update (more columns)
mysql-test/t/rpl_replicate_do.test:
  Result update (more columns)
sql/slave.cc:
  Print replicate_*_table options in SHOW SLAVE STATUS
sql/slave.h:
  two functions to make a string of replicate_*_table lists.
2003-07-23 15:46:46 +02:00
unknown
a80c5a9c9b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-23 15:23:53 +05:00
unknown
41e77ddf65 SCRUM - adding client into embedded server
error handling fixed
fetch_lengths made to work differently in embedded and client cases


include/mysql.h:
  removed 'embedded' error containers - they're unnecessary now
  added declarations for fetch_lengths to be 'virtual'
include/sql_common.h:
  fetch_lengths declaration removed
libmysql/libmysql.c:
  implementations for fetch_lengths to be 'virtual' added
libmysqld/lib_sql.cc:
  error informations now is moved from thd->net to mysql-net
libmysqld/libmysqld.c:
  error data is in mysql->net now
sql-common/client.c:
  we have to return old fetch_lengths implementation for 'client' case
sql/protocol.cc:
  handling of sqlstate for embedded library added
2003-07-23 15:23:20 +05:00
unknown
9b675b8be0 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1


sql/field_conv.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2003-07-22 19:02:36 -04:00
unknown
38aa6d1c15 fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump) 2003-07-22 18:58:30 -04:00
unknown
1cf4eea19d now GRANT db.* ... compares patterns correctly to prevent privilege escalation 2003-07-22 22:21:23 +02:00
unknown
b413e5c420 wild_compare fun: bug in GRANT db_pattern.* ... 2003-07-22 22:00:51 +02:00
unknown
011e4cc5d6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.fix
2003-07-22 19:57:28 +05:00
unknown
89f4169880 Bug #554: Support for --with-openssl[=DIR] 2003-07-22 19:56:52 +05:00
unknown
d35bf560be fix olap test filing 2003-07-22 13:05:03 +03:00
unknown
d911df6fe5 Bug #554: Support for --with-openssl[=DIR]
Here is fix for bug 554.
Added configure options 
--with-openssl-includes[=DIR] and --with-openssl-libs[=DIR]


acinclude.m4:
  Bug #554: Support for --with-openssl[=DIR]
2003-07-22 15:04:37 +05:00
unknown
54396ee830 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1


sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_select.h:
  Auto merged
2003-07-22 11:20:02 +03:00
unknown
ca6c74b7ee merge
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-07-22 11:18:51 +03:00
unknown
06cffa036c - tagged ChangeSet 1.1527.1.3 as "mysql-4.0.14"
- bumped up version number in configure.in to 4.0.15
2003-07-22 09:45:53 +02:00
unknown
ceb2374b69 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-22 12:23:38 +05:00
unknown
ca3c960381 btr0cur.c:
Fix bug: if there was a 'record too long' error in an insert, InnoDB forgot to free reserved file space extents; they were only freed in mysqld restart


innobase/btr/btr0cur.c:
  Fix bug: if there was a 'record too long' error in an insert, InnoDB forgot to free reserved file space extents; they were only freed in mysqld restart
2003-07-22 10:14:43 +03:00
unknown
850dfdd9a3 btr0cur.c:
Fix an error in the previous push


innobase/btr/btr0cur.c:
  Fix an error in the previous push
2003-07-22 03:23:02 +03:00
unknown
ce10ce81cb btr0cur.c:
Fix bug reported by Dyego Souza do Carmo: if a row becomes too long, > 8000 bytes, in an update, then InnoDB simply removes the clustered index record and does not report of table handler error 139


innobase/btr/btr0cur.c:
  Fix bug reported by Dyego Souza do Carmo: if a row becomes too long, > 8000 bytes, in an update, then InnoDB simply removes the clustered index record and does not report of table handler error 139
2003-07-22 02:44:55 +03:00
unknown
a493762bb0 myisamchk --sort-records crash on compressed tables fixed. 2003-07-21 22:21:07 +02:00
unknown
491cdf396f gen_lex_hash sigsegv fixed 2003-07-21 21:13:52 +02:00
unknown
d951272de1 INSTALL-WIN-SOURCE:
tweak


INSTALL-WIN-SOURCE:
  tweak
2003-07-21 12:23:41 -05:00
unknown
d1db620853 undo one row warning instead use sql_warnings=1
sql/sql_insert.cc:
  Undo warnings for single row inserts
mysql-test/t/warnings.test:
  undo one row warning instead use sql_warnings=1
mysql-test/r/warnings.result:
  Fix result file
2003-07-21 19:37:18 +03:00
unknown
30ee158d2f Bug #473 - GRANT ... TO ''@... was requiring FLUSH PRIVILEGES to work 2003-07-21 13:46:57 +02:00
unknown
ca3cd6dad1 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-21 16:19:32 +05:00
unknown
53f4626105 Another fix for "client code in embedded library"
include/mysql.h:
  mysql_close isn't virtual nown
2003-07-21 16:19:00 +05:00
unknown
f22517e4ec Enable warnings by default for single value list inserts also when the client protocol is >= 4.1
tests/client_test.c:
  test for timestamp bug (BR #819)
sql/sql_insert.cc:
  Enable warnings by default for single value list
  protocol
mysql-test/t/warnings.test:
  Updated test for single value list insert warning
mysql-test/r/warnings.result:
  Updated warnings results
2003-07-21 00:13:22 -07:00
unknown
012910656f Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/r/innodb.result:
  Auto merged
2003-07-21 00:33:13 +02:00
unknown
a4dbcfd681 absurd (and syntaxically incorrect) column definition corrected 2003-07-21 00:32:35 +02:00
unknown
bc14ad82df Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2003-07-20 07:01:18 -05:00
unknown
de13ae26e1 Fix test results affected by error message edit.
mysql-test/r/bdb.result:
  Fix test result affected by error message edit.
mysql-test/r/innodb.result:
  Fix test result affected by error message edit.
mysql-test/r/isam.result:
  Fix test result affected by error message edit.
mysql-test/r/repair_part1.result:
  Fix test result affected by error message edit.
2003-07-20 07:00:00 -05:00
unknown
c1ed639cb6 bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0' => syntax error
mysql-test/r/bigint.result:
  test results updated
mysql-test/r/type_decimal.result:
  test results updated
mysql-test/t/bigint.test:
  new tests added
mysql-test/t/type_decimal.test:
  error numbers updated
sql/item.h:
  round(9999999999999999999) fixed
sql/sql_yacc.yy:
  bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0'   => syntax error
  unary '+' added
2003-07-20 12:26:18 +02:00
unknown
bc3dc272f7 errmsg.txt:
fix typo


sql/share/english/errmsg.txt:
  fix typo
2003-07-19 23:19:19 -05:00
unknown
5dadac8701 Merge
mysql-test/r/innodb.result:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/table.h:
  Auto merged
2003-07-19 18:49:04 +03:00
unknown
5aef292a07 Fix for #712 with Serg's suggestions
myisam/mi_locking.c:
  Here we use F_EXTRA_LCK
myisam/myisamchk.c:
  lines of "locking - emulation" replaced with mi_lock_database call
myisam/myisamdef.h:
  no need for MI_TEMPORARY_TABLE
sql/ha_myisam.cc:
  We use F_WRLCK instead MI_TEMPORARY_TABLE
2003-07-19 18:17:29 +05:00
unknown
0fd6f4049d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2003-07-19 13:51:15 +05:00
unknown
ce890a1dcd typo fixed 2003-07-19 10:34:41 +02:00
unknown
56b220b11e Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_func.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-07-18 18:06:45 +02:00
unknown
127ff28c89 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-18 16:27:11 +05:00
unknown
d17b3e967d SCRUM
Including client code into embedded library
fixes


libmysql/libmysql.c:
  We should call this way
libmysqld/lib_sql.cc:
  Necessary initializations added
libmysqld/libmysqld.c:
  mysql_close can't be "virtual"
  mysqltest.c calls mysql_close before mysql_connect
sql-common/client.c:
  We have to redo fetch_lengths to count lengths looking at '\0' in string.
  It works slower, but is correct for both client and embedded libraries
2003-07-18 16:26:35 +05:00
unknown
00e8a41151 All functions now use the same function to aggregate comparison
and result types
2003-07-18 15:50:40 +05:00
unknown
906dc7df75 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.(none):/home/my/mysql-4.0
2003-07-18 12:38:18 +03:00
unknown
16bb14180b Portability fixes for Redhat 9
acinclude.m4:
  Fixed problem with openssl on RedHat 9
vio/viosocket.c:
  Removed compiler warning
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-07-18 12:35:29 +03:00
unknown
62ec825c63 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-18 14:04:45 +05:00
unknown
687863c093 IN now aggregates all argument types for comparison 2003-07-18 14:03:54 +05:00
unknown
42346bf9d1 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-18 10:39:43 +02:00
unknown
c768fd18ee Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
2003-07-18 13:29:26 +05:00
unknown
ee1440848f Scrum task 425: Added --verbose option for --help 2003-07-18 13:28:38 +05:00