hf@deer.mysql.r18.ru
96089e2b3a
resolving conflicts
2003-01-15 13:15:35 +04:00
hf@deer.mysql.r18.ru
c59bff7c96
SCRUM
...
embedded library trimming
2003-01-15 12:11:44 +04:00
monty@mashka.mysql.fi
c9dc5a206b
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
2003-01-09 22:43:23 +02:00
bar@bar.mysql.r18.ru
a89df5a096
Separating CHARSET and COLLATION terms
2003-01-09 15:37:59 +04:00
monty@mashka.mysql.fi
f8e660d88c
merge with 4.0.9
...
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
2003-01-09 03:55:26 +02:00
miguel@hegel.br
aa51a87283
Fix embedded server crash
2003-01-07 23:46:30 -02:00
monty@mashka.mysql.fi
f9772317ee
merge
2003-01-04 15:40:55 +02:00
bar@bar.mysql.r18.ru
a172e5ad2a
Some changes to separate charset and collation terms
2003-01-04 14:12:20 +04:00
monty@mashka.mysql.fi
07daf3169e
Merge with 4.0.8
2003-01-03 00:04:33 +02:00
bell@sanja.is.com.ua
7c0a074614
merging
2002-12-31 12:55:03 +02:00
Sinisa@sinisa.nasamreza.org
a4a80302b8
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-30 19:42:03 +02:00
miguel@hegel.br
f43ebb83db
Fix compiler warnings removing unreferenced variables
2002-12-29 21:50:52 -02:00
bell@sanja.is.com.ua
fe9e139056
postreview fix (SCRUM)
...
fixed layout
2002-12-28 01:01:05 +02:00
Sinisa@sinisa.nasamreza.org
5988ae5ca5
Many fixes.
...
I still have to make a test case for :
UPDATE from sub-select with derived table
2002-12-24 13:58:07 +02:00
monty@mashka.mysql.fi
b5aa9ae0c7
Changed thd variables max_join_size and select_limit to type ha_rows.
...
This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug
2002-12-20 14:58:27 +02:00
hf@deer.mysql.r18.ru
8a205e4ba3
Merge
2002-12-19 14:57:24 +04:00
bar@bar.mysql.r18.ru
6ac401b550
thd_charset has been moved to variables structure
2002-12-19 09:38:28 +04:00
hf@deer.mysql.r18.ru
bb67600df4
Merging
2002-12-17 19:57:23 +04:00
bar@bar.mysql.r18.ru
0ce4ae35e5
Some fixes to get closer to UCS2 compatible SHOW FIELDS
2002-12-17 14:35:19 +04:00
hf@deer.mysql.r18.ru
c1e69d2cca
Merging
2002-12-16 18:58:55 +04:00
hf@deer.mysql.r18.ru
e3b3b68307
Big purge about embedded library (scrum)
2002-12-16 17:33:29 +04:00
monty@mashka.mysql.fi
d49167bae5
Fixes for binary protocol (complement to last push)
...
Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format.
DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types.
Now all tests passes, still some work left to remove warnings in log files from mysql-test-run
2002-12-14 17:43:01 +02:00
hf@deer.mysql.r18.ru
dcb5293576
Some fixes
2002-12-12 12:16:34 +04:00
monty@mashka.mysql.fi
146814f2ea
Merge with 3.23
2002-12-11 13:32:31 +02:00
monty@mashka.mysql.fi
c1b233ec55
Fixed rare bug in show processlist which could cause core dump if a new thread was connecting.
2002-12-11 12:44:17 +02:00
monty@mashka.mysql.fi
d3eb993a27
rename of net_pkg.cc to protocol.cc
...
Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
2002-12-11 09:17:51 +02:00
Sinisa@sinisa.nasamreza.org
9b331dc354
Proper fix for SHOW VARS on 64-bit systems
2002-12-02 15:33:16 +02:00
Sinisa@sinisa.nasamreza.org
2c7c19769a
moving fix elsewhere ...
2002-12-02 15:12:56 +02:00
hf@genie.(none)
5e8b27c0d3
Pull conflicts resolutions
2002-11-29 12:35:48 +04:00
Sinisa@sinisa.nasamreza.org
c2dcead168
Better fix for 64 bit CPU ..
2002-11-28 16:37:58 +02:00
Sinisa@sinisa.nasamreza.org
4198b25569
fix for SHOW VARS for IA64 and other 64 bit systems
2002-11-27 18:05:41 +02:00
monty@mashka.mysql.fi
dac6498f9b
Merge with 4.0
2002-11-21 15:56:48 +02:00
ram@mysql.r18.ru
9818ac9258
added 'USING BTREE' for 'show create table' for HEAP
2002-11-19 19:58:46 +04:00
monty@mashka.mysql.fi
7a70332836
Portability fix when using -DBIG_TABLES
2002-11-14 12:21:36 +02:00
bar@bar.mysql.r18.ru
098b974483
For coding convenuence cs->mbmaxlen is now 1 for 8bit charsets
2002-11-11 13:10:39 +04:00
hf@genie.(none)
a6b0579fcd
Some code improvements
2002-10-23 16:55:35 +05:00
hf@genie.(none)
8a88791fb1
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
...
into genie.(none):/home/hf/work/mysql-4.1
2002-10-18 15:55:21 +05:00
monty@narttu.mysql.fi
3c7f6a9835
merge
2002-10-14 12:07:16 +03:00
hf@genie.(none)
2be6f27219
Changes in order to trim embedded library code
2002-10-13 14:23:55 +05:00
bar@bar.mysql.r18.ru
11a93ede41
Some reorganization to use less memory as well as to hide some implementation
...
aspects into *.c files from *.h files. Some steps to get closer to generating
*.c files from *.conf files again.
2002-10-10 15:52:32 +05:00
monty@narttu.mysql.fi
da2abaf887
Portability fixes to be able to compile MySQL with VC++
2002-10-08 22:28:24 +03:00
hf@genie.(none)
55866b0615
Huge pull
2002-10-07 15:38:07 +05:00
monty@mashka.mysql.fi
0f39457613
Merge with 4.0.4
2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
a748b35ddd
merge with work
2002-10-02 13:45:16 +03:00
monty@mashka.mysql.fi
d69250a969
Fixes and code cleanups after merge with 4.0.3
...
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
2002-10-02 13:33:08 +03:00
bar@bar.mysql.r18.ru
d1d725c5a1
SHOW TABLE STATUS now displays table charset as well
2002-10-01 13:54:59 +05:00
monty@mashka.mysql.fi
378d977d28
Merge with 3.23.53
2002-09-22 10:59:33 +03:00
monty@mashka.mysql.fi
755d4952af
Change name -> alias in TABLE_LIST.
...
Added missing mutex-lock around critical section in GRANT handling.
2002-09-21 21:36:23 +03:00
monty@mashka.mysql.fi
cb8580a2cd
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
...
This should fix some issues where --lower-case-table-names doesn't work properly under windows.
2002-09-20 14:05:18 +03:00
hf@genie.(none)
c8627ff18d
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
...
into genie.(none):/home/hf/work/mysql-4.1
2002-09-17 10:50:25 +05:00
