Commit graph

7846 commits

Author SHA1 Message Date
unknown
998dc6468b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-04-28 22:58:19 -07:00
unknown
4ceb257849 Documentation fixed according bug 185 fixing patch (1.1551 03/04/23 00:
Docs/internals.texi:
  Documentation fixed according bug 185 fixing patch (1.1551 03/04/23 00:01:19)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-04-28 20:40:41 +03:00
unknown
c9a7f29bc6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.cursor


BitKeeper/etc/ignore:
  auto-union
2003-04-28 14:29:22 +05:00
unknown
c13f555861 SCRUM
Protocol_cursor task
net_field_length definitions trimmed with Monty's suggestions


BitKeeper/etc/ignore:
  Added sql/pack.c to the ignore list
include/my_global.h:
  my_ulonglong definition moved here from mysql.h
include/mysql.h:
  we define my_ulonglong here only if no global.h included
include/mysql_com.h:
  net_field_length_ll definition is here now
sql/mini_client.cc:
  unnecessary cast removed
2003-04-28 14:25:29 +05:00
unknown
55e233ad2b Post-merge fix. 2003-04-26 15:58:39 +03:00
unknown
0c94064bbd merge fix
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2003-04-26 15:26:28 +03:00
unknown
18a321adce Making a better fix for double released pointers and safe
TMP_TABLE_PARAM.
This involved moving things around in include files.
All tests, including the ones with Valgrind passed.
2003-04-26 15:12:14 +03:00
unknown
68e1d7ad42 forgot to commit this one in cset 1.1561 (replication) 2003-04-25 12:31:51 +02:00
unknown
bab7aac779 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2003-04-24 17:42:07 +02:00
unknown
9b7a51d89d Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/igor/dev/mysql-4.1


mysql-test/r/ctype_collate.result:
  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_select.cc:
  Auto merged
2003-04-24 18:42:06 +03:00
unknown
50c17af082 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/COMPRESS_UNCOMPRESS/mysql-4.1
2003-04-24 11:42:05 -04:00
unknown
78f19df0bc added '.' to end of compressed string 2003-04-24 11:37:55 -04:00
unknown
9f4f19d9f7 Replication: new code to not modify in-memory log positions until the COMMIT
is executed, even if the transaction spans on >=2 relay logs (bug #53).
New variable relay_log_purge =0|1
New test to verify bug #53


sql/log.cc:
  Now we purge a relay log only when we are sure we won't need it,
  i.e. we have executed the final query (if autocommit=1) or the COMMIT.
sql/log_event.cc:
  Better tracking of the relay log's name and position
  lastly executed, even if we are in a transaction which spans on
  2 or more relay logs.
sql/mysql_priv.h:
  new option relay_log_purge (the user can now decide himself
  if he wants his relay logs to be automatically purged or not,
  we don't make unsafe guesses like before)
sql/mysqld.cc:
  new option --innodb (replaces --skip-innodb).
  Useful for the test suite : we have skip-innodb in mysql-test-run,
  but we can ('-opt.info' file) choose to start the server with
  InnoDB for this test only.
  New option --bdb
sql/repl_failsafe.cc:
  Better tracking of the relay log's name and position
  lastly executed, even if we are in a transaction which spans on
  2 or more relay logs.
sql/set_var.cc:
  new variable relay_log_purge
sql/slave.cc:
  Better tracking of the relay log's name and position
  lastly executed, even if we are in a transaction which spans on
  2 or more relay logs.
  Now we purge a relay log only when we are sure we won't need it,
  i.e. we have executed the final query (if autocommit=1) or the COMMIT
sql/slave.h:
  Better tracking of the relay log's name and position
  lastly executed, even if we are in a transaction which spans on
  2 or more relay logs.
sql/sql_class.h:
  prototypes change
sql/sql_parse.cc:
  removed thd argument (was not used in the function's body)
sql/sql_repl.cc:
  Better tracking of the relay log's name and position
  lastly executed, even if we are in a transaction which spans on
  2 or more relay logs.
  Turn relay_log_purge silently off when someone does CHANGE
  MASTER TO RELAY_LOG_*
2003-04-24 15:29:25 +02:00
unknown
4b19dfd431 func_gconcat.result, ctype_many.result:
Added the MAX_LENGTH_FOR_SORT_DATA option
ctype_collate.result:
  Added the MAX_LENGTH_FOR_SORT_DATA option


mysql-test/r/ctype_collate.result:
  Added the MAX_LENGTH_FOR_SORT_DATA option
mysql-test/r/ctype_many.result:
   Added the MAX_LENGTH_FOR_SORT_DATA option
mysql-test/r/func_gconcat.result:
   Added the MAX_LENGTH_FOR_SORT_DATA option
2003-04-24 14:49:01 +03:00
unknown
a7f8b1cb4d Many files:
Added the MAX_LENGTH_FOR_SORT_DATA option
filesort.cc:
  Added the MAX_LENGTH_FOR_SORT_DATA option


sql/filesort.cc:
  Added the MAX_LENGTH_FOR_SORT_DATA option
sql/mysqld.cc:
   Added the MAX_LENGTH_FOR_SORT_DATA option
sql/opt_range.cc:
   Added the MAX_LENGTH_FOR_SORT_DATA option
sql/records.cc:
   Added the MAX_LENGTH_FOR_SORT_DATA option
sql/set_var.cc:
   Added the MAX_LENGTH_FOR_SORT_DATA option
sql/sql_base.cc:
   Added the MAX_LENGTH_FOR_SORT_DATA option
sql/sql_class.h:
   Added the MAX_LENGTH_FOR_SORT_DATA option
sql/sql_delete.cc:
   Added the MAX_LENGTH_FOR_SORT_DATA option
sql/sql_select.cc:
   Added the MAX_LENGTH_FOR_SORT_DATA option
sql/sql_sort.h:
   Added the MAX_LENGTH_FOR_SORT_DATA option
sql/sql_table.cc:
   Added the MAX_LENGTH_FOR_SORT_DATA option
sql/sql_update.cc:
   Added the MAX_LENGTH_FOR_SORT_DATA option
sql/structs.h:
   Added the MAX_LENGTH_FOR_SORT_DATA option
sql/table.h:
   Added the MAX_LENGTH_FOR_SORT_DATA option
sql/uniques.cc:
   Added the MAX_LENGTH_FOR_SORT_DATA option
2003-04-24 14:33:33 +03:00
unknown
f0909cd71a SCRUM
Protocol_cursor class and sql-common/ directory


Makefile.am:
  pack.c added to linked sources
include/mysql.h:
  net_field_length_ll declaration added
include/mysql_com.h:
  net_field_length declaration added
libmysql/Makefile.am:
  sql-common files symlinked
libmysql/Makefile.shared:
  pack.lo target added
libmysql/libmysql.c:
  net_field_length removed from here
sql/Makefile.am:
  pack.c added to the sources
sql/mini_client.cc:
  mc_net_field_length functions replaced with net_field_length
sql/protocol.h:
  Protocol_cursor class added
2003-04-23 19:37:33 +05:00
unknown
4ac98ec521 set_var.cc:
We don't need this code any more. It was used to initialize CONVERT structure in 4.0.


sql/set_var.cc:
  We don't need this code any more. It was used to initialize CONVERT structure in 4.0.
2003-04-23 18:38:54 +05:00
unknown
bb12690ad7 Variable names have been renamed:
client_collation -> collation_client
  result_collation -> collation_results
  connection_collation -> collation_connection


BitKeeper/etc/ignore:
  Added client/ssl_test to the ignore list
2003-04-23 18:19:22 +05:00
unknown
fbf47d5234 Fix bug#68: ssl_test.c does not compile/work 2003-04-23 17:10:24 +05:00
unknown
711eb800ad Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-04-23 11:20:19 +03:00
unknown
b648068856 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


sql/item_cmpfunc.cc:
  Auto merged
2003-04-23 10:37:13 +03:00
unknown
7900c2f1ad Added --delimiter option to mysql
client/mysql.cc:
  Added --delimiter option to mysql. Statement terminator
  can be a character (';' by default) or a string.
  
  Code clean up
2003-04-23 03:29:03 +03:00
unknown
78b2c66bff Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/COMPRESS_UNCOMPRESS/mysql-4.1
2003-04-22 18:46:06 -04:00
unknown
5ab46afca6 small compress/uncompress modification after monty's review 2003-04-22 18:41:47 -04:00
unknown
06017a0db0 fixed bug 185 (constant IN (SELECT field ...) do not return NULL correctly)
mysql-test/r/subselect.result:
  new test results
  test of bug 185
mysql-test/t/subselect.test:
  test of bug 185
sql/item.h:
  new method
sql/item_cmpfunc.cc:
  new Item to control NULL value in HAVING clouse
sql/item_cmpfunc.h:
  new Item to control NULL value in HAVING clouse
sql/item_subselect.cc:
  if IN was rewrited through WHERE thien it will be rewrited in following way:
  
  WHERE left_expr=item or is null(item) heving is_not_null_test(item)
sql/item_subselect.h:
  Item_is_not_null_test can change was_null flag
sql/sql_select.cc:
  some layout fix
2003-04-23 00:01:19 +03:00
unknown
c5475dd93c sql_base.cc:
Table name cache is case-sensitive now like in 4.0.


sql/sql_base.cc:
  Table name cache is case-sensitive now like in 4.0.
2003-04-22 19:01:24 +05:00
unknown
f4c3ed2839 update the test for LOAD DATA INFILE warnings
mysql-test/t/warnings.test:
  update the test for LOAD DATA INFILE warnings
2003-04-22 00:54:33 -07:00
unknown
129f10e079 Fix to return appropriate warnings using SHOW WARNINGS for LOAD DATA INFILE (scrum)
sql/field.cc:
  Fix to return correct error status to check for warnings from LOAD DATA command
sql/sql_load.cc:
  Store appropriate warning message for each cuted_fields increment
sql/share/english/errmsg.txt:
  New warning messages specific to LOAD DATA
include/mysqld_error.h:
  New error codes for LOAD DATA warnings
2003-04-22 00:53:07 -07:00
unknown
7c87a3f140 I renamed system variable literal_collation into connection_collation 2003-04-22 12:27:35 +05:00
unknown
13646bb8c1 item_cmpfunc.cc:
Turbo() is not used anymore for multibyte charsets.


sql/item_cmpfunc.cc:
  Turbo() is not used anymore for multibyte charsets.
2003-04-22 12:01:28 +05:00
unknown
8078280c76 Fix for a bug record #307.
Very nasty bug.
It was caused by double free()-ing memory of join->select and 
join->quick. 

I was able to pinpoint it only after using Valgrind.

Plus better fix for bug with TMP_TABLE_PARAM.

Plus new constructor for SELECT_LEX.


mysql-test/r/innodb.result:
  Fix for a bug record #307.
  
  Very nasty bug.
  It was caused by double free()-ing memory of join->select and 
  join->quick. 
  
  I was able to pinpoint it only after using Valgrind.
mysql-test/t/innodb.test:
  Fix for a bug record #307.
  
  Very nasty bug.
  It was caused by double free()-ing memory of join->select and 
  join->quick. 
  
  I was able to pinpoint it only after using Valgrind.
sql/sql_lex.cc:
  Adding a usefull constructor
sql/sql_lex.h:
  Adding a usefull constructor which additionally required few more
  definitions.
sql/sql_select.cc:
  Fix for a bug record #307.
  
  Very nasty bug.
  It was caused by double free()-ing memory of join->select and 
  join->quick. 
  
  I was able to pinpoint it only after using Valgrind.
sql/sql_union.cc:
  Fixing bug #307.
  
  Also, a better fix for TMP_TABLE_PARAM bug.
  
  Also, use of the new constructor for SELECT_LEX.
2003-04-21 21:03:32 +03:00
unknown
1db8654191 my_vsnprintf.c:
The last character was not printed into out string


strings/my_vsnprintf.c:
  The last character was not printed into out string
2003-04-21 12:44:29 +05:00
unknown
a320421abc fixed bug in processing transaction in query cache (inserted lost lines) 2003-04-20 22:18:32 +03:00
unknown
43f1511a31 new result of Query Cache with Innodb 2003-04-17 16:24:56 +03:00
unknown
d8e0604b27 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2003-04-17 15:48:54 +03:00
unknown
fa741bbc03 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2003-04-17 13:47:37 +03:00
unknown
430a3291ef Added the missed OK packet status to internals.texi
Docs/internals.texi:
  Added the missed OK packet status
2003-04-16 16:53:12 -07:00
unknown
390597cf9a Fix to have a reserved OK byte (prepare result)
sql/sql_prepare.cc:
  FFix to send a reserved OK byte on a prepared call
2003-04-16 16:47:01 -07:00
unknown
a358ec28b8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/sql_yacc.yy:
  Auto merged
2003-04-16 12:11:32 -07:00
unknown
259cc315a5 Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading
Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files



VC++Files/libmysql/libmysql.dsp:
  Fix the broken file
2003-04-16 11:49:52 -07:00
unknown
48935d0536 merging
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
2003-04-16 20:35:29 +03:00
unknown
781133546c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-04-16 18:24:53 +03:00
unknown
df5ff1daea Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean
2003-04-16 14:52:16 +05:00
unknown
01f8589063 Bugfix for segfault in mysql with embedded library
mysys/default.c:
  Fix for bug in mysql with embedded library
  we can get NULL in *argv
2003-04-16 14:49:46 +05:00
unknown
472020dc08 Added the support of statement result navigation APIs
libmysql/libmysql.c:
  Added statement result set navigation APIs (buffered results only)
include/mysql.h:
  Prototypes for new stmt result navigation APIs
2003-04-16 00:07:10 -07:00
unknown
70a2f3c268 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1


sql/lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-04-16 09:26:24 +03:00
unknown
e5c62e3280 Add mysys specific error messages
Make RELAY_THREAD and alias for IO_THREAD
Added new interface for string -> (unsigned) long long.


include/my_sys.h:
  Add mysys specific error messages
sql/lex.h:
  Make RELAY_THREAD an alias for IO_THREAD
sql/sql_yacc.yy:
  Make RELAY_THREAD an alias for IO_THREAD
2003-04-16 09:25:43 +03:00
unknown
7690ab2fb9 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean
2003-04-16 11:09:06 +05:00
unknown
ed7a263728 Fix for bug #212
sql/sql_list.h:
  Here we should reset item::last sometimes
2003-04-16 11:08:21 +05:00
unknown
b03a00ebf6 replace default separator in group_concat, correct a bug
mysql-test/r/func_gconcat.result:
  replace default separator
sql/item_sum.h:
  add fix_length_and_dec() and copy_or_same()
sql/sql_yacc.yy:
  replace default separator
2003-04-16 00:22:43 +06:00