Loading acinclude.m4 +0 −42 Original line number Diff line number Diff line Loading @@ -1158,48 +1158,6 @@ dnl --------------------------------------------------------------------------- dnl END OF MYSQL_CHECK_INNODB SECTION dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- dnl Macro: MYSQL_CHECK_GEMINI dnl Sets HAVE_GEMINI_DB if --with-gemini is used dnl --------------------------------------------------------------------------- AC_DEFUN([MYSQL_CHECK_GEMINI], [ AC_ARG_WITH([gemini], [\ --with-gemini[=DIR] Use Gemini DB located in DIR], [gemini="$withval"], [gemini=no]) AC_MSG_CHECKING([for Gemini DB]) dnl SORT OUT THE SUPPLIED ARGUMENTS TO DETERMINE WHAT TO DO dnl echo "DBG_GEM1: gemini='$gemini'" have_gemini_db=no gemini_includes= gemini_libs= case "$gemini" in no) AC_MSG_RESULT([Not using Gemini DB]) ;; yes | default | *) have_gemini_db="yes" gemini_includes="-I../gemini/incl -I../gemini" gemini_libs="\ ../gemini/api/libapi.a\ ../gemini/db/libdb.a\ ../gemini/dbut/libdbut.a" AC_MSG_RESULT([Using Gemini DB]) ;; esac AC_SUBST(gemini_includes) AC_SUBST(gemini_libs) ]) dnl --------------------------------------------------------------------------- dnl END OF MYSQL_CHECK_GEMINI SECTION dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- dnl Got this from the GNU tar 1.13.11 distribution dnl by Paul Eggert <eggert@twinsun.com> Loading configure.in +0 −12 Original line number Diff line number Diff line Loading @@ -2077,7 +2077,6 @@ AC_MSG_RESULT([default: $default_charset; compiled in: $CHARSETS]) MYSQL_CHECK_BDB MYSQL_CHECK_INNODB MYSQL_CHECK_GEMINI # If we have threads generate some library functions and test programs sql_server_dirs= Loading Loading @@ -2197,17 +2196,6 @@ EOF echo "END OF INNODB CONFIGURATION" fi if test "X$have_gemini_db" = "Xyes"; then sql_server_dirs="gemini $sql_server_dirs" echo "CONFIGURING FOR GEMINI DB" (cd gemini && sh ./configure) \ || AC_MSG_ERROR([could not configure Gemini DB]) echo "END OF GEMINI DB CONFIGURATION" AC_DEFINE(HAVE_GEMINI_DB) fi if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes" then # MIT user level threads Loading mysql-test/include/have_gemini.incdeleted 100644 → 0 +0 −4 Original line number Diff line number Diff line -- require r/have_gemini.require disable_query_log; show variables like "have_gemini"; enable_query_log; mysql-test/install_test_db.sh +1 −1 Original line number Diff line number Diff line Loading @@ -195,7 +195,7 @@ then fi mysqld_boot=" $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \ --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb --skip-gemini $EXTRA_ARG" --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb $EXTRA_ARG" echo "running $mysqld_boot" if $mysqld_boot << END_OF_DATA Loading mysql-test/r/gemini.resultdeleted 100644 → 0 +0 −370 Original line number Diff line number Diff line id code name 1 1 Tim 2 1 Monty 3 2 David 4 2 Erik 5 3 Sasha 6 3 Jeremy 7 4 Matt id code name 2 1 Monty 3 2 David 4 2 Erik 5 3 Sasha 6 3 Jeremy 7 4 Matt 8 1 Sinisa id code name 3 2 David 4 2 Erik 5 3 Sasha 6 3 Jeremy 7 4 Matt 8 1 Sinisa 12 1 Ralph id parent_id level 8 102 2 9 102 2 15 102 2 id parent_id level 1001 100 0 1003 101 1 1004 101 1 1008 102 2 1009 102 2 1017 103 2 1022 104 2 1024 104 2 1028 105 2 1029 105 2 1030 105 2 1031 106 2 1032 106 2 1033 106 2 1203 107 2 1202 107 2 1020 103 2 1157 100 0 1193 105 2 1040 107 2 1002 101 1 1015 102 2 1006 101 1 1034 106 2 1035 106 2 1016 103 2 1007 101 1 1036 107 2 1018 103 2 1026 105 2 1027 105 2 1183 104 2 1038 107 2 1025 105 2 1037 107 2 1021 104 2 1019 103 2 1005 101 1 1179 105 2 id parent_id level 1001 100 0 1003 101 1 1004 101 1 1008 102 2 1010 102 2 1017 103 2 1023 104 2 1024 104 2 1028 105 2 1029 105 2 1030 105 2 1031 106 2 1032 106 2 1033 106 2 1204 107 2 1203 107 2 1020 103 2 1158 100 0 1194 105 2 1041 107 2 1002 101 1 1015 102 2 1006 101 1 1034 106 2 1035 106 2 1016 103 2 1007 101 1 1036 107 2 1018 103 2 1026 105 2 1027 105 2 1184 104 2 1039 107 2 1025 105 2 1038 107 2 1022 104 2 1019 103 2 1005 101 1 1180 105 2 id parent_id level 1008 102 2 1010 102 2 1015 102 2 table type possible_keys key key_len ref rows Extra t1 ref level level 1 const 6 where used; Using index table type possible_keys key key_len ref rows Extra t1 ref level level 1 const 6 where used table type possible_keys key key_len ref rows Extra t1 ref level level 1 const 6 where used level id 1 1003 1 1004 1 1002 1 1006 1 1007 1 1005 level id parent_id 1 1003 101 1 1004 101 1 1002 101 1 1006 101 1 1007 101 1 1005 101 gesuchnr benutzer_id 1 1 2 1 a 2 user_id name phone ref_email detail 10292 sanjeev 29153373 sansh777@hotmail.com xxx 10292 shirish 2333604 shirish@yahoo.com ddsds 10292 sonali 323232 sonali@bolly.com filmstar user_id name phone ref_email detail 10292 sanjeev 29153373 sansh777@hotmail.com xxx 10292 shirish 2333604 shirish@yahoo.com ddsds 10292 sonali 323232 sonali@bolly.com filmstar user_id name phone ref_email detail 10292 sanjeev 29153373 sansh777@hotmail.com xxx 10292 shirish 2333604 shirish@yahoo.com ddsds 10292 sonali 323232 sonali@bolly.com filmstar 10293 shirish 2333604 shirish@yahoo.com ddsds user_id name phone ref_email detail 10293 shirish 2333604 shirish@yahoo.com ddsds user_id name phone ref_email detail 10291 sanjeev 29153373 sansh777@hotmail.com xxx a b 1 3 2 3 3 3 a b 1 3 2 3 3 3 a b a b 1 3 2 3 3 3 a b 1 3 2 3 3 3 id ggid email passwd 1 test1 xxx id ggid email passwd 1 test1 xxx id ggid email passwd 2 test2 yyy id parent_id level 8 102 2 9 102 2 15 102 2 id parent_id level 1001 100 0 1003 101 1 1004 101 1 1008 102 2 1024 102 2 1017 103 2 1022 104 2 1024 104 2 1028 105 2 1029 105 2 1030 105 2 1031 106 2 1032 106 2 1033 106 2 1203 107 2 1202 107 2 1020 103 2 1157 100 0 1193 105 2 1040 107 2 1002 101 1 1015 102 2 1006 101 1 1034 106 2 1035 106 2 1016 103 2 1007 101 1 1036 107 2 1018 103 2 1026 105 2 1027 105 2 1183 104 2 1038 107 2 1025 105 2 1037 107 2 1021 104 2 1019 103 2 1005 101 1 1179 105 2 id parent_id level 1002 100 0 1004 101 1 1005 101 1 1009 102 2 1025 102 2 1018 103 2 1023 104 2 1025 104 2 1029 105 2 1030 105 2 1031 105 2 1032 106 2 1033 106 2 1034 106 2 1204 107 2 1203 107 2 1021 103 2 1158 100 0 1194 105 2 1041 107 2 1003 101 1 1016 102 2 1007 101 1 1035 106 2 1036 106 2 1017 103 2 1008 101 1 1037 107 2 1019 103 2 1027 105 2 1028 105 2 1184 104 2 1039 107 2 1026 105 2 1038 107 2 1022 104 2 1020 103 2 1006 101 1 1180 105 2 id parent_id level 1009 102 2 1025 102 2 1016 102 2 table type possible_keys key key_len ref rows Extra t1 ref level level 1 const 6 where used; Using index level id 1 1004 1 1005 1 1003 1 1007 1 1008 1 1006 level id parent_id 1 1004 101 1 1005 101 1 1003 101 1 1007 101 1 1008 101 1 1006 101 level id 1 1003 1 1004 1 1005 1 1006 1 1007 1 1008 id parent_id level 1002 100 0 1009 102 2 1025 102 2 1018 103 2 1023 104 2 1025 104 2 1029 105 2 1030 105 2 1031 105 2 1032 106 2 1033 106 2 1034 106 2 1204 107 2 1203 107 2 1021 103 2 1158 100 0 1194 105 2 1041 107 2 1016 102 2 1035 106 2 1036 106 2 1017 103 2 1037 107 2 1019 103 2 1027 105 2 1028 105 2 1184 104 2 1039 107 2 1026 105 2 1038 107 2 1022 104 2 1020 103 2 1180 105 2 count(*) 1 a 1 2 3 test for rollback test for rollback n after rollback 4 after rollback n after commit 4 after commit 5 after commit n after commit 4 after commit 5 after commit 6 after commit n 4 5 6 7 afterbegin_id afterbegin_nom 1 first 2 hamdouni afterrollback_id afterrollback_nom 1 first afterautocommit0_id afterautocommit0_nom 1 first 3 mysql afterrollback_id afterrollback_nom 1 first id val id val pippo 12 id val ID NAME 1 Jochen _userid marc@anyware.co.uk _userid marc@anyware.co.uk f1 65 379 468 469 508 Loading
acinclude.m4 +0 −42 Original line number Diff line number Diff line Loading @@ -1158,48 +1158,6 @@ dnl --------------------------------------------------------------------------- dnl END OF MYSQL_CHECK_INNODB SECTION dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- dnl Macro: MYSQL_CHECK_GEMINI dnl Sets HAVE_GEMINI_DB if --with-gemini is used dnl --------------------------------------------------------------------------- AC_DEFUN([MYSQL_CHECK_GEMINI], [ AC_ARG_WITH([gemini], [\ --with-gemini[=DIR] Use Gemini DB located in DIR], [gemini="$withval"], [gemini=no]) AC_MSG_CHECKING([for Gemini DB]) dnl SORT OUT THE SUPPLIED ARGUMENTS TO DETERMINE WHAT TO DO dnl echo "DBG_GEM1: gemini='$gemini'" have_gemini_db=no gemini_includes= gemini_libs= case "$gemini" in no) AC_MSG_RESULT([Not using Gemini DB]) ;; yes | default | *) have_gemini_db="yes" gemini_includes="-I../gemini/incl -I../gemini" gemini_libs="\ ../gemini/api/libapi.a\ ../gemini/db/libdb.a\ ../gemini/dbut/libdbut.a" AC_MSG_RESULT([Using Gemini DB]) ;; esac AC_SUBST(gemini_includes) AC_SUBST(gemini_libs) ]) dnl --------------------------------------------------------------------------- dnl END OF MYSQL_CHECK_GEMINI SECTION dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- dnl Got this from the GNU tar 1.13.11 distribution dnl by Paul Eggert <eggert@twinsun.com> Loading
configure.in +0 −12 Original line number Diff line number Diff line Loading @@ -2077,7 +2077,6 @@ AC_MSG_RESULT([default: $default_charset; compiled in: $CHARSETS]) MYSQL_CHECK_BDB MYSQL_CHECK_INNODB MYSQL_CHECK_GEMINI # If we have threads generate some library functions and test programs sql_server_dirs= Loading Loading @@ -2197,17 +2196,6 @@ EOF echo "END OF INNODB CONFIGURATION" fi if test "X$have_gemini_db" = "Xyes"; then sql_server_dirs="gemini $sql_server_dirs" echo "CONFIGURING FOR GEMINI DB" (cd gemini && sh ./configure) \ || AC_MSG_ERROR([could not configure Gemini DB]) echo "END OF GEMINI DB CONFIGURATION" AC_DEFINE(HAVE_GEMINI_DB) fi if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes" then # MIT user level threads Loading
mysql-test/include/have_gemini.incdeleted 100644 → 0 +0 −4 Original line number Diff line number Diff line -- require r/have_gemini.require disable_query_log; show variables like "have_gemini"; enable_query_log;
mysql-test/install_test_db.sh +1 −1 Original line number Diff line number Diff line Loading @@ -195,7 +195,7 @@ then fi mysqld_boot=" $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \ --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb --skip-gemini $EXTRA_ARG" --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb $EXTRA_ARG" echo "running $mysqld_boot" if $mysqld_boot << END_OF_DATA Loading
mysql-test/r/gemini.resultdeleted 100644 → 0 +0 −370 Original line number Diff line number Diff line id code name 1 1 Tim 2 1 Monty 3 2 David 4 2 Erik 5 3 Sasha 6 3 Jeremy 7 4 Matt id code name 2 1 Monty 3 2 David 4 2 Erik 5 3 Sasha 6 3 Jeremy 7 4 Matt 8 1 Sinisa id code name 3 2 David 4 2 Erik 5 3 Sasha 6 3 Jeremy 7 4 Matt 8 1 Sinisa 12 1 Ralph id parent_id level 8 102 2 9 102 2 15 102 2 id parent_id level 1001 100 0 1003 101 1 1004 101 1 1008 102 2 1009 102 2 1017 103 2 1022 104 2 1024 104 2 1028 105 2 1029 105 2 1030 105 2 1031 106 2 1032 106 2 1033 106 2 1203 107 2 1202 107 2 1020 103 2 1157 100 0 1193 105 2 1040 107 2 1002 101 1 1015 102 2 1006 101 1 1034 106 2 1035 106 2 1016 103 2 1007 101 1 1036 107 2 1018 103 2 1026 105 2 1027 105 2 1183 104 2 1038 107 2 1025 105 2 1037 107 2 1021 104 2 1019 103 2 1005 101 1 1179 105 2 id parent_id level 1001 100 0 1003 101 1 1004 101 1 1008 102 2 1010 102 2 1017 103 2 1023 104 2 1024 104 2 1028 105 2 1029 105 2 1030 105 2 1031 106 2 1032 106 2 1033 106 2 1204 107 2 1203 107 2 1020 103 2 1158 100 0 1194 105 2 1041 107 2 1002 101 1 1015 102 2 1006 101 1 1034 106 2 1035 106 2 1016 103 2 1007 101 1 1036 107 2 1018 103 2 1026 105 2 1027 105 2 1184 104 2 1039 107 2 1025 105 2 1038 107 2 1022 104 2 1019 103 2 1005 101 1 1180 105 2 id parent_id level 1008 102 2 1010 102 2 1015 102 2 table type possible_keys key key_len ref rows Extra t1 ref level level 1 const 6 where used; Using index table type possible_keys key key_len ref rows Extra t1 ref level level 1 const 6 where used table type possible_keys key key_len ref rows Extra t1 ref level level 1 const 6 where used level id 1 1003 1 1004 1 1002 1 1006 1 1007 1 1005 level id parent_id 1 1003 101 1 1004 101 1 1002 101 1 1006 101 1 1007 101 1 1005 101 gesuchnr benutzer_id 1 1 2 1 a 2 user_id name phone ref_email detail 10292 sanjeev 29153373 sansh777@hotmail.com xxx 10292 shirish 2333604 shirish@yahoo.com ddsds 10292 sonali 323232 sonali@bolly.com filmstar user_id name phone ref_email detail 10292 sanjeev 29153373 sansh777@hotmail.com xxx 10292 shirish 2333604 shirish@yahoo.com ddsds 10292 sonali 323232 sonali@bolly.com filmstar user_id name phone ref_email detail 10292 sanjeev 29153373 sansh777@hotmail.com xxx 10292 shirish 2333604 shirish@yahoo.com ddsds 10292 sonali 323232 sonali@bolly.com filmstar 10293 shirish 2333604 shirish@yahoo.com ddsds user_id name phone ref_email detail 10293 shirish 2333604 shirish@yahoo.com ddsds user_id name phone ref_email detail 10291 sanjeev 29153373 sansh777@hotmail.com xxx a b 1 3 2 3 3 3 a b 1 3 2 3 3 3 a b a b 1 3 2 3 3 3 a b 1 3 2 3 3 3 id ggid email passwd 1 test1 xxx id ggid email passwd 1 test1 xxx id ggid email passwd 2 test2 yyy id parent_id level 8 102 2 9 102 2 15 102 2 id parent_id level 1001 100 0 1003 101 1 1004 101 1 1008 102 2 1024 102 2 1017 103 2 1022 104 2 1024 104 2 1028 105 2 1029 105 2 1030 105 2 1031 106 2 1032 106 2 1033 106 2 1203 107 2 1202 107 2 1020 103 2 1157 100 0 1193 105 2 1040 107 2 1002 101 1 1015 102 2 1006 101 1 1034 106 2 1035 106 2 1016 103 2 1007 101 1 1036 107 2 1018 103 2 1026 105 2 1027 105 2 1183 104 2 1038 107 2 1025 105 2 1037 107 2 1021 104 2 1019 103 2 1005 101 1 1179 105 2 id parent_id level 1002 100 0 1004 101 1 1005 101 1 1009 102 2 1025 102 2 1018 103 2 1023 104 2 1025 104 2 1029 105 2 1030 105 2 1031 105 2 1032 106 2 1033 106 2 1034 106 2 1204 107 2 1203 107 2 1021 103 2 1158 100 0 1194 105 2 1041 107 2 1003 101 1 1016 102 2 1007 101 1 1035 106 2 1036 106 2 1017 103 2 1008 101 1 1037 107 2 1019 103 2 1027 105 2 1028 105 2 1184 104 2 1039 107 2 1026 105 2 1038 107 2 1022 104 2 1020 103 2 1006 101 1 1180 105 2 id parent_id level 1009 102 2 1025 102 2 1016 102 2 table type possible_keys key key_len ref rows Extra t1 ref level level 1 const 6 where used; Using index level id 1 1004 1 1005 1 1003 1 1007 1 1008 1 1006 level id parent_id 1 1004 101 1 1005 101 1 1003 101 1 1007 101 1 1008 101 1 1006 101 level id 1 1003 1 1004 1 1005 1 1006 1 1007 1 1008 id parent_id level 1002 100 0 1009 102 2 1025 102 2 1018 103 2 1023 104 2 1025 104 2 1029 105 2 1030 105 2 1031 105 2 1032 106 2 1033 106 2 1034 106 2 1204 107 2 1203 107 2 1021 103 2 1158 100 0 1194 105 2 1041 107 2 1016 102 2 1035 106 2 1036 106 2 1017 103 2 1037 107 2 1019 103 2 1027 105 2 1028 105 2 1184 104 2 1039 107 2 1026 105 2 1038 107 2 1022 104 2 1020 103 2 1180 105 2 count(*) 1 a 1 2 3 test for rollback test for rollback n after rollback 4 after rollback n after commit 4 after commit 5 after commit n after commit 4 after commit 5 after commit 6 after commit n 4 5 6 7 afterbegin_id afterbegin_nom 1 first 2 hamdouni afterrollback_id afterrollback_nom 1 first afterautocommit0_id afterautocommit0_nom 1 first 3 mysql afterrollback_id afterrollback_nom 1 first id val id val pippo 12 id val ID NAME 1 Jochen _userid marc@anyware.co.uk _userid marc@anyware.co.uk f1 65 379 468 469 508
