Commit graph

6841 commits

Author SHA1 Message Date
unknown
708b733ead ctype-simple.c:
CC comments -> C comments
ctype-latin1_de.c:
  like_range was the same with like_range_simple
  so I've removed duplicated code


strings/ctype-latin1_de.c:
  like_range was the same with like_range_simple
  so I've removed duplicated code
strings/ctype-simple.c:
  CC comments -> C comments
2003-01-31 11:43:46 +04:00
unknown
99637f4987 Gluh asked me to do it 2003-01-31 11:41:39 +04:00
unknown
fd9011ea04 Fix for mysqlbinlog compilation 2003-01-31 10:28:13 +04:00
unknown
071aec5c45 conflicts resolving
BitKeeper/etc/logging_ok:
  auto-union
include/my_sys.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/log_event.cc:
  merged
sql/sql_parse.cc:
  merged
2003-01-31 09:43:53 +04:00
unknown
65a4b622e8 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-30 14:46:11 -08:00
unknown
fccbabe089 Fix alloc_stmt_fields for non-select statements
Add tests for show commands + MYSQL_TYPE_NULL coverage


tests/client_test.c:
  Add tests for show commands + MYSQL_TYPE_NULL coverage
libmysql/libmysql.c:
  Fix alloc_stmt_fields for non-select statements
2003-01-30 14:33:49 -08:00
unknown
6828a4c0a1 'Replicate user variables' task
include/my_sys.h:
  Addet reset_dinamic
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-01-30 21:39:54 +04:00
unknown
268e3ee9dd config-win.h, os0proc.h, os0proc.c, srv0start.c:
Make AWE compilation depend on __WIN2000__


innobase/srv/srv0start.c:
  Make AWE compilation depend on __WIN2000__
innobase/os/os0proc.c:
  Make AWE compilation depend on __WIN2000__
innobase/include/os0proc.h:
  Make AWE compilation depend on __WIN2000__
include/config-win.h:
  Make AWE compilation depend on __WIN2000__
2003-01-30 18:52:45 +02:00
unknown
bde6addd4b Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4rw
sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-30 21:23:58 +05:00
unknown
12af2c277d Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4rw
sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-30 21:15:21 +05:00
unknown
545c9dff97 Merge conflict 2003-01-30 01:02:57 -08:00
unknown
dca8b8a6f5 Tests for 'n' concurrent statement execution 2003-01-30 00:41:14 -08:00
unknown
7d0d2d4f85 Fix 'n' concurrent prepared executions
sql/sql_prepare.cc:
  Fix 'n' concurrent executions
libmysql/errmsg.c:
  Fix the missing semicolon for errors
libmysql/libmysql.c:
  Fix the result meta info for non-SELECT statements
2003-01-30 00:38:11 -08: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
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
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
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
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
7120b66884 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default


sql/field.h:
  Auto merged
2003-01-28 15:06:23 +04:00
unknown
4f6e3d2284 resolve 2003-01-28 15:03:33 +04:00
unknown
ee7c5f13fa New "fill" function in charset_info_st structure 2003-01-28 14:58:06 +04:00
unknown
a831430e62 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-28 12:59:07 +04:00
unknown
aa42950eb0 my_pthread.h:
Missing merge in changeset 1.1435


include/my_pthread.h:
  Missing merge in changeset 1.1435
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-01-28 05:34:32 +02:00
unknown
be85fdc5d0 Introduced a scalable key cache management.
Added some fields to the st_my_thread_var structure to be
  able to link such structures into a list.


include/my_pthread.h:
  Added some fields to the st_my_thread_var structure to be
  able to link such structures into a list.
mysys/mf_keycache.c:
  Introduced a scalable key cache management.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-01-28 03:37:57 +02:00
unknown
f76a875e61 do not ignore first char, when truncating spaces in str->num conversion.
strings/ctype-simple.c:
  do not ignore first char, when truncating spaces.
2003-01-28 00:33:04 +01:00
unknown
1220b05c3d correct parameter of hash_search 2003-01-28 03:28:06 +05:00
unknown
c98c4bfc3e Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-01-27 21:29:40 +02:00
unknown
e95e906683 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-01-27 20:24:17 +01:00
unknown
5a38c59d19 Merge myvenu.com:/home/venu/bk/src-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-01-27 10:56:20 -08:00
unknown
a07c602b60 Fix stmt_close not to close the resources on error(libmysql)
Enable test_stmt_close() and test output to stdout(client_test)


tests/client_test.c:
  Enable test_stmt_close() and test output to stdout
libmysql/libmysql.c:
  Fix stmt_close not to close the resources on error
2003-01-27 10:54:45 -08:00
unknown
fea4d2b62c Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-27 10:50:25 -08:00
unknown
98627eab14 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2003-01-27 20:30:56 +02:00
unknown
3dc6ab4c74 My second SCRUM task:
Automatically add SQL_BUFFER_RESULT if INSERT is done from 
SELECT comprising a table to be inserted in.
2003-01-27 20:29:33 +02:00
unknown
ec44c88165 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-01-27 17:41:30 +01:00
unknown
2aa304d37c protection agains badly charsed indexfile 2003-01-27 17:27:21 +01:00
unknown
b5f740addf field.cc:
Use cs->scan() instead of my_isspace()


sql/field.cc:
  Use cs->scan() instead of my_isspace()
2003-01-27 18:46:51 +04:00
unknown
9040fd7d75 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-01-27 15:38:33 +01:00
unknown
2275a161d0 select count(*) from t1 procedure analyse(); bug fixed 2003-01-27 15:37:05 +01:00