mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7110 commits 2791 branches 343 tags 1.7 GiB
Commit graph

7110 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
251320477c Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1
 2003-01-30 10:20:42 +02:00
unknown
7ae7275c9c Always use USE_STRCOLL code 2003-01-30 11:15:14 +04:00
unknown
a2ccd6f0fe Optimization of unicode conversion 2003-01-30 10:47:15 +04:00
unknown
152af44f9e 2003-01-30 10:19:14 +04:00
unknown
f02046c432 cp1256.xml: 
Fix


sql/share/charsets/cp1256.xml:
  Fix
 2003-01-30 10:04:02 +04:00
unknown
b6e79ddfed fixed compiler error 2003-01-29 21:17:46 +02:00
unknown
72e091f0f6 fixed row items with group functions 
fixed layout


BitKeeper/etc/ignore:
  Added stamp-h2 stamp-h3 stamp-h4 to the ignore list
mysql-test/r/row.result:
  test of row with group function
mysql-test/t/row.test:
  test of row with group function
sql/item_cmpfunc.cc:
  added braces according review
sql/item_func.cc:
  fixed layout
sql/item_row.cc:
  fixed row item
sql/item_row.h:
  fixed row items with group functions
 2003-01-29 20:44:47 +02:00
unknown
b627e2dbb2 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1


sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-01-29 19:46:11 +02:00
unknown
b2ffb29ad7 improving of fields list creation in derived tables and unions 
fixed length of fields created in fubselect
fixed resolving fields of reduced in derived table subselect


mysql-test/r/subselect.result:
  test of created with subselect fields
mysql-test/t/subselect.test:
  test of created with subselect fields
sql/item.cc:
  fixed length of fields created in fubselect
  fixed resolving fields of reduced in derived table subselect
sql/item_subselect.cc:
  improving of fields list creation in derived tables and unions
sql/mysql_priv.h:
  improving of fields list creation in derived tables and unions
sql/sql_derived.cc:
  improving of fields list creation in derived tables and unions
sql/sql_lex.h:
  improving of fields list creation in derived tables and unions
sql/sql_parse.cc:
  improving of fields list creation in derived tables and unions
sql/sql_prepare.cc:
  improving of fields list creation in derived tables and unions
sql/sql_select.cc:
  improving of fields list creation in derived tables and unions
sql/sql_select.h:
  improving of fields list creation in derived tables and unions
sql/sql_union.cc:
  improving of fields list creation in derived tables and unions
sql/sql_update.cc:
  improving of fields list creation in derived tables and unions
 2003-01-29 19:42:39 +02:00
unknown
9c356bf43c After merge fix 2003-01-29 19:33:48 +02:00
unknown
93ebd4d64d merge with 3.23.56 to get patches for --lower-case-table-names and 
proper handling of SUM() in some functions.



BitKeeper/etc/logging_ok:
  auto-union
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/group_by.result:
  merge with 3.23.56
mysql-test/t/group_by.test:
  merge with 3.23.56
sql/item_strfunc.h:
  merge with 3.23.56
sql/mysqld.cc:
  merge with 3.23.56
sql/sql_parse.cc:
  merge with 3.23.56
sql/sql_yacc.yy:
  merge with 3.23.56
 2003-01-29 19:22:22 +02:00
unknown
9c89ce7b3a Fixed compilation error on windows 
sql/sql_table.cc:
  Added comments
 2003-01-29 19:10:33 +02:00
unknown
3a180c331a Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2003-01-29 18:56:59 +02:00
unknown
bdfa549779 Fixed handling of lower_case_table_names in SHOW TABLE STATUS, mysql_list_fields() and mysql_table_dump(). 
This fixes some Errcode 13 errors on Windows when deleting tables.



sql/mysql_priv.h:
  Moved lower case conversion of database names to check_db_name()
sql/mysqld.cc:
  Fix to be able to use 4.0 error message files
sql/sql_db.cc:
  Moved lower case conversion of database names to check_db_name()
sql/sql_parse.cc:
  Moved lower case conversion of database names to check_db_name()
  Added checking of lower_case_table_names for mysql_table_dump() and
  mysql_list_fields()
sql/sql_show.cc:
  Moved lower case conversion of database names to check_db_name()
sql/table.cc:
  Convert database names to lower case in check_db-name() if --lower-case-table-names is used.
 2003-01-29 18:56:34 +02:00
unknown
e528943fca conf_to_src.c: 
Getting closer 


strings/conf_to_src.c:
  Getting closer
 2003-01-29 17:56:18 +04:00
unknown
307ed01440 Move latin1 into a separarte file 2003-01-29 17:31:20 +04:00
unknown
6a188877d4 conf_to_src.c: 
Restoring conf_to_src. Now it loads XML.


strings/conf_to_src.c:
  Restoring conf_to_src. Now it loads XML.
 2003-01-29 16:33:16 +04:00
unknown
2c2b14f9a2 Reorganization to restore generating charset C files from conf files 2003-01-29 15:08:09 +04:00
unknown
0458a92197 Merge mysql.com:/space/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.0-build
 2003-01-29 12:05:23 +01:00
unknown
b343de721e Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
 2003-01-29 11:03:53 +02:00
unknown
88206d4def Merge akishkin@work.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/walrus/bk/40
 2003-01-29 14:02:35 +05:00
unknown
7a7407535c crash-me.sh: 
restore nake_time and make_time_r


sql-bench/crash-me.sh:
  restore nake_time and make_time_r
 2003-01-29 14:00:08 +05:00
unknown
cec5bc1de7 fixed functions to be able work with group function as argument 
made bisone 1.75 compatible code


mysql-test/r/group_by.result:
  test of function with agregate function inside
mysql-test/t/group_by.test:
  test of function with agregate function inside
sql/item_cmpfunc.cc:
  fixed functions to be able work with group function as argument
sql/item_cmpfunc.h:
  fixed functions to be able work with group function as argument
sql/item_func.cc:
  fixed functions to be able work with group function as argument
sql/item_func.h:
  fixed functions to be able work with group function as argument
sql/item_strfunc.cc:
  fixed functions to be able work with group function as argument
sql/item_strfunc.h:
  fixed functions to be able work with group function as argument
sql/sql_yacc.yy:
  made bisone 1.75 compatible code
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2003-01-29 10:38:56 +02:00
unknown
7e78a9490b - fixed typo for better portability (many shells don't support the "==" 
operator)
 2003-01-29 09:22:20 +01:00
unknown
231553039f client_test.c: 
Compilation failure fix


tests/client_test.c:
  Compilation failure fix
 2003-01-29 11:38:59 +04:00
unknown
e63630be7d Merge work.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/bk/src-4.1
 2003-01-28 21:08:42 -08:00
unknown
a8abb0471e Fix for windows specific errors 2003-01-28 21:02:20 -08:00
unknown
6dc436fa86 ha_innodb.cc: 
Cleanup of the previous bug fix: replace code is either SQLCOM_REPLACE or SQLCOM_REPLACE_SELECT


sql/ha_innodb.cc:
  Cleanup of the previous bug fix: replace code is either SQLCOM_REPLACE or SQLCOM_REPLACE_SELECT
 2003-01-29 02:19:00 +02:00
unknown
25aa3098be ha_innodb.cc: 
Fix a bug REPLACE INTO t SELECT ... did not work if t has an auto-inc column


sql/ha_innodb.cc:
  Fix a bug REPLACE INTO t SELECT ... did not work if t has an auto-inc column
 2003-01-29 00:31:56 +02:00
unknown
ad2c3cdf1b Merge work:/home/bk/mysql-4.0 into hynda.(none):/home/my/bk/mysql-4.0 2003-01-28 23:30:35 +02:00
unknown
2ea4eedc15 Fixed a bug in --auto-repair. 2003-01-28 23:29:59 +02:00
unknown
f2ebd03972 fixed memory leak in ROW code (SCRUM 577) 
sql/item_cmpfunc.cc:
  fixed memory leak in ROW code
sql/item_cmpfunc.h:
  fixed memory leak in ROW code
 2003-01-28 22:28:11 +02:00
unknown
baa10e3114 Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/pz/mysql/mysql-4.0-root
 2003-01-28 22:08:53 +03:00
unknown
24167f94c0 merge 
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Use local vrsion
 2003-01-28 20:59:41 +02:00
unknown
b533cd5c83 Only write to the error log if --log-error is specified and --console is not specified 
(On Windows --log-error is enabled by default)



mysys/my_getopt.c:
  Call get_one_option() also for boolean values.
scripts/mysqld_safe.sh:
  Add option --log-error
sql/log.cc:
  Fix for --log-error
sql/mysql_priv.h:
  Fix for --log-error
sql/mysqld.cc:
  Fix for --log-error
sql/sql_udf.cc:
  Lock the mysql/func table properly
 2003-01-28 20:56:35 +02:00
unknown
9753cea1aa Fix predicted first rand() call 
sql/sql_class.cc:
  Fix Random hash initialization on for new connections to make result
  it more random
 2003-01-28 20:33:47 +03:00
unknown
b6315f6d9b Fix leak when the client disconnects with open prep statements 
sql/sql_prepare.cc:
  Fix leak when the client disconnects with open statements
tests/client_test.c:
  Enable stmt_close test
 2003-01-28 09:24:27 -08:00
unknown
5364257920 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.w1
 2003-01-28 21:03:49 +04:00
unknown
a0ffb52a3a SIGNAL_WITH_VIO_CLOSES bugfix 
sql/sql_class.cc:
  This should be #ifdefed
 2003-01-28 21:03:05 +04:00
unknown
7b137f15bd A feature of doing automatick result buffering when INSERT is 
done from the select containing a table to be inserted to.
 2003-01-28 18:55:52 +02:00
unknown
8b790656f1 - added netware subdirectory to distribution 
Makefile.am:
   - added netware to SUBDIRS
netware/Makefile.am:
   - add netware.patch to distribution
 2003-01-28 17:49:21 +01:00
unknown
73284c9384 low-level error messages cleanup 
extra/perror.c:
  error messages fixups
include/my_base.h:
  error codes fixups
myisam/mi_open.c:
  correct error reported
myisam/myisamchk.c:
  correct error reported
myisammrg/myrg_open.c:
  correct error reported
sql/ha_innodb.cc:
  correct error reported
sql/ha_isam.cc:
  reorder table file extensions to get better error on "cannot open the table"
sql/ha_myisam.cc:
  reorder table file extensions to get better error on "cannot open the table"
sql/ha_myisammrg.cc:
  correct error reported
sql/handler.cc:
  correct error reported
 2003-01-28 17:42:08 +01:00
unknown
3758c92b3a Use on Unix hostname.err only when --log-error=path. 
Asked by Heikki and Peter.


sql/mysqld.cc:
  Use on Unix hostname.err only when --log-error=path.
 2003-01-28 13:50:36 -02:00
unknown
cdf5a4d1f7 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-01-28 15:55:22 +02:00
unknown
78d40d4228 moving a feature from 4.1 to 5.0 2003-01-28 15:47:30 +02:00
unknown
a29d85072d Merge work:/home/bk/mysql-4.0 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysql_priv.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
 2003-01-28 14:37:12 +01:00
unknown
d490b56ed1 fixed "DROP table_open_in_handler" hang 2003-01-28 14:36:22 +01:00
unknown
d7db6beec7 Merge 
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.h:
  SCCS merged
 2003-01-28 15:34:59 +02:00
unknown
ca0d06d599 fixed bugs in temporary tables in subselect implementation (SCRUM) 
merging with switching on static tables optimization (SCRUM)
fixed subselects with uncacheable results
added test for fixed bugs from bugreports


mysql-test/r/subselect.result:
  changes in subselect test after switching on static tables optimization
  fixed bug test added
  uncacheable subselects
mysql-test/t/subselect.test:
  changes in subselect test after switching on static tables optimization
  fixed bug test added
  uncacheable subselects
sql/item_create.cc:
  fixed subselects with uncacheable results
sql/item_func.cc:
  fixed subselects with uncacheable results
sql/item_subselect.cc:
  fixed subselects with uncacheable results
  clean up
sql/item_subselect.h:
  fixed subselects with uncacheable results
sql/sql_lex.cc:
  fixed subselects with uncacheable results
sql/sql_lex.h:
  fixed subselects with uncacheable results
sql/sql_select.cc:
  fixed bugs in temporary tables in subselect implementation
  fixed subselects with uncacheable results
sql/sql_union.cc:
  fixed subselects with uncacheable results
sql/sql_yacc.yy:
  fixed subselects with uncacheable results
 2003-01-28 14:48:12 +02:00
unknown
d2b6620621 Merge sinisa@work.mysql.com:/home/bk/mysql-5.0 
into sinisa.nasamreza.org:/mnt/work/petica


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2003-01-28 14:44:13 +02:00