mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-28 01:34:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12983 commits 2785 branches 343 tags 1.7 GiB
Commit graph

12983 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
7d3d862f56 see notes for mysql-copyright scripts 
Build-tools/mysql-copyright-2:
  small fix
Build-tools/mysql-copyright:
  deals with windows src file now
 2004-06-08 13:36:32 -07:00
unknown
ca96a3b410 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0 
into krsna.patg.net:/home/patg/mysql-4.0


Build-tools/Do-compile:
  Auto merged
 2004-06-08 13:22:31 -07:00
unknown
1dbb501b38 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-06-08 14:31:33 -05:00
unknown
ee401045be Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-06-08 19:55:35 +02:00
unknown
7bd8167fb7 Correction to replication of charsets in 4.1: 
In mysqlbinlog, there was a problem with how we escaped the content of a string user variable.
To be perfect, we should have escaped with character_set_client. But this charset is unknown
to mysqlbinlog. So the simplest is to print the string in hex. This is unreadable but
100% safe with any charset (checked with Bar), no more need to bother with character_set_client.


mysql-test/r/rpl_charset.result:
  hex strings
mysql-test/r/rpl_user_variables.result:
  hex strings
mysql-test/r/user_var.result:
  hex strings
sql/log_event.cc:
  In mysqlbinlog, there was a problem with how we escaped the content of a string user variable.
  To be perfect, we should have escaped with character_set_client. But this charset is unknown
  to mysqlbinlog. So the simplest is to print the string in hex. This is unreadable but
  100% safe with any charset (checked with Bar), no more need to bother with character_set_client.
 2004-06-08 19:55:04 +02:00
unknown
3feecf8237 Use LOGNAME instead of USER 2004-06-08 17:01:47 +02:00
unknown
789135dd75 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-06-08 17:09:59 +03:00
unknown
66c4087289 a fix 
(Bug #4035 GROUP_CONCAT with HAVING clause truncates field                       
Bug #4057 LEFT() function in HAVING clause truncates query result).


mysql-test/r/func_gconcat.result:
  a test case
  Bug #4035 GROUP_CONCAT with HAVING clause truncates field                       
  Bug #4057 LEFT() function in HAVING clause truncates query result
mysql-test/t/func_gconcat.test:
  a test case
  Bug #4035 GROUP_CONCAT with HAVING clause truncates field                       
  Bug #4057 LEFT() function in HAVING clause truncates query result
sql/item_strfunc.cc:
  a fix (Bug #4057 LEFT() function in HAVING clause truncates query result)
sql/item_strfunc.h:
  a fix (Bug #4057 LEFT() function in HAVING clause truncates query result)
sql/item_sum.cc:
  a fix (Bug #4035 GROUP_CONCAT with HAVING clause truncates field)
sql/item_sum.h:
  a fix (Bug #4035 GROUP_CONCAT with HAVING clause truncates field)
 2004-06-08 18:01:15 +05:00
unknown
8ab01b335d WL#916: Unicode collations for some languages 2004-06-08 17:56:15 +05:00
unknown
19480ed616 Added function innobase_store_binlog_offset_and_flush_log requested by Guilhem 
to ha_innodb.cc and ha_innodb.h


sql/ha_innodb.cc:
  /***********************************************************************
  This function stores binlog offset and flushes logs */
  
  void
  innobase_store_binlog_offset_and_flush_log(
  /*=============================*/
      char *binlog_name,          /* in: binlog name   */
      longlong offset             /* in: binlog offset */
  );
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2004-06-08 15:38:22 +03:00
unknown
ed1a8b7f95 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-06-08 07:23:51 -05:00
unknown
a755009ce4 Bug #3717 ENCODE returns a character string, not a binary string 2004-06-08 15:36:44 +05:00
unknown
5cf5e43f17 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2004-06-08 15:36:43 +05:00
unknown
c47ec30811 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-06-08 12:36:42 +02:00
unknown
283e815608 fix for automake-1.5 2004-06-08 10:36:41 +00:00
unknown
bd3de2b189 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-06-08 09:32:52 +00:00
unknown
e673c9a1a6 Bug #2077 Japanese characters in enum/default values are reported incorrectly 2004-06-08 14:26:16 +05:00
unknown
b2ab6644dd ha_innodb.cc: 
Fix Bug #4047: remove the improvement ported from 4.0 that made InnoDB to remember the original select_lock_type inside LOCK TABLES


sql/ha_innodb.cc:
  Fix Bug #4047: remove the improvement ported from 4.0 that made InnoDB to remember the original select_lock_type inside LOCK TABLES
 2004-06-08 10:41:14 +03:00
unknown
3e159f3fc9 BUG#3439 problem with UDF functions 
VC++Files/examples/udf_example/udf_example.def:
  Add definitions of init and deinit functions
 2004-06-08 12:35:22 +06:00
unknown
742ca412b2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-06-08 08:33:17 +02:00
unknown
bcce99e9cb Sorry, forgot to commit together with the code change yesterday. 2004-06-08 11:33:16 +05:00
unknown
3b1a93bf89 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
 2004-06-08 00:12:55 +00:00
unknown
80213d665d some ndb printout cleanup 
ndb/src/ndbapi/NdbDictionary.cpp:
  Print cleanup
ndb/test/src/NDBT_ResultRow.cpp:
  Print error
ndb/test/src/NDBT_Table.cpp:
  Print cleanup
 2004-06-08 00:12:11 +00:00
unknown
838870d585 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-06-07 23:43:04 +03:00
unknown
c4d76f755a SQL Syntax for Prepared Statements: post-merge fixes 2004-06-08 00:43:03 +04:00
unknown
ec1c9ef7b6 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
 2004-06-07 23:50:59 +04:00
unknown
457aca6746 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-06-07 21:17:29 +02:00
unknown
b60686673a BUG#4034 2004-06-07 21:16:53 +02:00
unknown
be0f204c91 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-06-07 21:01:19 +02:00
unknown
40b622f271 BUG#4037 fix printout of limits 2004-06-07 20:57:28 +02:00
unknown
a729db61f7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-06-07 21:31:54 +03:00
unknown
46de0999e1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
 2004-06-07 18:26:12 +00:00
unknown
e7b178b2ca Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-06-07 13:18:03 -05:00
unknown
dfa8ee365f ndb source tree cleanup, see respective file 
BitKeeper/deleted/.del-BinDist.sh~8ea6fee0be3de36:
  Delete: ndb/old_files/BinDist.sh
BitKeeper/deleted/.del-Defs.mk~fab44ad996ed5499:
  Delete: ndb/old_files/Defs.mk
BitKeeper/deleted/.del-Makefile~726e96331d4343ce:
  Delete: ndb/old_files/Makefile
BitKeeper/deleted/.del-SrcDist.sh~ad4f1cd7aae4265b:
  Delete: ndb/old_files/SrcDist.sh
BitKeeper/deleted/.del-configure~501239931f8bb1:
  Delete: ndb/old_files/configure
BitKeeper/deleted/.del-Epilogue.mk~60f7edf886726154:
  Delete: ndb/old_files/Epilogue.mk
BitKeeper/deleted/.del-README~b619a580720ec3d8:
  Delete: ndb/old_files/README
BitKeeper/deleted/.del-env.sh~91075f1664ce8292:
  Delete: ndb/old_files/env.sh
BitKeeper/deleted/.del-mysqlclusterenv.sh~f0d8a63e844255f5:
  Delete: ndb/old_files/mysqlclusterenv.sh
BitKeeper/deleted/.del-Defs.DEBUG.mk~8ed7bb195181c74a:
  Delete: ndb/config/old_files/Defs.DEBUG.mk
BitKeeper/deleted/.del-acinclude.m4~b1472f9faac0c71:
  Delete: ndb/config/old_files/acinclude.m4
BitKeeper/deleted/.del-Defs.HPUX.HPPA.GCC.mk~b50ab324c3ce07ce:
  Delete: ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk
BitKeeper/deleted/.del-Defs.IBMAIX.POWERPC.GCC.mk~76bea6928ca7b8f0:
  Delete: ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk
BitKeeper/deleted/.del-Defs.LINUX.x86.GCC.mk~15f3c82665d141a0:
  Delete: ndb/config/old_files/Defs.LINUX.x86.GCC.mk
BitKeeper/deleted/.del-Defs.LINUX.x86.ICC.mk~e51a6e19daeb353:
  Delete: ndb/config/old_files/Defs.LINUX.x86.ICC.mk
BitKeeper/deleted/.del-Defs.LINUX.x86_64.GCC.mk~9e853e7e1142b2d7:
  Delete: ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk
BitKeeper/deleted/.del-Defs.MACOSX.POWERPC.GCC.mk~d661574b758ac911:
  Delete: ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk
BitKeeper/deleted/.del-Defs.OSE.PPC750.DIAB.mk~d5d7116c512290bc:
  Delete: ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk
BitKeeper/deleted/.del-Defs.RELEASE.mk~6c195617d8e1c8ec:
  Delete: ndb/config/old_files/Defs.RELEASE.mk
BitKeeper/deleted/.del-Defs.RELEASE_TRACE.mk~e367d147bd3ad0bf:
  Delete: ndb/config/old_files/Defs.RELEASE_TRACE.mk
BitKeeper/deleted/.del-Defs.SIMCELLO.SOFTOSE.GCC.mk~5acee8046e3dfd21:
  Delete: ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk
BitKeeper/deleted/.del-Defs.WIN32.x86.VC7.mk~582038c28dd89391:
  Delete: ndb/config/old_files/Defs.WIN32.x86.VC7.mk
BitKeeper/deleted/.del-Defs.SOFTOSE.SPARC.GCC.mk~ebd0c4aab56c1202:
  Delete: ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk
BitKeeper/deleted/.del-Defs.SOLARIS.SPARC.FORTE6.mk~4367e18b8246761e:
  Delete: ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk
BitKeeper/deleted/.del-Defs.SOLARIS.SPARC.GCC.mk~d781a20b8235525c:
  Delete: ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk
BitKeeper/deleted/.del-Defs.SOLARIS.SPARC_64.GCC.mk~76626f56dcd0e8e9:
  Delete: ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk
BitKeeper/deleted/.del-Defs.SOLARIS6.SPARC.GCC.mk~2b05903f79ce771:
  Delete: ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk
BitKeeper/deleted/.del-Defs.TRU64X.ALPHA.GCC.mk~6ba3fc0cfaa37cb2:
  Delete: ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk
BitKeeper/deleted/.del-GuessConfig.sh~ebdb504ed6b7ab68:
  Delete: ndb/config/old_files/GuessConfig.sh
BitKeeper/deleted/.del-Makefile.am~c28d15539f926269:
  Delete: ndb/config/old_files/Makefile.am
BitKeeper/deleted/.del-configure.in~3e0ef32c155b79bc:
  Delete: ndb/config/old_files/configure.in
BitKeeper/deleted/.del-config.h.in~b9209994763e30f8:
  Delete: ndb/config/old_files/config.h.in
BitKeeper/deleted/.del-Makefile~71ad5c694da8711:
  Delete: ndb/src/old_files/Makefile
BitKeeper/deleted/.del-Makefile~261cfb7897aa2259:
  Delete: ndb/test/newtonapi/Makefile
BitKeeper/deleted/.del-Makefile~d46bb4a49ae611f9:
  Delete: ndb/test/odbc/Makefile
BitKeeper/deleted/.del-Makefile_old~5ce89facf68772b:
  Delete: ndb/test/Makefile_old
ndb/test/include/NdbSchemaCon.hpp:
  Rename: ndb/include/ndbapi/NdbSchemaCon.hpp -> ndb/test/include/NdbSchemaCon.hpp
ndb/test/include/NdbSchemaOp.hpp:
  Rename: ndb/include/ndbapi/NdbSchemaOp.hpp -> ndb/test/include/NdbSchemaOp.hpp
ndb/include/Makefile.am:
  removed NdbSchema from ndbapi
ndb/include/ndbapi/NdbDictionary.hpp:
  added Column::getSize()
  and print function for Column::Type
ndb/include/ndbapi/NdbRecAttr.hpp:
  made an operator<< friend to NdbRecAttr
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Rewritten restore to remove NdbSchema
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
  Rewritten restore to remove NdbSchema
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Rewritten restore to remove NdbSchema
ndb/src/ndbapi/Makefile.am:
  removed NdbSchema from ndbapi
ndb/src/ndbapi/NdbDictionary.cpp:
  added operator << for Column::Type
ndb/src/ndbapi/NdbRecAttr.cpp:
  updated operator<< for NdbRecAttr
ndb/src/ndbapi/Ndberr.cpp:
  removed NdbSchema from ndbapi
ndb/test/src/Makefile.am:
  moved NdbSchema to test
ndb/test/src/NDBT_ResultRow.cpp:
  use common print method for NDBT_ResultRow
ndb/test/src/NdbBackup.cpp:
  fixed bug in testBackup
ndb/test/src/NdbSchemaCon.cpp:
  moved NdbError NdbSchema
ndb/test/src/NdbSchemaOp.cpp:
  updated include file list
 2004-06-07 17:31:32 +00:00
unknown
5b4120288e Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-06-07 18:56:33 +02:00
unknown
f8c86262c0 updating test's result now that SHOW BINLOG EVENTS quotes and escapes user variables. 
mysql-test/r/rpl_user_variables.result:
  adding quotes to the variable names, and escaping, in the result
 2004-06-07 18:55:53 +02:00
unknown
ec3455efb2 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-06-07 11:51:50 -05:00
unknown
3665b3be90 Fix for bug #4036 multiple SELECT DATE_FORMAT, incorrect results 2004-06-07 20:35:05 +04:00
unknown
86ab1dd2d6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1


acconfig.h:
  Auto merged
configure.in:
  Auto merged
 2004-06-07 17:58:35 +02:00
unknown
a3426dd8ab Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
 2004-06-07 19:58:34 +04:00
unknown
5d7a592c9d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-06-07 09:21:54 -05:00
unknown
fd94477b43 Fix for bug#3946: Error in LPAD() when padstring is longer than 1 character 
mysql-test/r/ctype_ucs.result:
  Test for bug#3946: Error in LPAD() when padstring is longer than 1 character
mysql-test/t/ctype_ucs.test:
  Test for bug#3946: Error in LPAD() when padstring is longer than 1 character
 2004-06-07 17:39:17 +04:00
unknown
8e50d3768d mysqld.cc: 
WL#1160.
  Adding variable-conformant startup options for --default-character-set and --default-collation


sql/mysqld.cc:
  WL#1160.
  Adding variable-conformant startup options for --default-character-set and --default-collation
 2004-06-07 18:33:17 +05:00
unknown
ef3b0c2034 mysqldump.c: 
Dump could fail to load because of --default-character-set command line option.
  More safe dump is now produces, --default-character-set doesn't matter.


client/mysqldump.c:
  Dump could fail to load because of --default-character-set command line option.
  More safe dump is now produces, --default-character-set doesn't matter.
 2004-06-07 18:12:23 +05:00
unknown
d23821d515 client.c: 
Bug #3990  	`--with-charset' ./configure's switch doesn'taffect mysql client library.


sql-common/client.c:
  Bug #3990  	`--with-charset' ./configure's switch doesn'taffect mysql client library.
 2004-06-07 17:28:31 +05:00
unknown
548f024089 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-06-07 12:39:26 +02:00
unknown
7dc2426be0 BUG#3987 - if(int, aggregate(int)) 2004-06-07 12:38:35 +02:00
unknown
8e5d446227 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-06-07 02:08:36 -07:00
unknown
89de63595f Last patch before push into main tree. Updated from code review and final once over. 
A couple of small changes to ha_example (mainly comments). 


sql/examples/ha_archive.cc:
  Changes from Serg.
  A few styles changes, fix for potential hash insert gone wrong, removed bad tables if create fails, gzflush used for flushing by default (had problems with OSX 10.2), and some spelling corrections.
sql/examples/ha_archive.h:
  Removed fast_key_read() and changed the name of a conflicting variable.
sql/examples/ha_example.cc:
  Added a few new comments.
sql/examples/ha_example.h:
  Added pragma interface. Removed fast_key_read() and Serg's request
 2004-06-07 02:06:33 -07:00
unknown
27ad8e4078 Merged 
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysys/my_error.c:
  Hand merged
 2004-06-07 12:21:26 +04:00