mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7275 commits 2784 branches 343 tags 1.6 GiB
Commit graph

3296 commits

Author SHA1 Message Date
heikki@hundin.mysql.fi
bd8c8522dc ha_innodb.cc: 
Since MySQL uses HA_READ_PREFIX_LAST in a wrong place, we make InnoDB to convert it to a right search condition
 2003-02-07 13:28:18 +02:00
monty@mashka.mysql.fi
564c447b27 Allow 4.0 to read new 4.1 .frm files 2003-02-07 10:35:08 +02:00
monty@mashka.mysql.fi
cf9668fd37 Added START TRANSACTION syntax 
Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement)
 2003-02-06 16:55:59 +02:00
venu@myvenu.com
0516b2bfee Windows compile fixups (To be verified by respective devs) 2003-02-04 18:50:48 -08:00
heikki@hundin.mysql.fi
a30d3cd847 ha_innobase.cc: 
Backport from 4.0: fix potential bug if store_lock is called with TL_IGNORE in the middle of a query
 2003-02-05 01:42:07 +02:00
heikki@hundin.mysql.fi
a2de9c66f5 ha_innodb.cc: 
Fix potential bug: if MySQL calls store_lock with the TL_IGNORE argument in the middle of query processing, then InnoDB select_lock_type could be reset to LOCK_NONE in a wrong place
 2003-02-05 01:24:59 +02:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
monty@mashka.mysql.fi
6a32ae7355 After merge fix 2003-02-04 06:44:29 +02:00
monty@mashka.mysql.fi
aee15a4407 merge 2003-02-04 03:27:47 +02:00
monty@mashka.mysql.fi
303c3e30ab Added charset number to result header 2003-02-04 03:19:19 +02:00
monty@mashka.mysql.fi
59400e211f Fixed bug in ulonglong parsing for constructs that only takes unsigned longlong as parameter. 2003-02-04 01:05:39 +02:00
monty@mashka.mysql.fi
e3cd63521c Fix for MIN/MAX with empty tables 
MIN(key_column) could in some cases return NULL on a column with NULL and other values.
MIN(key_column) and MAX(key_column) could in some cases return wrong values when used in OUTER JOIN.
 2003-02-03 20:20:32 +02:00
bell@sanja.is.com.ua
62902a3b4b after-review changes (577 SCRUM) 2003-02-02 23:30:01 +02:00
bell@sanja.is.com.ua
291f8a225a Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1
 2003-02-02 17:39:27 +02:00
monty@mashka.mysql.fi
c42e94a6e6 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-02-02 05:13:51 +02:00
monty@mashka.mysql.fi
a9ee051a4d Fixed core dump bug in 'mysql' when using \p in prompt on Windows. 
Fixed error when mysql_unix_port pointed to const string (not uncommon on windows)
 2003-02-02 05:13:09 +02:00
bar@bar.mysql.r18.ru
73bd2ad74a Some USE_MB have been removed. 2003-01-31 17:37:28 +04:00
bar@bar.mysql.r18.ru
4f62ac93f0 More use of new CHARSET_INFO functions and two bug fixes 2003-01-31 17:08:14 +04:00
gluh@gluh.mysql.r18.ru
7cfbabd807 Changed ROW_RESULT to default 2003-01-31 14:07:07 +04:00
bar@bar.mysql.r18.ru
22564bc91e sql_string.cc: 
Use of new CHARSET_INFO function
 2003-01-31 14:01:49 +04:00
venu@myvenu.com
913457bfa8 Merge work.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/bk/src-4.1
 2003-01-31 00:52:54 -08:00
venu@myvenu.com
b300b67358 Merge myvenu.com:/home/venu/bk/src-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-01-31 00:36:07 -08:00
venu@myvenu.com
fdc48a0597 Fix for subsequent error calls in multi-query 2003-01-31 00:35:06 -08:00
bar@bar.mysql.r18.ru
37fdb93d7c Gluh asked me to do it 2003-01-31 11:41:39 +04:00
gluh@gluh.mysql.r18.ru
c7485119ab Fix for mysqlbinlog compilation 2003-01-31 10:28:13 +04:00
gluh@gluh.mysql.r18.ru
8d3c43880d conflicts resolving 2003-01-31 09:43:53 +04:00
bell@sanja.is.com.ua
e294751c41 fixed bug in determinating uncacheable queries 
new fatal_error interface to assign is_fatal_error and ne.report_error
commant about Item_row
 2003-01-30 22:15:44 +02:00
gluh@gluh.mysql.r18.ru
57a805de6c 'Replicate user variables' task 2003-01-30 21:39:54 +04:00
wax@mysql.com
08f006858c Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4rw 2003-01-30 21:23:58 +05:00
bell@sanja.is.com.ua
2f04313db5 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 18:19:28 +02:00
wax@mysql.com
136c2d3104 Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4rw 2003-01-30 21:15:21 +05:00
bell@sanja.is.com.ua
37d228e623 changes based on partial revie of task 577 (SCRUM) 2003-01-30 18:07:39 +02:00
serg@serg.mysql.com
45ed0a0841 Merge work:/home/bk/mysql-4.0 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2003-01-30 16:02:11 +01:00
bell@sanja.is.com.ua
5ed5dac01b cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation 2003-01-30 14:35:07 +02:00
venu@myvenu.com
81c580af37 Merge conflict 2003-01-30 01:02:57 -08:00
venu@myvenu.com
7e09f1db4b Fix 'n' concurrent prepared executions 2003-01-30 00:38:11 -08:00
bell@sanja.is.com.ua
0469dd4993 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
bar@bar.mysql.r18.ru
9a837a873e Always use USE_STRCOLL code 2003-01-30 11:15:14 +04:00
bar@bar.mysql.r18.ru
6f25c7d9a9 cp1256.xml: 
Fix
 2003-01-30 10:04:02 +04:00
bell@sanja.is.com.ua
7467708611 fixed compiler error 2003-01-29 21:17:46 +02:00
bell@sanja.is.com.ua
a662f7e105 fixed row items with group functions 
fixed layout
 2003-01-29 20:44:47 +02:00
bell@sanja.is.com.ua
9525a58132 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-29 19:46:11 +02:00
bell@sanja.is.com.ua
214036a7f6 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
 2003-01-29 19:42:39 +02:00
monty@mashka.mysql.fi
9e3fd09305 merge with 3.23.56 to get patches for --lower-case-table-names and 
proper handling of SUM() in some functions.
 2003-01-29 19:22:22 +02:00
monty@mashka.mysql.fi
b025fa8b32 Fixed compilation error on windows 2003-01-29 19:10:33 +02:00
monty@mashka.mysql.fi
f2299ee72f Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2003-01-29 18:56:59 +02:00
monty@mashka.mysql.fi
d88eb71f34 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.
 2003-01-29 18:56:34 +02:00
bar@bar.mysql.r18.ru
735399a850 Move latin1 into a separarte file 2003-01-29 17:31:20 +04:00
bar@bar.mysql.r18.ru
08129eea2b Reorganization to restore generating charset C files from conf files 2003-01-29 15:08:09 +04:00
bell@sanja.is.com.ua
fd2e31756b 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-29 11:03:53 +02:00
bell@sanja.is.com.ua
c6beb583f6 fixed functions to be able work with group function as argument 
made bisone 1.75 compatible code
 2003-01-29 10:38:56 +02:00
venu@myvenu.com
8673530904 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
heikki@hundin.mysql.fi
d2328365e0 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
heikki@hundin.mysql.fi
2db574ea19 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
bell@sanja.is.com.ua
d0d375c437 fixed memory leak in ROW code (SCRUM 577) 2003-01-28 22:28:11 +02:00
peter@mysql.com
91747f0e2c 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
monty@mashka.mysql.fi
7811a61b5d merge 2003-01-28 20:59:41 +02:00
monty@mashka.mysql.fi
3d28913740 Only write to the error log if --log-error is specified and --console is not specified 
(On Windows --log-error is enabled by default)
 2003-01-28 20:56:35 +02:00
peter@mysql.com
682cca2e75 Fix predicted first rand() call 2003-01-28 20:33:47 +03:00
venu@myvenu.com
79e1fd8d0e Fix leak when the client disconnects with open prep statements 2003-01-28 09:24:27 -08:00
hf@deer.mysql.r18.ru
d38c66b1ed SIGNAL_WITH_VIO_CLOSES bugfix 2003-01-28 21:03:05 +04:00
serg@serg.mysql.com
1ced5948f0 low-level error messages cleanup 2003-01-28 17:42:08 +01:00
miguel@hegel.local
ce37b7aac4 Use on Unix hostname.err only when --log-error=path. 
Asked by Heikki and Peter.
 2003-01-28 13:50:36 -02:00
serg@serg.mysql.com
9199252c22 Merge work:/home/bk/mysql-4.0 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2003-01-28 14:37:12 +01:00
serg@serg.mysql.com
4fb3244014 fixed "DROP table_open_in_handler" hang 2003-01-28 14:36:22 +01:00
bell@sanja.is.com.ua
d39a2c0afc Merge 2003-01-28 15:34:59 +02:00
bell@sanja.is.com.ua
0c5b323d0f 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
 2003-01-28 14:48:12 +02:00
hf@deer.mysql.r18.ru
cff4a43711 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-default
 2003-01-28 15:06:23 +04:00
bar@bar.mysql.r18.ru
f815e9b812 resolve 2003-01-28 15:03:33 +04:00
bar@bar.mysql.r18.ru
a292d4f632 New "fill" function in charset_info_st structure 2003-01-28 14:58:06 +04:00
hf@deer.mysql.r18.ru
6bca9b7034 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-default
 2003-01-28 12:59:07 +04:00
monty@mashka.mysql.fi
6b71279382 merge 2003-01-28 09:02:51 +02:00
monty@mashka.mysql.fi
152f0603e7 Merge with 3.23.56 (Replace manual with 'empty' document) 
Fix for bug when using auto_increment column and LAST_INSERT_ID()
 2003-01-28 08:51:03 +02:00
monty@mashka.mysql.fi
689578a099 Fixes for Netware 
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
 2003-01-28 08:38:28 +02:00
monty@mashka.mysql.fi
710ffb2d89 Fix when using auto_increment and last_insert_id() in the same insert statement. 2003-01-28 06:48:26 +02:00
serg@serg.mysql.com
52e440b9a7 Merge work:/home/bk/mysql-4.0 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2003-01-28 00:57:13 +01:00
serg@serg.mysql.com
78f492b112 do not force CONNECTION_ID(), FOUND_ROWS(), PI(), CURRENT_USER(), 
and VERSION() to be uppercase in e.g. "select pi()"
 2003-01-28 00:55:41 +01:00
wax@mysql.com
d844f8d02d correct parameter of hash_search 2003-01-28 03:28:06 +05:00
Administrador@light.
826993bba2 Added option hostname.err 2003-01-27 15:37:25 -02:00
serg@serg.mysql.com
7a7066ef9d 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
bar@bar.mysql.r18.ru
106b21bd85 field.cc: 
Use cs->scan() instead of my_isspace()
 2003-01-27 18:46:51 +04:00
serg@serg.mysql.com
c37fff13d5 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
serg@serg.mysql.com
335f013161 select count(*) from t1 procedure analyse(); bug fixed 2003-01-27 15:37:05 +01:00
bar@bar.mysql.r18.ru
8f08afdf79 field.cc: 
tis620 normalization will be implemented ad a SQL function, without automatic normalization on INSERT
 2003-01-27 17:31:46 +04:00
bar@bar.mysql.r18.ru
b92ed69491 wb_wc and wc_mb now checks length inside 2003-01-27 16:46:03 +04:00
lenz@mysql.com
82aca82da0 - added a dummy file "reservedwords.texi" to the BK tree and the Makefiles, 
so it's part of the distribution (manual.texi includes this file)
   It will be replaced with the correct one from the mysqldoc tree before
   building the distribution
 - removed generation and inclusion of MIRRORS file, since the mirror list
   is no longer part of manual.texi anyway
 - replaced YFLAGS with AM_YFLAGS in sql/Makefile.am to make automake happy
 - Redirect standard error when checking for dpkg-architecture in ltconfig
   to avoid error message showing during configuration
 2003-01-27 13:44:16 +01:00
serg@serg.mysql.com
5f6b6fa3b3 fixes for SHOW VARIABLES and --ft-stopword-list 2003-01-27 12:12:12 +01:00
serg@serg.mysql.com
4b61ba5a89 ft_stopword_file added to 'SHOW VARIABLES' output 2003-01-27 11:15:54 +01:00
bar@bar.mysql.r18.ru
7e38aa4b19 sql_yacc.yy: 
Semicolon has been added
 2003-01-27 13:46:33 +04:00
bell@sanja.is.com.ua
5469c014e3 Merge sanja.is.com.ua:/home/bell/mysql/work-leak-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1
 2003-01-26 21:34:14 +02:00
bell@sanja.is.com.ua
760e22f0bb after merge fix of 577 task (SCRUM, pre commit to be able to merge with static tables optimization fix) 
fixed derived tables with subselect inside
 2003-01-26 21:30:35 +02:00
bell@sanja.is.com.ua
c80f766ea2 removed switching off static table optimization for subselects (SCRUM , pre-commit to be able merge with temporary table fix) 2003-01-26 21:13:37 +02:00
serg@serg.mysql.com
2fd8380c0c making the keyword ROW for row items optional 2003-01-26 20:01:45 +01:00
serg@serg.mysql.com
b031f5f43c Merge work:/home/bk/mysql-4.0 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2003-01-26 12:33:42 +01:00
wax@mysql.com
dfed401e69 correct parameter of hash_result 
(SCRUM)
 2003-01-26 07:00:01 +05:00
monty@mashka.mysql.fi
1bdd1d0626 Merge with 3.23.55 2003-01-25 15:31:07 +02:00
monty@mashka.mysql.fi
fa7a94ed14 Added timeout for wait_for_master_pos 
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
 2003-01-25 15:07:51 +02:00
bell@sanja.is.com.ua
44d8a8cdab merging 2003-01-25 13:19:46 +02:00
bell@sanja.is.com.ua
d56e23f64e fixed subselects with temporary tables (SCRUM) 
fixed memory leacks
 2003-01-25 02:25:52 +02:00
venu@myvenu.com
04f16d9f6f MYSQL_TIME handling(Direct DATE,TIME and TS th' structure) - server 2003-01-23 22:32:39 -08:00
heikki@hundin.mysql.fi
d62ef3a0d9 ha_innodb.cc: 
Temporary fix to make the new client/server protocol to work: fetch all columns in an index, even if not needed by the SELECT statement; Monty has to fix the parser to tell InnoDB what to fetch
 2003-01-24 04:47:06 +02:00
bell@sanja.is.com.ua
9ec97f2c08 fixed table invalidation in simple renaming 2003-01-24 01:54:39 +02:00
monty@mashka.mysql.fi
9af5e6b70a Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements) 2003-01-23 21:49:28 +02:00
Sinisa@sinisa.nasamreza.org
a90a0cc966 small fix for SHOW STATUS 2003-01-23 15:49:56 +02:00
serg@serg.mysql.com
274df58118 --ft_stopword_file command-line option 2003-01-23 13:20:37 +01:00
serg@serg.mysql.com
1fe18bea46 fixed "double Procedure::~Procedure" bug 2003-01-23 00:03:40 +01:00
hf@deer.mysql.r18.ru
524e33eb59 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-default
 2003-01-22 20:51:54 +04:00
pem@mysql.com
d9d5ddb52d Fixed bug in Protocol::convert_str() (missing return caused "Out of memory" errors 
when optimized).
 2003-01-22 17:51:53 +01:00
hf@deer.mysql.r18.ru
e2d991795c SCRUM 
DEFAULT in SELECT & UPDATE corrections
 2003-01-22 20:08:12 +04:00
serg@serg.mysql.com
897b165bda workaround for gcc bug 2003-01-22 15:05:37 +01:00
monty@mashka.mysql.fi
7436e9ec97 Merge 2003-01-21 21:28:51 +02:00
monty@mashka.mysql.fi
25c393a12e Portability fixes (for windows) 
Some changes to the prepared statement protocol to make it easier to use and faster.
 2003-01-21 21:07:59 +02:00
hf@deer.mysql.r18.ru
87681bb85e Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-default
 2003-01-21 20:24:22 +04:00
hf@deer.mysql.r18.ru
9fb261e384 SCRUM 
Default in UPDATE & SELECT
 2003-01-21 20:20:46 +04:00
serg@serg.mysql.com
0a4ca15dc6 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2003-01-21 16:11:07 +01:00
serg@serg.mysql.com
f028989bad fixed double-free bug in COM_CHANGE_USER 2003-01-21 16:07:31 +01:00
Sinisa@sinisa.nasamreza.org
8b82ebc450 Merge sinisa@work.mysql.com:/home/bk/mysql 
into sinisa.nasamreza.org:/mnt/work/mysql
 2003-01-21 16:11:01 +02:00
Sinisa@sinisa.nasamreza.org
74f478f9a5 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-01-21 15:54:36 +02:00
bell@sanja.is.com.ua
62c02d4b45 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1
 2003-01-21 15:31:04 +02:00
Sinisa@sinisa.nasamreza.org
70dfa42258 resolve fix 2003-01-21 14:57:33 +02:00
Sinisa@sinisa.nasamreza.org
3e302c524e A small fix for privilege system as reported by HF. 2003-01-21 14:50:55 +02:00
bell@sanja.is.com.ua
8aabee290d Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1
 2003-01-21 14:03:30 +02:00
bell@sanja.is.com.ua
372e2130e4 fixed test of cardinality 2003-01-21 13:55:26 +02:00
hf@deer.mysql.r18.ru
4fa14086ad fix removation 2003-01-21 15:54:14 +04:00
hf@deer.mysql.r18.ru
7d20900c6d Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.w1
 2003-01-21 09:46:07 +04:00
hf@deer.mysql.r18.ru
e757e47e7f small fix 2003-01-21 09:45:05 +04:00
heikki@hundin.mysql.fi
d3145a9135 ha_innobase.cc: 
Backport from 4.0: convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table
 2003-01-21 00:44:49 +02:00
heikki@hundin.mysql.fi
ff4ef4c4e7 ha_innodb.cc: 
Convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table
 2003-01-21 00:38:55 +02:00
venu@myvenu.com
fc94598773 Merge work.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/bk/src-4.1
 2003-01-20 14:07:10 -08:00
venu@myvenu.com
643264db2c Multi query fix the recursion (SCRUM - For Monty) 2003-01-20 14:00:50 -08:00
heikki@hundin.mysql.fi
a4a95cb217 ha_innodb.cc: 
Remove the question of Monty about user_thd / NULL after a merge from 4.0 to 4.1, user_thd is the right value in 4.1
 2003-01-20 23:39:28 +02:00
monty@mashka.mysql.fi
6522ee6c98 Merge with 4.0 (Fix bug in LEFT JOIN and EXPLAIN on empty table) 2003-01-20 18:48:10 +02:00
monty@mashka.mysql.fi
fab7f39e42 Fixed bug with EXPLAIN on empty table 2003-01-20 18:17:14 +02:00
hf@deer.mysql.r18.ru
389680e04e Conflicts resolving 2003-01-20 18:59:45 +04:00
hf@deer.mysql.r18.ru
1f6b615677 SCRUM 
embedded-related changes
 2003-01-20 18:47:25 +04:00
wax@mysql.com
272354b1a2 delete name_length and change an assign of udf.name (SCRUM) 2003-01-20 02:58:21 +05:00
monty@mashka.mysql.fi
a5e30be0d0 Fixed bug in LEFT JOIN with impossible ON/WHERE expression 2003-01-19 17:15:14 +02:00
monty@mashka.mysql.fi
d14db3961d Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2003-01-19 02:28:36 +02:00
monty@mashka.mysql.fi
12ab0651c6 merge with 4.0 to get bug fix for SHOW PROCESSLIST + connected slave 2003-01-19 02:28:07 +02:00
monty@mashka.mysql.fi
183df2da7f Fixes cases where thd->query was not protected. 
This fixes a problem with SHOW PROCESSLIST
 2003-01-19 02:00:26 +02:00
monty@mashka.mysql.fi
fb4572a498 Merge with 3.23 to get bug fix for SHOW PROCESSLIST + running thread 2003-01-19 01:31:43 +02:00
venu@myvenu.com
e0a79dc112 Windows build fix 2003-01-18 14:04:34 -08:00
monty@mashka.mysql.fi
dd4d4cc8b5 Only set thd->query to 0 if LOCK_thread_count is hold 
This fixes a possible core dump problem in SHOW PROCESSLIST
 2003-01-18 23:38:55 +02:00
venu@myvenu.com
9305ee0d54 Merge myvenu.com:/home/venu/bk/src-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-01-18 12:59:33 -08:00
venu@myvenu.com
04f20910e3 Few more tests + store_result fix 2003-01-18 12:58:19 -08:00
venu@myvenu.com
082f7c9bda Merge work.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/bk/src-4.1
 2003-01-18 11:59:36 -08:00
monty@mashka.mysql.fi
46ec0c5d33 Removed compiler warnings 2003-01-18 21:55:01 +02:00
venu@myvenu.com
a39da98d0d Initial multi query execution support 2003-01-18 11:53:38 -08:00
monty@mashka.mysql.fi
88cd4126e4 Simple code cleanups, ignore generated files 2003-01-18 19:31:38 +02:00
monty@mashka.mysql.fi
529e4a76c5 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2003-01-18 19:31:37 +02:00
monty@mashka.mysql.fi
8acc22296c Change client_flag to unsigned long (16 -> 32 bits) to handle more options. 
Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows
 2003-01-18 16:39:21 +02:00
Sinisa@sinisa.nasamreza.org
efb79be3ac some code clean-up and small bug fix. 2003-01-18 16:23:37 +02:00
hf@deer.mysql.r18.ru
c66302c23b Superfluous prepare_for_resend bugfix 2003-01-18 16:20:22 +04:00
monty@mashka.mysql.fi
76f146a175 Merge with 4.0.9 2003-01-18 03:13:37 +02:00
monty@hundin.mysql.fi
1b03f00710 merge 2003-01-17 21:41:38 +02:00
bell@sanja.is.com.ua
d4abbb0d9f Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-ctype-4.1
 2003-01-17 20:49:47 +02:00
vva@eagle.mysql.r18.ru
23ed6656d3 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear
 2003-01-17 22:49:46 +04:00
vva@eagle.mysql.r18.ru
05aa563043 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear
 2003-01-17 22:04:43 +04:00
vva@eagle.mysql.r18.ru
1b25ee3579 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1 
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear
 2003-01-17 21:59:03 +04:00
vva@eagle.mysql.r18.ru
4b5a313c1a new option --local-load in mysqlbinlog 2003-01-17 21:52:56 +04:00
monty@mashka.mysql.fi
4a5ecc92be merge 2003-01-17 16:45:17 +02:00
monty@mashka.mysql.fi
762cb225c9 Changed my_strntoxxx functions to clear error number on start 
Allow one to change ANSI_QUOTES mode per thread and on the fly
 2003-01-17 16:33:54 +02:00
monty@mashka.mysql.fi
9fb477569b Fixed bug with the --slow-log when logging an administrator command 
(like FLUSH TABLES).
(Code is already in 4.0)
 2003-01-17 15:56:16 +02:00
bell@sanja.is.com.ua
6424fdf1dd Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-ctype-4.1
 2003-01-17 15:43:39 +02:00
bell@sanja.is.com.ua
1dde85db7c using internal name conversion in query cache as it was suggested by Shurik 2003-01-17 15:36:08 +02:00
Sinisa@sinisa.nasamreza.org
90adbe6f45 Merge sinisa@work.mysql.com:/home/bk/mysql 
into sinisa.nasamreza.org:/mnt/work/mysql
 2003-01-17 15:15:27 +02:00
Sinisa@sinisa.nasamreza.org
fe5e05cd90 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-01-17 14:52:50 +02:00
gluh@gluh.mysql.r18.ru
f2a193521e Merge sgluhov@work.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.upd
 2003-01-17 16:40:54 +04:00
gluh@gluh.mysql.r18.ru
6ac602142a Replication: Optimize away string.append 
Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat
Fixed rpl_temporary test
 2003-01-17 16:39:29 +04:00
monty@mashka.mysql.fi
9fb3f5aa1a Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2003-01-17 14:23:48 +02:00
Sinisa@sinisa.nasamreza.org
47d44c129e Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-01-17 14:09:44 +02:00
serg@serg.mysql.com
19e81a98e2 Merge work:/home/bk/mysql-4.0 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2003-01-17 12:48:47 +01:00
serg@serg.mysql.com
390982aaa3 bugfix for MERGE tables and MAX(key) 2003-01-17 12:48:23 +01:00
miguel@hegel.local
08aaa21b6e Merge miguel@work.mysql.com:/home/bk/mysql-4.0 
into hegel.local:/home/miguel/dev/mysql-4.0
 2003-01-16 22:31:54 -04:00
miguel@hegel.local
e2548b3fa5 Fix VC++ error compiler 2003-01-16 22:29:24 -04:00
venu@myvenu.com
51eb44c9e6 Merge work.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/bk/src-4.1
 2003-01-16 15:47:46 -08:00
venu@myvenu.com
c2ddffb4a2 Remove un-used code 2003-01-16 14:57:49 -08:00
heikki@hundin.mysql.fi
9a2afb60c7 ha_innodb.cc: 
Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST
 2003-01-17 00:50:27 +02:00
monty@mashka.mysql.fi
f4b950df96 Merge with 3.23 2003-01-16 20:47:46 +02:00
monty@mashka.mysql.fi
6250c1d974 Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2003-01-16 20:12:00 +02:00
bar@bar.mysql.r18.ru
4f9d82700d strnto family functions now return error in a new argument 2003-01-16 17:17:07 +04:00
serg@serg.mysql.com
c16e908a2b bugfix for 'ANALYZE for MERGE' and table-less MERGE table 2003-01-16 13:23:33 +01:00
bar@bar.mysql.r18.ru
4a77f335f4 field.cc: 
strnxfrm for binary and simple charsets
 2003-01-16 15:52:37 +04:00
bar@bar.mysql.r18.ru
4b9d29c83b strnxfrm() for simple and binary charsets fixes 2003-01-16 15:20:38 +04:00
heikki@hundin.mysql.fi
01573f0d95 ha_innodb.cc: 
Backport from 4.1: make sure change_active_index is only called with a properly initialized InnoDB table handle
 2003-01-16 08:06:43 +02:00
heikki@hundin.mysql.fi
0efc57eed6 ha_innodb.cc: 
Make SHOW INNODB STATUS aware when we are estimating index range size etc.
 2003-01-16 07:15:55 +02:00
jani@rhols221.adsl.netsonic.fi
e79ed81d11 Added --compatible mode to mysqldump. 2003-01-16 05:35:59 +02:00
jani@rhols221.adsl.netsonic.fi
94cc7d751e Added support sql_mode, which can be used to produce various outputs 
of SHOW CREATE TABLE 'name'. Depending on the mode, the output can
be compatible with various databases, including earlier versions of
MySQL
.
 2003-01-16 02:04:50 +02:00
heikki@hundin.mysql.fi
7433ffe880 ha_innobase.cc: 
Backport from 4.0: fix possible adaprive hash index latch hang
 2003-01-16 01:13:50 +02:00
heikki@hundin.mysql.fi
c228dfacdf ha_innodb.cc: 
Fix a typo
 2003-01-16 01:07:08 +02:00
heikki@hundin.mysql.fi
d7cc9da9b6 ha_innodb.cc: 
Fix a possible hang at the adaptive hash index latch if MySQL does query estimations also in the middle of a SELECT statement processing
 2003-01-16 00:44:27 +02:00
bar@bar.mysql.r18.ru
5743f94b57 All charsets now have strnxfrm. 
Some function names have been renamed to be more self-descriptive
 2003-01-15 18:06:07 +04:00
Sinisa@sinisa.nasamreza.org
3f30ccd85b Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-01-15 16:00:43 +02:00
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
bell@sanja.is.com.ua
809af00b06 Merge abelkin@work.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
 2003-01-14 19:18:09 +02:00
bell@sanja.is.com.ua
9e9ea3504f after merging fixing 2003-01-14 18:00:34 +02:00
bar@bar.mysql.r18.ru
09eac4793b bin chatset now handles strnncoll itself so we don't have to check 
if charset is binary anymore
 2003-01-14 18:28:50 +04:00
Sinisa@sinisa.nasamreza.org
2325a5f600 reverting a fix 2003-01-14 16:15:09 +02:00
monty@mashka.mysql.fi
22b7e67b0b merge 2003-01-14 14:33:10 +02:00