unknown
c4964caf0f
Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi
...
BitKeeper/etc/logging_ok:
auto-union
2002-11-17 04:15:00 +05:00
unknown
e79eb98ba0
Merge work:/home/bk/mysql-4.1
...
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-11-16 20:17:11 +01:00
unknown
1ce56c2ad8
Merge abelkin@work.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-16 14:13:23 +02:00
unknown
49aefe3fb7
Fixed bugs pointed by "Crash with 'big' derivated table in MySQL-4.1" bugreport
...
- fixed switching from heap to MyISAM table
- fixed error handler
sql/sql_derived.cc:
A fix for the bug when MyISAM tmp table has to be created in order to resolve derived table.
fixed error handler
sql/sql_parse.cc:
fixed error handler
sql/sql_union.cc:
fixed switching from heap to MyISAM table
2002-11-16 00:01:48 +02:00
unknown
ecd4ac2a3c
test for NULL processing has been added
2002-11-15 17:34:10 +04:00
unknown
87db341dd5
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
...
into mysql.r18.ru:/usr/home/ram/mysql-4.1.bdb
2002-11-15 16:46:52 +04:00
unknown
a6007a364e
fix for NULL processing
2002-11-15 16:45:08 +04:00
unknown
08253aa93d
Copy from /sql directory
2002-11-15 13:58:24 +04:00
unknown
5a264eb9a7
move like_range into CHARSET_INFO structure
2002-11-15 11:44:23 +04:00
unknown
ff3fd7e5d2
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-15 11:01:04 +04:00
unknown
f3af93f88e
Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4sm
2002-11-15 00:18:37 +05:00
unknown
64dd949c41
Add shared memory protocol and option --protocol
...
client/client_priv.h:
Add OPT_MYSQL_PROTOCOL and OPT_SHARED_MEMORY_BASE_NAME
include/config-win.h:
Add shared memory protocol
include/errmsg.h:
Add error codes of shared memory protocol
include/my_sys.h:
Delete TYPELIB, moved to typelib.h
include/mysql.h:
Add shared memory protocol
include/violite.h:
Add shared memory protocol
libmysql/errmsg.c:
Add texts of errors of shared memory protocol
sql/mysqld.cc:
Add shared memory protocol and option --shared-memory, correct option --named-pipe
sql/set_var.cc:
Add shared memory protocol variables
vio/vio.c:
Add shared memory protocol
vio/viosocket.c:
Add shared memory protocol
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
2002-11-15 00:16:30 +05:00
unknown
fd5b16374c
wild_case_compate(&String, &String, escape) doesn't exist anymor
2002-11-14 17:25:34 +04:00
unknown
5a8c6a33c2
removed unused function
...
some bug fixes
include/m_ctype.h:
Macros bug fix
mysys/charset.c:
wildcmp was not initialized
sql/mysql_priv.h:
removed unused functions
sql/slave.cc:
removed unused function
sql/sql_string.cc:
removed unused functions
2002-11-14 16:47:48 +04:00
unknown
e7bbe3aa0b
New wildcmp() function in CHARSET_INFO structure
2002-11-14 16:07:29 +04:00
unknown
7557af6f4d
Merge work:/home/bk/mysql-4.1
...
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-11-14 11:55:03 +01:00
unknown
948a867123
fixed bug in cyclic reference refinition
...
mysql-test/r/subselect.result:
test of cyclic reference
mysql-test/t/subselect.test:
test of cyclic reference
sql/sql_parse.cc:
fixed layout
fixed bug in cyclic reference refinition
2002-11-14 09:43:24 +02:00
unknown
7642da10d4
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-14 00:26:40 +02:00
unknown
81a5afb925
fixed cyclic reference bug
...
mysql-test/r/subselect.result:
test of cyclic reference
mysql-test/t/subselect.test:
test of cyclic reference
sql/share/czech/errmsg.txt:
new error message
sql/share/danish/errmsg.txt:
new error message
sql/share/dutch/errmsg.txt:
new error message
sql/share/english/errmsg.txt:
new error message
sql/share/estonian/errmsg.txt:
new error message
sql/share/french/errmsg.txt:
new error message
sql/share/german/errmsg.txt:
new error message
sql/share/greek/errmsg.txt:
new error message
sql/share/hungarian/errmsg.txt:
new error message
sql/share/italian/errmsg.txt:
new error message
sql/share/japanese/errmsg.txt:
new error message
sql/share/korean/errmsg.txt:
new error message
sql/share/norwegian-ny/errmsg.txt:
new error message
sql/share/norwegian/errmsg.txt:
new error message
sql/share/polish/errmsg.txt:
new error message
sql/share/portuguese/errmsg.txt:
new error message
sql/share/romanian/errmsg.txt:
new error message
sql/share/russian/errmsg.txt:
new error message
sql/share/serbian/errmsg.txt:
new error message
sql/share/slovak/errmsg.txt:
new error message
sql/share/spanish/errmsg.txt:
new error message
sql/share/swedish/errmsg.txt:
new error message
sql/share/ukrainian/errmsg.txt:
new error message
2002-11-14 00:26:18 +02:00
unknown
7721c7582a
Some macros to make life easier
2002-11-13 17:58:07 +04:00
unknown
81d428bd5a
Preparing to embed string to number conversion functions into charset structure
2002-11-13 17:13:29 +04:00
unknown
e0ad88a2ff
Merge abelkin@work.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
2002-11-13 13:10:40 +02:00
unknown
0fb5b32422
fixed possible bug
2002-11-13 13:07:58 +02:00
unknown
a464676f64
my_snprintf() doesn't support things like %04X so use vsprintf() instead
2002-11-13 15:00:25 +04:00
unknown
cc19c18cf7
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-13 14:37:30 +04:00
unknown
6ed18d1c9f
fixed bug of derived table in subselect
...
fixed bug in error handling
mysql-test/r/subselect.result:
test of error handling
test of derived tables inside subselect
mysql-test/t/subselect.test:
test of error handling
test of derived tables inside subselect
sql/sql_class.cc:
fixed error handling error
sql/sql_lex.h:
fifex layout
sql/sql_parse.cc:
fixed processing of derived tables
sql/sql_select.cc:
more quick abort on error
2002-11-13 11:59:03 +02:00
unknown
0c59356895
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-13 01:14:56 +02:00
unknown
2707f00cdb
fixed error handling
...
fixed subselects in ORDER bug
mysql-test/r/subselect.result:
test of subselects in ORDER clause
test of error handling bug
mysql-test/t/subselect.test:
test of subselects in ORDER clause
test of error handling bug
sql/item_subselect.cc:
fixed subselects in ORDER bug
sql/item_subselect.h:
fixed subselects in ORDER bug
sql/sql_select.cc:
fixed error handling
2002-11-13 01:14:39 +02:00
unknown
405fb9a5d4
add functions for store keys to temporary file with variable length
...
myisam/sort.c:
add function for store keys to temporary files with variable length
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
2002-11-13 03:53:45 +05:00
unknown
ccf7226c27
bdb-deadlock test: added reap commands
2002-11-12 19:21:11 +04:00
unknown
97042da655
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-12 17:42:08 +04:00
unknown
9ef9f59d8b
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-12 17:33:13 +04:00
unknown
e6eaecbfb7
These functions are now UCS2 compatible:
...
CURDATE()
FROM_DAYS()
CURTIME()
NOW()
SEC_TO_TIME()
FROM_UNIXTIME()
DATE_ADD_INTERVAL()
2002-11-12 17:32:36 +04:00
unknown
86f1a1e0d0
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
sql/sql_parse.cc:
Auto merged
2002-11-12 15:27:11 +02:00
unknown
f779dba31c
fixed 2 typo in BUG_TABLES using
...
remuved 'unstable' variable from test
include/myisampack.h:
fixed 2 typo
mysql-test/r/variables.result:
remuved 'unstable' variable
mysql-test/t/variables.test:
remuved 'unstable' variable
2002-11-12 15:25:09 +02:00
unknown
9cc8df0637
memory leak closed
2002-11-12 14:23:55 +01:00
unknown
826cb5b2f6
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-12 14:41:31 +02:00
unknown
a70a9ab637
some code cleanup as per CTO's instructions plus a small bug fix with
...
a corresponding test case....
2002-11-12 14:40:32 +02:00
unknown
14bf8d43c6
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
sql/sql_parse.cc:
Auto merged
2002-11-12 14:00:38 +02:00
unknown
f6f23ce8d0
MONTHNAME() & DAYNAME() are now UCS2 compatible
2002-11-12 14:58:59 +04:00
unknown
fd91015a78
removed double-ignored files (bk citool bug ?)
...
bdb/dist/RELEASE:
comment added
2002-11-11 20:16:45 +01:00
unknown
ca3dbc7104
remove all the auto-generated files but NOT vxworks/* ones.
...
The reason is that vxworks files are most often, one file per directory,
and when such a file is removed directory is gone as well. Though files
are auto-generated, directories aren't.
BitKeeper/deleted/.del-btree_auto.h~94f1be726dad9aff:
Delete: bdb/dbinc_auto/btree_auto.h
BitKeeper/deleted/.del-crdel_auto.h~e6710e96650dd20f:
Delete: bdb/dbinc_auto/crdel_auto.h
BitKeeper/deleted/.del-db_auto.h~f994b15bd824ae9b:
Delete: bdb/dbinc_auto/db_auto.h
BitKeeper/deleted/.del-db_config.h~60184629d0966584:
Delete: bdb/build_win32/db_config.h
BitKeeper/deleted/.del-db_cxx.h~5ae7eca120f9e810:
Delete: bdb/build_win32/db_cxx.h
BitKeeper/deleted/.del-db_perf.dsp~5984ea76dd378285:
Delete: bdb/build_win32/db_perf.dsp
BitKeeper/deleted/.del-db_test.dsp~eb1dbc135441c71c:
Delete: bdb/build_win32/db_test.dsp
BitKeeper/deleted/.del-dbreg_auto.c~c2549ec52200654b:
Delete: bdb/dbreg/dbreg_auto.c
BitKeeper/deleted/.del-dbreg_auto.h~c074dd54cca3b504:
Delete: bdb/dbinc_auto/dbreg_auto.h
BitKeeper/deleted/.del-fileops_auto.h~10df93de4b325f28:
Delete: bdb/dbinc_auto/fileops_auto.h
BitKeeper/deleted/.del-hash_auto.h~a29a3d2157d8c2ed:
Delete: bdb/dbinc_auto/hash_auto.h
BitKeeper/deleted/.del-libdb.def~301ea9487fa24bb1:
Delete: bdb/build_win32/libdb.def
BitKeeper/deleted/.del-qam_auto.h~727bb6f1bc903af6:
Delete: bdb/dbinc_auto/qam_auto.h
BitKeeper/deleted/.del-rec_dbreg~e359d26bb94bb1c3:
Delete: bdb/dist/template/rec_dbreg
BitKeeper/deleted/.del-rec_fileops~ef167bd1b983a01:
Delete: bdb/dist/template/rec_fileops
BitKeeper/deleted/.del-txn_auto.h~5c0ec531297454cf:
Delete: bdb/dbinc_auto/txn_auto.h
BitKeeper/deleted/.del-DbBtreeStat.java~ae44f148e56d691e:
Delete: bdb/java/src/com/sleepycat/db/DbBtreeStat.java
BitKeeper/deleted/.del-DbHashStat.java~712355915769120f:
Delete: bdb/java/src/com/sleepycat/db/DbHashStat.java
BitKeeper/deleted/.del-DbLockStat.java~78219b0a1bd2f053:
Delete: bdb/java/src/com/sleepycat/db/DbLockStat.java
BitKeeper/deleted/.del-DbLogStat.java~b9922e5d7f3a04aa:
Delete: bdb/java/src/com/sleepycat/db/DbLogStat.java
BitKeeper/deleted/.del-DbMpoolFStat.java~1e69777aa623d5b4:
Delete: bdb/java/src/com/sleepycat/db/DbMpoolFStat.java
BitKeeper/deleted/.del-DbQueueStat.java~e1632bb696810690:
Delete: bdb/java/src/com/sleepycat/db/DbQueueStat.java
BitKeeper/deleted/.del-DbRepStat.java~5dc6f9d61f4ad890:
Delete: bdb/java/src/com/sleepycat/db/DbRepStat.java
BitKeeper/deleted/.del-DbTxnStat.java~d4408e0452a8ef16:
Delete: bdb/java/src/com/sleepycat/db/DbTxnStat.java
BitKeeper/deleted/.del-fileops_auto.c~f1dd08f372e83d35:
Delete: bdb/fileops/fileops_auto.c
BitKeeper/deleted/.del-java_stat_auto.c~2199d8ff9d208c23:
Delete: bdb/libdb_java/java_stat_auto.c
BitKeeper/deleted/.del-java_stat_auto.h~c2e9f743368f29fb:
Delete: bdb/libdb_java/java_stat_auto.h
BitKeeper/etc/ignore:
Added bdb/build_win32/db_config.h bdb/build_win32/db_cxx.h bdb/build_win32/db_perf.dsp bdb/build_win32/db_test.dsp bdb/build_win32/libdb.def bdb/dbinc_auto/btree_auto.h bdb/dbinc_auto/btree_ext.h bdb/dbinc_auto/clib_ext.h bdb/dbinc_auto/common_ext.h bdb/dbinc_auto/crdel_auto.h bdb/dbinc_auto/crypto_ext.h bdb/dbinc_auto/db_auto.h bdb/dbinc_auto/db_ext.h bdb/dbinc_auto/db_server.h bdb/dbinc_auto/dbreg_auto.h bdb/dbinc_auto/dbreg_ext.h bdb/dbinc_auto/env_ext.h bdb/dbinc_auto/ext_185_def.in bdb/dbinc_auto/ext_185_prot.in bdb/dbinc_auto/ext_def.in bdb/dbinc_auto/ext_prot.in bdb/dbinc_auto/fileops_auto.h bdb/dbinc_auto/fileops_ext.h bdb/dbinc_auto/hash_auto.h bdb/dbinc_auto/hash_ext.h bdb/dbinc_auto/hmac_ext.h bdb/dbinc_auto/int_def.in bdb/dbinc_auto/lock_ext.h bdb/dbinc_auto/log_ext.h bdb/dbinc_auto/mp_ext.h bdb/dbinc_auto/mutex_ext.h bdb/dbinc_auto/os_ext.h bdb/dbinc_auto/qam_auto.h bdb/dbinc_auto/qam_ext.h bdb/dbinc_auto/rep_ext.h bdb/dbinc_auto/rpc_client_ext.h bdb/dbinc_auto/rpc_defs.in bdb/dbinc_auto/rpc
2002-11-11 20:03:40 +01:00
unknown
0cfa328eac
Merge work:/home/bk/mysql-4.1
...
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-11-11 19:27:17 +01:00
unknown
dbbcc4223b
removed auto-generated files, some fixups
...
BitKeeper/deleted/.del-rpc_server_ext.h~7c955499fca6dc77:
Delete: bdb/dbinc_auto/rpc_server_ext.h
BitKeeper/deleted/.del-btree_ext.h~35de1585d63d72ff:
Delete: bdb/dbinc_auto/btree_ext.h
BitKeeper/deleted/.del-clib_ext.h~f279b5b64b6b5ade:
Delete: bdb/dbinc_auto/clib_ext.h
BitKeeper/deleted/.del-common_ext.h~d8ab025e1be030ae:
Delete: bdb/dbinc_auto/common_ext.h
BitKeeper/deleted/.del-db_ext.h~a62714b06359a95e:
Delete: bdb/dbinc_auto/db_ext.h
BitKeeper/deleted/.del-dbreg_ext.h~4d2ca3859b11d8c2:
Delete: bdb/dbinc_auto/dbreg_ext.h
BitKeeper/deleted/.del-env_ext.h~6f604f4533cc5427:
Delete: bdb/dbinc_auto/env_ext.h
BitKeeper/deleted/.del-ext_185_def.in~a6545f6dd455a6bd:
Delete: bdb/dbinc_auto/ext_185_def.in
BitKeeper/deleted/.del-ext_185_prot.in~51f8b1efdc79204c:
Delete: bdb/dbinc_auto/ext_185_prot.in
BitKeeper/deleted/.del-ext_def.in~eb85579468346302:
Delete: bdb/dbinc_auto/ext_def.in
BitKeeper/deleted/.del-ext_prot.in~1123bab8d321561d:
Delete: bdb/dbinc_auto/ext_prot.in
BitKeeper/deleted/.del-fileops_ext.h~cb8ee1d24c011cac:
Delete: bdb/dbinc_auto/fileops_ext.h
BitKeeper/deleted/.del-hash_ext.h~9cc6cefb2d5cdee:
Delete: bdb/dbinc_auto/hash_ext.h
BitKeeper/deleted/.del-hmac_ext.h~da1552dc3f7b9f46:
Delete: bdb/dbinc_auto/hmac_ext.h
BitKeeper/deleted/.del-lock_ext.h~f9ce9b184d784d74:
Delete: bdb/dbinc_auto/lock_ext.h
BitKeeper/deleted/.del-log_ext.h~f1309f8f47b5e812:
Delete: bdb/dbinc_auto/log_ext.h
BitKeeper/deleted/.del-mp_ext.h~863c07eb97ff21fb:
Delete: bdb/dbinc_auto/mp_ext.h
BitKeeper/deleted/.del-mutex_ext.h~f0c6b65f493723e6:
Delete: bdb/dbinc_auto/mutex_ext.h
BitKeeper/deleted/.del-os_ext.h~6f51a66237a20ca3:
Delete: bdb/dbinc_auto/os_ext.h
BitKeeper/deleted/.del-qam_ext.h~a0e8f87ead2e3846:
Delete: bdb/dbinc_auto/qam_ext.h
BitKeeper/deleted/.del-rep_ext.h~94f25917d5d2623:
Delete: bdb/dbinc_auto/rep_ext.h
BitKeeper/deleted/.del-rpc_client_ext.h~8fb31274cb4dc50:
Delete: bdb/dbinc_auto/rpc_client_ext.h
BitKeeper/deleted/.del-tcl_ext.h~6004cb009c5424ee:
Delete: bdb/dbinc_auto/tcl_ext.h
BitKeeper/deleted/.del-txn_ext.h~c30807d88c7b11ea:
Delete: bdb/dbinc_auto/txn_ext.h
BitKeeper/deleted/.del-xa_ext.h~3f131d16d9cc5e:
Delete: bdb/dbinc_auto/xa_ext.h
bdb/java/src/com/sleepycat/db/Db.java.in:
Rename: bdb/java/src/com/sleepycat/db/Db.java -> bdb/java/src/com/sleepycat/db/Db.java.in
bdb/dist/s_java:
avoid in-place editing
bdb/dist/s_rpc:
be consistent
2002-11-11 17:17:28 +01:00
unknown
79f8a525a3
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-11 17:47:07 +02:00
unknown
736e3c3c17
some bug fixes related to derived tables
2002-11-11 17:45:23 +02:00
unknown
6ffc1c5e90
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-11 17:29:25 +02:00
unknown
b7d3c9ca6b
fixed select_lex & max_join_size parameters with BIG_TABLES
...
sql/set_var.h:
new constaructor
2002-11-11 17:28:58 +02:00
unknown
84b95682cf
USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
...
Bug fix in ctype-utf8.c
sql/item_strfunc.cc:
USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
sql/item_strfunc.h:
USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
sql/procedure.h:
USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
strings/ctype-utf8.c:
Bug fix
2002-11-11 18:43:33 +04:00
unknown
50b32edc76
thread charset related improvements
2002-11-11 16:46:11 +04:00