1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Commit Graph

2146 Commits

Author SHA1 Message Date
unknown
db85094bc5 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-10-14 10:44:17 +00:00
unknown
6fc7e94616 merge
client/mysql.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
2002-10-14 12:07:16 +03:00
unknown
a299a27021 fixed bug of multi-level EXPLAIN
mysql-test/r/subselect.result:
  test of multi-level EXPLAIN
mysql-test/t/subselect.test:
  test of multi-level EXPLAIN
2002-10-13 14:25:16 +03:00
unknown
228bfb05e3 Two bug fixes
Docs/manual.texi:
  added text for fixes
mysql-test/r/multi_update.result:
  new test case for multi-table deletes
mysql-test/t/multi_update.test:
  new test case for multi-table deletes
sql/sql_delete.cc:
  fix for multi-table deletes
sql/sql_update.cc:
  fix for multi-table updates
2002-10-12 21:36:39 +03:00
unknown
2b70d7e567 --tmpdir=dir1:dir2... uses (is_windows ? ";" : ":") as a delimiter 2002-10-12 17:43:40 +00:00
unknown
c05fc7c9bd Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


include/my_sys.h:
  Auto merged
mysys/Makefile.am:
  Auto merged
2002-10-12 17:40:57 +00:00
unknown
70a1cebb88 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-10-12 15:52:51 +03:00
unknown
8926c0bc38 Fixed bug where we could reference a freed tmp_table->table_name variable for some
GROUP BY ... ORDER BY queries.


Docs/manual.texi:
  ChangeLog
2002-10-12 12:38:48 +03:00
unknown
9bca9fb751 Task 430: Allowing braces in joins by simply removing them.
This is a simple fix, allowing a join_table_list in the right reduction of a
normal_join sequence, instead of just a join_table. This makes things like
"t1, (t2 left join t3)" work, but it also allows "join" and "cross join" instead
of ",".

This should fix the bug reported as:
  Subject: ODBC SQL syntax issue 
  From: Ivan Vazharov 
  Date: Mon, 30 Sep 2002 12:02:42 +0200 


mysql-test/r/select.result:
  Results from new test cases for removing braces in joins.
mysql-test/t/select.test:
  New test cases for removing braces in joins.
sql/sql_yacc.yy:
  Allow (and remove) braces in all parts of a normal_join list, not just the
  first one.
  Also added three missing ';'.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-12 11:07:54 +02:00
unknown
102cec1465 fixed subselect * bug
mysql-test/r/subselect.result:
  test of subselect * bug
mysql-test/t/subselect.test:
  test of subselect * bug
2002-10-12 01:09:47 +03:00
unknown
c41f19c2d5 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_class.cc:
  Auto merged
2002-10-11 21:50:38 +03:00
unknown
e6403485ed SCRUM task
mysql-test/r/select.result:
  SELECT ... INTO user_variables
mysql-test/t/select.test:
  SELECT ... INTO user_variables
sql/sql_class.cc:
  SELECT ... INTO user_variables
sql/sql_class.h:
  SELECT ... INTO user_variables
sql/sql_lex.h:
  SELECT ... INTO user_variables
sql/sql_parse.cc:
  SELECT ... INTO user_variables
sql/sql_yacc.yy:
  SELECT ... INTO user_variables
2002-10-11 21:49:10 +03:00
unknown
261c22a87a fixed bug in subselect value storing
mysql-test/r/subselect.result:
  test for bug in subselect value storing
mysql-test/t/subselect.test:
  test for bug in subselect value storing
2002-10-11 17:00:11 +03:00
unknown
b9bb3534f1 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
unknown
c05fc9fa31 ha_innobase.cc:
Fix bug: if skip-innodb was defined SHOW INNODB STATUS crashed


sql/ha_innobase.cc:
  Fix bug: if skip-innodb was defined SHOW INNODB STATUS crashed
2002-10-09 19:52:34 +03:00
unknown
1b623a4032 my_sortcmp -> my_strnncoll
BitKeeper/deleted/.del-mf_casecnv.c~c269ed3dcafea441:
  Delete: mysys/mf_casecnv.c
2002-10-09 16:33:35 +05:00
unknown
edb8ae0f38 Simple charsets now have strncoll() field too 2002-10-09 15:40:57 +05:00
unknown
38b547257d Fixed bug in LOCK TABLES on windows.
Docs/manual.texi:
  Changelog
2002-10-09 12:05:22 +03:00
unknown
ac97cce461 removed 'this' pointer from initialization list of constructors 2002-10-08 23:49:59 +03:00
unknown
40c2e7499b Portability fixes to be able to compile MySQL with VC++
VC++Files/client/mysqlclient.dsp:
  Updated VC++ files for 4.1
VC++Files/libmysql/libmysql.dsp:
  Updated VC++ files for 4.1
VC++Files/libmysqld/libmysqld.dsp:
  Updated VC++ files for 4.1
VC++Files/myisam/myisam.dsp:
  Updated VC++ files for 4.1
VC++Files/mysys/mysys.dsp:
  Updated VC++ files for 4.1
VC++Files/sql/mysqld.dsp:
  Updated VC++ files for 4.1
VC++Files/strings/strings.dsp:
  Updated VC++ files for 4.1
client/mysql.cc:
  Update for windows
heap/_check.c:
  Fixed wrong DBUG_PRINT() usage
include/mysql.h:
  Portability fix (uint -> unsigned int)
libmysql/libmysql.def:
  Removed old my_casecmp function
sql/ha_innodb.cc:
  Update for windows
sql/init.cc:
  Removed not used variable
sql/log.cc:
  Removed not used variable
sql/net_pkg.cc:
  Portability fix
sql/sql_db.cc:
  Portability fixes.  Removed not used variables
sql/sql_lex.h:
  Portability fix
sql/sql_parse.cc:
  Portability fix
sql/sql_prepare.cc:
  Removed not used variables
sql/sql_select.cc:
  Portability fix
sql/sql_show.cc:
  Portability fix
sql/sql_union.cc:
  Portability fix
2002-10-08 22:28:24 +03:00
unknown
a7430f38b3 --tmpdir=dir1:dir2:... support in myisamchk 2002-10-08 14:34:04 +00:00
unknown
4dcdf3f318 Merge mysql.com:/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-automake
2002-10-08 16:22:35 +02:00
unknown
13da94b7a2 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
2002-10-08 14:17:38 +00:00
unknown
97a120e16b Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-10-08 16:41:50 +03:00
unknown
9d33a7a2e4 Remove wrong clear of mysql_port when using --skip-show-databases
Docs/manual.texi:
  ChangeLog
2002-10-08 16:40:50 +03:00
unknown
81a82f0d6e support for --tmpdir=dir1:dir2:... 2002-10-08 12:39:37 +00:00
unknown
58dc03066c removed compiler warnings 2002-10-08 15:34:39 +03:00
unknown
122b6927bf ha_innobase.cc:
test


sql/ha_innobase.cc:
  test
2002-10-08 15:17:41 +03:00
unknown
e8e3f7728f fixed couple of bugs in field/reference name resolution
fixed error handling in subselect fix_field


mysql-test/r/subselect.result:
  test of name resolution
mysql-test/t/subselect.test:
  test of name resolution
sql/item.cc:
  fixed couple of bugs in field/reference name resolution.
sql/item_subselect.cc:
  fixed error handling
sql/mysql_priv.h:
  fixed couple of bugs in field/reference name resolution.
sql/sql_base.cc:
  fixed couple of bugs in field/reference name resolution.
sql/sql_select.cc:
  new find_item_in_list interface
2002-10-08 14:50:12 +03:00
unknown
a1517908c1 touchup to last fix
sql/log.cc:
  moved mutex back to after is_open() test,
  but still protecting name dereference (the real problem)
2002-10-07 16:39:52 -06:00
unknown
2ab04c8cee Merge mysql.com:/home/nick/mysql/repository/mysql-3.23
into mysql.com:/home/nick/mysql/mysql-3.23
2002-10-07 15:44:00 -06:00
unknown
642b759333 fixed race that caused sig11s on simultaneous FLUSH LOGS
(possibly also fixes binlog filename corruption problems--hasn't
been reproduced since)


sql/log.cc:
  Fixed race caused by calling MYSQL_LOG::is_open() outside of critical section.
sql/sql_parse.cc:
  added missing args to calls to MYSQL_LOG::new_file(bool)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-07 15:42:10 -06:00
unknown
da4d153124 fixed query cache with system database
FN_NO_CASE_SENCE used instead of __WIN__ in table name handling of quary cache


mysql-test/r/query_cache.result:
  query cache with system database test
mysql-test/t/query_cache.test:
  query cache with system database test
sql/sql_cache.cc:
  fixed query cache with system database
  FN_NO_CASE_SENCE used instead of __WIN__
2002-10-08 00:26:15 +03:00
unknown
7e05d7b4a6 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-4.1
2002-10-07 22:22:26 +03:00
unknown
31568581c5 fixed error handling bug
mysql-test/r/subselect.result:
  test for error handling bug
mysql-test/t/subselect.test:
  test for error handling bug
2002-10-07 22:21:17 +03:00
unknown
c5805cbc71 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1


mysql-test/r/create.result:
  Auto merged
2002-10-07 17:51:05 +05:00
unknown
9195963f56 auto_increment for heap tables
test case


heap/hp_create.c:
  auto_increment for heap tables
heap/hp_hash.c:
  auto_increment for heap tables
heap/hp_info.c:
  auto_increment for heap tables
heap/hp_test1.c:
  auto_increment for heap tables
heap/hp_test2.c:
  auto_increment for heap tables
heap/hp_update.c:
  auto_increment for heap tables
heap/hp_write.c:
  auto_increment for heap tables
include/heap.h:
  auto_increment for heap tables
mysql-test/r/create.result:
  auto_increment for heap tables
mysql-test/t/create.test:
  auto_increment for heap tables
sql/ha_heap.cc:
  auto_increment for heap tables
sql/ha_heap.h:
  auto_increment for heap tables
2002-10-07 17:49:03 +05:00
unknown
72a3c80dbb after merging fix 2002-10-07 00:56:21 +03:00
unknown
25b2d47517 btr0cur.c:
Do not let range estimator to return over 1 / 2 of total rows in table; use longlong in range estimation
btr0cur.h, ha_innobase.cc:
  Use longlong in range estimation, in case there are > 4 billion rows


sql/ha_innobase.cc:
  Use longlong in range estimation, in case there are > 4 billion rows
innobase/include/btr0cur.h:
  Use longlong in range estimation, in case there are > 4 billion rows
innobase/btr/btr0cur.c:
  Do not let range estimator to return over 1 / 2 of total rows in table; use longlong in range estimation
2002-10-05 22:23:51 +03:00
unknown
05c5908a9e merging
include/mysql_com.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/key_primary.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/odbc.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/r/varbinary.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.h:
  Auto merged
2002-10-04 14:15:59 +03:00
unknown
5a6c52f17c Merge mysql.com:/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-automake


configure.in:
  Auto merged
2002-10-03 21:12:28 +02:00
unknown
b05f22d997 ha_innobase.cc:
Remove unintentionally pushed assert


sql/ha_innobase.cc:
  Remove unintentionally pushed assert
2002-10-03 19:48:24 +03:00
unknown
e607221a3c Fixed bug that causes select test to fail
Now MySQL 4.1 is up to date with all patches from 4.0.4 and passes the test suite.


mysql-test/r/rpl_log_pos.result:
  Fix results
sql/sql_select.cc:
  Fixed bug that causes select test to fail
2002-10-03 19:44:46 +03:00
unknown
3a088a328d ha_innobase.cc, ha_innobase.h:
Backport from 4.0.4 the bug fix of the crash when a temporary table was created inside LOCK TABLES and used


sql/ha_innobase.h:
  Backport from 4.0.4 the bug fix of the crash when a temporary table was created inside LOCK TABLES and used
sql/ha_innobase.cc:
  Backport from 4.0.4 the bug fix of the crash when a temporary table was created inside LOCK TABLES and used
2002-10-03 19:10:49 +03:00
unknown
f094b6af4c fixing EXPLAIN select types 2002-10-03 18:47:04 +03:00
unknown
be565cfbf7 Merge work:/my/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-10-03 16:56:09 +03:00
unknown
8f7a2b2785 Update after last merge. Fixes some wrong test results.
libmysql/libmysql.c:
  Removed obsolete function (now in strings library)
mysql-test/r/rpl_log.result:
  Updated results for 4.1
mysql-test/r/rpl_log_pos.result:
  Updated results for 4.1
sql/item_strfunc.cc:
  Added missing system_charset_info
sql/log_event.cc:
  Portability fixes. More debugging.
sql/net_pkg.cc:
  Added back setting of query_error as slave code is depeneding on this.
sql/sql_acl.cc:
  Update after last merge
sql/sql_lex.cc:
  Update after last merge
sql/sql_parse.cc:
  Update after last merge
sql/sql_prepare.cc:
  Update after last merge
sql/time.cc:
  Update after last merge.
  More comments
2002-10-03 16:54:26 +03:00
unknown
392ba75773 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-merge_lex-4.1
2002-10-03 16:37:41 +03:00
unknown
e57cd00a6f after merging bugfix 2002-10-03 16:35:08 +03:00
unknown
c9c47144dc Merge mysql.r18.ru:/usr/home/ram/mysql-4.1.last
into mysql.r18.ru:/usr/home/ram/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_heap.cc:
  Auto merged
2002-10-03 17:26:05 +05:00